phong / Lifelog

Browse Code »

Commit 7fc917f3b6bf31112dc61d5d95884d3d7861da19

Authored by nvtu11790@gmail.com 2017-08-18 19:35:02 +0900

1 parent 0db82ed0b5

Exists in master and in 1 other branch

add get member of group API, join group API.

Showing 15 changed files with 282 additions and 47 deletions Inline Diff

LifeLog/LifeLog.xcodeproj/project.pbxproj
LifeLog/LifeLog/Entities.h
LifeLog/LifeLog/GroupDetailViewController.h
LifeLog/LifeLog/GroupDetailViewController.m
LifeLog/LifeLog/GroupDetailViewController.xib
LifeLog/LifeLog/HistoryViewController.xib
LifeLog/LifeLog/MemberObject.h
LifeLog/LifeLog/MemberObject.m
LifeLog/LifeLog/RankingViewController.xib
LifeLog/LifeLog/SNSViewController.m
LifeLog/LifeLog/SNSViewController.xib
LifeLog/LifeLog/ServerAPI.h
LifeLog/LifeLog/ServerAPI.m
LifeLog/LifeLog/TweetObject.h
LifeLog/LifeLog/TweetObject.m

LifeLog/LifeLog.xcodeproj/project.pbxproj

Diff comments View file @ 7fc917f

 // !$*UTF8*$!
 {
 	archiveVersion = 1;
 	classes = {
 	};
 	objectVersion = 46;
 	objects = {
 /* Begin PBXBuildFile section */
 		011799F0F2B47D80472673CE /* Pods_LifeLog.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2D9F4ED6F06C8F252B9EAF48 /* Pods_LifeLog.framework */; };
 		6E18CED31F2E39DB0029891F /* LoginViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E18CED11F2E39DB0029891F /* LoginViewController.m */; };
 		6E18CED41F2E39DB0029891F /* LoginViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6E18CED21F2E39DB0029891F /* LoginViewController.xib */; };
 		6E18CED81F2E3C840029891F /* ServerAPI.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E18CED71F2E3C840029891F /* ServerAPI.m */; };
 		6E18CEDC1F2E40F50029891F /* User.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E18CEDB1F2E40F50029891F /* User.m */; };
 		6E48AF0D1F2F9D3300C1D184 /* CustomTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E48AF0C1F2F9D3200C1D184 /* CustomTextField.m */; };
 		6E7F93421F35872B00EFBC71 /* TPKeyboardAvoidingCollectionView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E7F933B1F35872B00EFBC71 /* TPKeyboardAvoidingCollectionView.m */; };
 		6E7F93431F35872B00EFBC71 /* TPKeyboardAvoidingScrollView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E7F933D1F35872B00EFBC71 /* TPKeyboardAvoidingScrollView.m */; };
 		6E7F93441F35872B00EFBC71 /* TPKeyboardAvoidingTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E7F933F1F35872B00EFBC71 /* TPKeyboardAvoidingTableView.m */; };
 		6E7F93451F35872B00EFBC71 /* UIScrollView+TPKeyboardAvoidingAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E7F93411F35872B00EFBC71 /* UIScrollView+TPKeyboardAvoidingAdditions.m */; };
 		6E84E3761F27A701001EB88E /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E84E3751F27A701001EB88E /* main.m */; };
 		6E84E3791F27A701001EB88E /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E84E3781F27A701001EB88E /* AppDelegate.m */; };
 		6E84E3811F27A701001EB88E /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 6E84E3801F27A701001EB88E /* Assets.xcassets */; };
 		6E84E3841F27A701001EB88E /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 6E84E3821F27A701001EB88E /* LaunchScreen.storyboard */; };
 		6E84E38F1F27A703001EB88E /* LifeLogTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E84E38E1F27A703001EB88E /* LifeLogTests.m */; };
 		6E84E39A1F27A703001EB88E /* LifeLogUITests.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E84E3991F27A703001EB88E /* LifeLogUITests.m */; };
 		6E84E3B01F27A975001EB88E /* HomeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E84E3AE1F27A975001EB88E /* HomeViewController.m */; };
 		6E84E3B11F27A975001EB88E /* HomeViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6E84E3AF1F27A975001EB88E /* HomeViewController.xib */; };
 		6E84E3B51F27A98B001EB88E /* HistoryViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E84E3B31F27A98B001EB88E /* HistoryViewController.m */; };
 		6E84E3B61F27A98B001EB88E /* HistoryViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6E84E3B41F27A98B001EB88E /* HistoryViewController.xib */; };
 		6E84E3BA1F27A9A0001EB88E /* RankingViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E84E3B81F27A9A0001EB88E /* RankingViewController.m */; };
 		6E84E3BB1F27A9A0001EB88E /* RankingViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6E84E3B91F27A9A0001EB88E /* RankingViewController.xib */; };
 		6E84E3BF1F27A9B1001EB88E /* SNSViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E84E3BD1F27A9B1001EB88E /* SNSViewController.m */; };
 		6E84E3C01F27A9B1001EB88E /* SNSViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6E84E3BE1F27A9B1001EB88E /* SNSViewController.xib */; };
 		6E84E3C51F27ACAE001EB88E /* MapViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E84E3C31F27ACAE001EB88E /* MapViewController.m */; };
 		6E84E3C61F27ACAE001EB88E /* MapViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6E84E3C41F27ACAE001EB88E /* MapViewController.xib */; };
 		6E8DA0F71F2BAC3400CCE941 /* TodayViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E8DA0F51F2BAC3400CCE941 /* TodayViewController.m */; };
 		6E8DA0F81F2BAC3500CCE941 /* TodayViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6E8DA0F61F2BAC3400CCE941 /* TodayViewController.xib */; };
 		6EA4AF311F40BB7A00F52CFE /* StepObject.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EA4AF2C1F40BB7A00F52CFE /* StepObject.m */; };
 		6EA4AF321F40BB7A00F52CFE /* TargetInfor.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EA4AF2E1F40BB7A00F52CFE /* TargetInfor.m */; };
 		6EA4AF331F40BB7A00F52CFE /* TopObject.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EA4AF301F40BB7A00F52CFE /* TopObject.m */; };
 		6ECC40711F2A5FEB00AAEB97 /* NSDate+helper.m in Sources */ = {isa = PBXBuildFile; fileRef = 6ECC40701F2A5FEB00AAEB97 /* NSDate+helper.m */; };
 		6EDC8BEE1F2C2FB800765ACC /* Utilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EDC8BED1F2C2FB800765ACC /* Utilities.m */; };
 		6EDC8BF41F2C68D700765ACC /* CMMotionActivityExtra.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EDC8BF31F2C68D700765ACC /* CMMotionActivityExtra.m */; };
 		6EF1630A1F29069300DA306C /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 6EF163091F29069300DA306C /* Localizable.strings */; };
 		9CA8AEEA1F31BB4600C5FC74 /* ConfirmForgetPassViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9CA8AEE81F31BB4600C5FC74 /* ConfirmForgetPassViewController.m */; };
 		9CA8AEEB1F31BB4600C5FC74 /* ConfirmForgetPassViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9CA8AEE91F31BB4600C5FC74 /* ConfirmForgetPassViewController.xib */; };
 		9CBDA0FA1F2ECE2C0055DED1 /* BaseViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9CBDA0F91F2ECE2C0055DED1 /* BaseViewController.m */; };
 		9CBDA0FF1F2F03810055DED1 /* RegisterViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9CBDA0FD1F2F03810055DED1 /* RegisterViewController.m */; };
 		9CBDA1001F2F03810055DED1 /* RegisterViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9CBDA0FE1F2F03810055DED1 /* RegisterViewController.xib */; };
 		E933E66B1F3E04A6002926F5 /* SearchGroupViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E933E6691F3E04A6002926F5 /* SearchGroupViewController.m */; };
 		E933E66C1F3E04A6002926F5 /* SearchGroupViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E933E66A1F3E04A6002926F5 /* SearchGroupViewController.xib */; };
 		E933E6701F3E09B6002926F5 /* SearchGroupTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E933E66E1F3E09B6002926F5 /* SearchGroupTableViewCell.m */; };
 		E933E6711F3E09B6002926F5 /* SearchGroupTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E933E66F1F3E09B6002926F5 /* SearchGroupTableViewCell.xib */; };
 		E933E6741F3E0E4E002926F5 /* GroupObject.m in Sources */ = {isa = PBXBuildFile; fileRef = E933E6731F3E0E4E002926F5 /* GroupObject.m */; };
 		E933E6791F40513C002926F5 /* GroupDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E933E6771F40513C002926F5 /* GroupDetailViewController.m */; };
 		E933E67A1F40513C002926F5 /* GroupDetailViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E933E6781F40513C002926F5 /* GroupDetailViewController.xib */; };
 		E9373E471F3596940059355A /* AutoTransLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = E9373E461F3596940059355A /* AutoTransLabel.m */; };
 		E9373E4A1F35AA180059355A /* HistoryObject.m in Sources */ = {isa = PBXBuildFile; fileRef = E9373E491F35AA180059355A /* HistoryObject.m */; };
 		E9373E4D1F361A230059355A /* HistoryGraphObject.m in Sources */ = {isa = PBXBuildFile; fileRef = E9373E4C1F361A230059355A /* HistoryGraphObject.m */; };
+		E9497FD51F46EC1100E6AF8D /* MemberObject.m in Sources */ = {isa = PBXBuildFile; fileRef = E9497FD41F46EC1100E6AF8D /* MemberObject.m */; };
 		E9682E2E1F39675A00FE05A2 /* RankingTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E9682E2C1F39675A00FE05A2 /* RankingTableViewCell.m */; };
 		E9682E2F1F39675A00FE05A2 /* RankingTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E9682E2D1F39675A00FE05A2 /* RankingTableViewCell.xib */; };
 		E968550A1F3C444900317CEF /* AutoTransButton.m in Sources */ = {isa = PBXBuildFile; fileRef = E96855091F3C444900317CEF /* AutoTransButton.m */; };
 		E96855111F3C5D9A00317CEF /* SNSRecentTopicTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E968550F1F3C5D9A00317CEF /* SNSRecentTopicTableViewCell.m */; };
 		E96855121F3C5D9A00317CEF /* SNSRecentTopicTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E96855101F3C5D9A00317CEF /* SNSRecentTopicTableViewCell.xib */; };
 		E997E0261F3AB66500709FB1 /* Social.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E997E0251F3AB66500709FB1 /* Social.framework */; };
 		E99E13AB1F336F3600C78787 /* CollectionView.m in Sources */ = {isa = PBXBuildFile; fileRef = E99E13AA1F336F3600C78787 /* CollectionView.m */; };
 		E99E13AD1F336F4500C78787 /* CollectionView.xib in Resources */ = {isa = PBXBuildFile; fileRef = E99E13AC1F336F4500C78787 /* CollectionView.xib */; };
 		E99E13B11F33720600C78787 /* LabelCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E99E13AF1F33720600C78787 /* LabelCollectionViewCell.m */; };
 		E99E13B21F33720600C78787 /* LabelCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E99E13B01F33720600C78787 /* LabelCollectionViewCell.xib */; };
 		E9D909211F3D559D004CF99F /* TweetObject.m in Sources */ = {isa = PBXBuildFile; fileRef = E9D909201F3D559D004CF99F /* TweetObject.m */; };
 		E9D909241F3D6E8C004CF99F /* BaseTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E9D909231F3D6E8C004CF99F /* BaseTableViewController.m */; };
 		E9F73DCC1F338A0F004A3A6F /* HistoryListTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E9F73DCA1F338A0F004A3A6F /* HistoryListTableViewCell.m */; };
 		E9F73DCD1F338A0F004A3A6F /* HistoryListTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E9F73DCB1F338A0F004A3A6F /* HistoryListTableViewCell.xib */; };
 /* End PBXBuildFile section */
 /* Begin PBXContainerItemProxy section */
 		6E84E38B1F27A703001EB88E /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 6E84E3691F27A700001EB88E /* Project object */;
 			proxyType = 1;
 			remoteGlobalIDString = 6E84E3701F27A700001EB88E;
 			remoteInfo = LifeLog;
 		};
 		6E84E3961F27A703001EB88E /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 6E84E3691F27A700001EB88E /* Project object */;
 			proxyType = 1;
 			remoteGlobalIDString = 6E84E3701F27A700001EB88E;
 			remoteInfo = LifeLog;
 		};
 /* End PBXContainerItemProxy section */
 /* Begin PBXFileReference section */
 		0FC2D57087AF4571C57FAE08 /* Pods-LifeLog.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-LifeLog.debug.xcconfig"; path = "Pods/Target Support Files/Pods-LifeLog/Pods-LifeLog.debug.xcconfig"; sourceTree = "<group>"; };
 		2D9F4ED6F06C8F252B9EAF48 /* Pods_LifeLog.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_LifeLog.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		4CFDA5714AF852358A1EB515 /* Pods-LifeLog.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-LifeLog.release.xcconfig"; path = "Pods/Target Support Files/Pods-LifeLog/Pods-LifeLog.release.xcconfig"; sourceTree = "<group>"; };
 		6E18CED01F2E39DB0029891F /* LoginViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoginViewController.h; sourceTree = "<group>"; };
 		6E18CED11F2E39DB0029891F /* LoginViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LoginViewController.m; sourceTree = "<group>"; };
 		6E18CED21F2E39DB0029891F /* LoginViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = LoginViewController.xib; sourceTree = "<group>"; };
 		6E18CED61F2E3C840029891F /* ServerAPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ServerAPI.h; sourceTree = "<group>"; };
 		6E18CED71F2E3C840029891F /* ServerAPI.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ServerAPI.m; sourceTree = "<group>"; };
 		6E18CEDA1F2E40F50029891F /* User.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = User.h; sourceTree = "<group>"; };
 		6E18CEDB1F2E40F50029891F /* User.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = User.m; sourceTree = "<group>"; };
 		6E18CEDD1F2E46570029891F /* Entities.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Entities.h; sourceTree = "<group>"; };
 		6E48AF0B1F2F9D3200C1D184 /* CustomTextField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CustomTextField.h; sourceTree = "<group>"; };
 		6E48AF0C1F2F9D3200C1D184 /* CustomTextField.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CustomTextField.m; sourceTree = "<group>"; };
 		6E7F933A1F35872B00EFBC71 /* TPKeyboardAvoidingCollectionView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TPKeyboardAvoidingCollectionView.h; sourceTree = "<group>"; };
 		6E7F933B1F35872B00EFBC71 /* TPKeyboardAvoidingCollectionView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TPKeyboardAvoidingCollectionView.m; sourceTree = "<group>"; };
 		6E7F933C1F35872B00EFBC71 /* TPKeyboardAvoidingScrollView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TPKeyboardAvoidingScrollView.h; sourceTree = "<group>"; };
 		6E7F933D1F35872B00EFBC71 /* TPKeyboardAvoidingScrollView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TPKeyboardAvoidingScrollView.m; sourceTree = "<group>"; };
 		6E7F933E1F35872B00EFBC71 /* TPKeyboardAvoidingTableView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TPKeyboardAvoidingTableView.h; sourceTree = "<group>"; };
 		6E7F933F1F35872B00EFBC71 /* TPKeyboardAvoidingTableView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TPKeyboardAvoidingTableView.m; sourceTree = "<group>"; };
 		6E7F93401F35872B00EFBC71 /* UIScrollView+TPKeyboardAvoidingAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIScrollView+TPKeyboardAvoidingAdditions.h"; sourceTree = "<group>"; };
 		6E7F93411F35872B00EFBC71 /* UIScrollView+TPKeyboardAvoidingAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIScrollView+TPKeyboardAvoidingAdditions.m"; sourceTree = "<group>"; };
 		6E84E3711F27A700001EB88E /* LifeLog.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = LifeLog.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		6E84E3751F27A701001EB88E /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
 		6E84E3771F27A701001EB88E /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
 		6E84E3781F27A701001EB88E /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
 		6E84E3801F27A701001EB88E /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		6E84E3831F27A701001EB88E /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		6E84E3851F27A701001EB88E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		6E84E38A1F27A703001EB88E /* LifeLogTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = LifeLogTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		6E84E38E1F27A703001EB88E /* LifeLogTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LifeLogTests.m; sourceTree = "<group>"; };
 		6E84E3901F27A703001EB88E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		6E84E3951F27A703001EB88E /* LifeLogUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = LifeLogUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		6E84E3991F27A703001EB88E /* LifeLogUITests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LifeLogUITests.m; sourceTree = "<group>"; };
 		6E84E39B1F27A703001EB88E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		6E84E3AD1F27A975001EB88E /* HomeViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HomeViewController.h; sourceTree = "<group>"; };
 		6E84E3AE1F27A975001EB88E /* HomeViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HomeViewController.m; sourceTree = "<group>"; };
 		6E84E3AF1F27A975001EB88E /* HomeViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = HomeViewController.xib; sourceTree = "<group>"; };
 		6E84E3B21F27A98B001EB88E /* HistoryViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HistoryViewController.h; sourceTree = "<group>"; };
 		6E84E3B31F27A98B001EB88E /* HistoryViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HistoryViewController.m; sourceTree = "<group>"; };
 		6E84E3B41F27A98B001EB88E /* HistoryViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = HistoryViewController.xib; sourceTree = "<group>"; };
 		6E84E3B71F27A9A0001EB88E /* RankingViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RankingViewController.h; sourceTree = "<group>"; };
 		6E84E3B81F27A9A0001EB88E /* RankingViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RankingViewController.m; sourceTree = "<group>"; };
 		6E84E3B91F27A9A0001EB88E /* RankingViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = RankingViewController.xib; sourceTree = "<group>"; };
 		6E84E3BC1F27A9B1001EB88E /* SNSViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SNSViewController.h; sourceTree = "<group>"; };
 		6E84E3BD1F27A9B1001EB88E /* SNSViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SNSViewController.m; sourceTree = "<group>"; };
 		6E84E3BE1F27A9B1001EB88E /* SNSViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SNSViewController.xib; sourceTree = "<group>"; };
 		6E84E3C21F27ACAE001EB88E /* MapViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MapViewController.h; sourceTree = "<group>"; };
 		6E84E3C31F27ACAE001EB88E /* MapViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MapViewController.m; sourceTree = "<group>"; };
 		6E84E3C41F27ACAE001EB88E /* MapViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MapViewController.xib; sourceTree = "<group>"; };
 		6E8DA0F41F2BAC3400CCE941 /* TodayViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TodayViewController.h; sourceTree = "<group>"; };
 		6E8DA0F51F2BAC3400CCE941 /* TodayViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TodayViewController.m; sourceTree = "<group>"; };
 		6E8DA0F61F2BAC3400CCE941 /* TodayViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = TodayViewController.xib; sourceTree = "<group>"; };
 		6EA4AF2B1F40BB7A00F52CFE /* StepObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StepObject.h; sourceTree = "<group>"; };
 		6EA4AF2C1F40BB7A00F52CFE /* StepObject.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = StepObject.m; sourceTree = "<group>"; };
 		6EA4AF2D1F40BB7A00F52CFE /* TargetInfor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TargetInfor.h; sourceTree = "<group>"; };
 		6EA4AF2E1F40BB7A00F52CFE /* TargetInfor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TargetInfor.m; sourceTree = "<group>"; };
 		6EA4AF2F1F40BB7A00F52CFE /* TopObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TopObject.h; sourceTree = "<group>"; };
 		6EA4AF301F40BB7A00F52CFE /* TopObject.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TopObject.m; sourceTree = "<group>"; };
 		6ECC406F1F2A5FEB00AAEB97 /* NSDate+helper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSDate+helper.h"; sourceTree = "<group>"; };
 		6ECC40701F2A5FEB00AAEB97 /* NSDate+helper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSDate+helper.m"; sourceTree = "<group>"; };
 		6EDC8BEC1F2C2FB800765ACC /* Utilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Utilities.h; sourceTree = "<group>"; };
 		6EDC8BED1F2C2FB800765ACC /* Utilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Utilities.m; sourceTree = "<group>"; };
 		6EDC8BF21F2C68D700765ACC /* CMMotionActivityExtra.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CMMotionActivityExtra.h; sourceTree = "<group>"; };
 		6EDC8BF31F2C68D700765ACC /* CMMotionActivityExtra.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CMMotionActivityExtra.m; sourceTree = "<group>"; };
 		6EF163091F29069300DA306C /* Localizable.strings */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; path = Localizable.strings; sourceTree = "<group>"; };
 		9CA8AEE71F31BB4600C5FC74 /* ConfirmForgetPassViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ConfirmForgetPassViewController.h; sourceTree = "<group>"; };
 		9CA8AEE81F31BB4600C5FC74 /* ConfirmForgetPassViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ConfirmForgetPassViewController.m; sourceTree = "<group>"; };
 		9CA8AEE91F31BB4600C5FC74 /* ConfirmForgetPassViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ConfirmForgetPassViewController.xib; sourceTree = "<group>"; };
 		9CBDA0F81F2ECE2C0055DED1 /* BaseViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BaseViewController.h; sourceTree = "<group>"; };
 		9CBDA0F91F2ECE2C0055DED1 /* BaseViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BaseViewController.m; sourceTree = "<group>"; };
 		9CBDA0FC1F2F03810055DED1 /* RegisterViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RegisterViewController.h; sourceTree = "<group>"; };
 		9CBDA0FD1F2F03810055DED1 /* RegisterViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RegisterViewController.m; sourceTree = "<group>"; };
 		9CBDA0FE1F2F03810055DED1 /* RegisterViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = RegisterViewController.xib; sourceTree = "<group>"; };
 		E933E6681F3E04A6002926F5 /* SearchGroupViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SearchGroupViewController.h; sourceTree = "<group>"; };
 		E933E6691F3E04A6002926F5 /* SearchGroupViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SearchGroupViewController.m; sourceTree = "<group>"; };
 		E933E66A1F3E04A6002926F5 /* SearchGroupViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SearchGroupViewController.xib; sourceTree = "<group>"; };
 		E933E66D1F3E09B6002926F5 /* SearchGroupTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SearchGroupTableViewCell.h; sourceTree = "<group>"; };
 		E933E66E1F3E09B6002926F5 /* SearchGroupTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SearchGroupTableViewCell.m; sourceTree = "<group>"; };
 		E933E66F1F3E09B6002926F5 /* SearchGroupTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SearchGroupTableViewCell.xib; sourceTree = "<group>"; };
 		E933E6721F3E0E4E002926F5 /* GroupObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GroupObject.h; sourceTree = "<group>"; };
 		E933E6731F3E0E4E002926F5 /* GroupObject.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GroupObject.m; sourceTree = "<group>"; };
 		E933E6761F40513C002926F5 /* GroupDetailViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GroupDetailViewController.h; sourceTree = "<group>"; };
 		E933E6771F40513C002926F5 /* GroupDetailViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GroupDetailViewController.m; sourceTree = "<group>"; };
 		E933E6781F40513C002926F5 /* GroupDetailViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = GroupDetailViewController.xib; sourceTree = "<group>"; };
 		E9373E451F3596940059355A /* AutoTransLabel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AutoTransLabel.h; sourceTree = "<group>"; };
 		E9373E461F3596940059355A /* AutoTransLabel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AutoTransLabel.m; sourceTree = "<group>"; };
 		E9373E481F35AA180059355A /* HistoryObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HistoryObject.h; sourceTree = "<group>"; };
 		E9373E491F35AA180059355A /* HistoryObject.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HistoryObject.m; sourceTree = "<group>"; };
 		E9373E4B1F361A230059355A /* HistoryGraphObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HistoryGraphObject.h; sourceTree = "<group>"; };
 		E9373E4C1F361A230059355A /* HistoryGraphObject.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HistoryGraphObject.m; sourceTree = "<group>"; };
+		E9497FD31F46EC1100E6AF8D /* MemberObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MemberObject.h; sourceTree = "<group>"; };
+		E9497FD41F46EC1100E6AF8D /* MemberObject.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MemberObject.m; sourceTree = "<group>"; };
 		E9682E2B1F39675A00FE05A2 /* RankingTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RankingTableViewCell.h; sourceTree = "<group>"; };
 		E9682E2C1F39675A00FE05A2 /* RankingTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RankingTableViewCell.m; sourceTree = "<group>"; };
 		E9682E2D1F39675A00FE05A2 /* RankingTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = RankingTableViewCell.xib; sourceTree = "<group>"; };
 		E96855081F3C444900317CEF /* AutoTransButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AutoTransButton.h; sourceTree = "<group>"; };
 		E96855091F3C444900317CEF /* AutoTransButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AutoTransButton.m; sourceTree = "<group>"; };
 		E968550E1F3C5D9A00317CEF /* SNSRecentTopicTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SNSRecentTopicTableViewCell.h; sourceTree = "<group>"; };
 		E968550F1F3C5D9A00317CEF /* SNSRecentTopicTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SNSRecentTopicTableViewCell.m; sourceTree = "<group>"; };
 		E96855101F3C5D9A00317CEF /* SNSRecentTopicTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SNSRecentTopicTableViewCell.xib; sourceTree = "<group>"; };
 		E997E0251F3AB66500709FB1 /* Social.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Social.framework; path = System/Library/Frameworks/Social.framework; sourceTree = SDKROOT; };
 		E99E13A91F336F3600C78787 /* CollectionView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CollectionView.h; sourceTree = "<group>"; };
 		E99E13AA1F336F3600C78787 /* CollectionView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CollectionView.m; sourceTree = "<group>"; };
 		E99E13AC1F336F4500C78787 /* CollectionView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = CollectionView.xib; sourceTree = "<group>"; };
 		E99E13AE1F33720600C78787 /* LabelCollectionViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LabelCollectionViewCell.h; sourceTree = "<group>"; };
 		E99E13AF1F33720600C78787 /* LabelCollectionViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LabelCollectionViewCell.m; sourceTree = "<group>"; };
 		E99E13B01F33720600C78787 /* LabelCollectionViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = LabelCollectionViewCell.xib; sourceTree = "<group>"; };
 		E9D9091F1F3D559D004CF99F /* TweetObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TweetObject.h; sourceTree = "<group>"; };
 		E9D909201F3D559D004CF99F /* TweetObject.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TweetObject.m; sourceTree = "<group>"; };
 		E9D909221F3D6E8C004CF99F /* BaseTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BaseTableViewController.h; sourceTree = "<group>"; };
 		E9D909231F3D6E8C004CF99F /* BaseTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BaseTableViewController.m; sourceTree = "<group>"; };
 		E9F73DC91F338A0F004A3A6F /* HistoryListTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HistoryListTableViewCell.h; sourceTree = "<group>"; };
 		E9F73DCA1F338A0F004A3A6F /* HistoryListTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HistoryListTableViewCell.m; sourceTree = "<group>"; };
 		E9F73DCB1F338A0F004A3A6F /* HistoryListTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = HistoryListTableViewCell.xib; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 /* Begin PBXFrameworksBuildPhase section */
 		6E84E36E1F27A700001EB88E /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 				E997E0261F3AB66500709FB1 /* Social.framework in Frameworks */,
 				011799F0F2B47D80472673CE /* Pods_LifeLog.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 		6E84E3871F27A703001EB88E /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 		6E84E3921F27A703001EB88E /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXFrameworksBuildPhase section */
 /* Begin PBXGroup section */
 		020C1721B642EF36F31E1BB4 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
 				E997E0251F3AB66500709FB1 /* Social.framework */,
 				2D9F4ED6F06C8F252B9EAF48 /* Pods_LifeLog.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
 		6E18CECF1F2E398C0029891F /* Login */ = {
 			isa = PBXGroup;
 			children = (
 				9CA8AEE61F31BB1200C5FC74 /* ConfirmForgetPass */,
 				6E18CED01F2E39DB0029891F /* LoginViewController.h */,
 				6E18CED11F2E39DB0029891F /* LoginViewController.m */,
 				6E18CED21F2E39DB0029891F /* LoginViewController.xib */,
 			);
 			name = Login;
 			sourceTree = "<group>";
 		};
 		6E18CED51F2E3C0E0029891F /* ServerAPI */ = {
 			isa = PBXGroup;
 			children = (
 				6E18CED61F2E3C840029891F /* ServerAPI.h */,
 				6E18CED71F2E3C840029891F /* ServerAPI.m */,
 			);
 			name = ServerAPI;
 			sourceTree = "<group>";
 		};
 		6E18CED91F2E40AE0029891F /* Model */ = {
 			isa = PBXGroup;
 			children = (
 				6E18CEDD1F2E46570029891F /* Entities.h */,
 				6EA4AF2B1F40BB7A00F52CFE /* StepObject.h */,
 				6EA4AF2C1F40BB7A00F52CFE /* StepObject.m */,
 				6EA4AF2D1F40BB7A00F52CFE /* TargetInfor.h */,
 				6EA4AF2E1F40BB7A00F52CFE /* TargetInfor.m */,
 				6EA4AF2F1F40BB7A00F52CFE /* TopObject.h */,
 				6EA4AF301F40BB7A00F52CFE /* TopObject.m */,
 				6E18CEDA1F2E40F50029891F /* User.h */,
 				6E18CEDB1F2E40F50029891F /* User.m */,
 				E9373E481F35AA180059355A /* HistoryObject.h */,
 				E9373E491F35AA180059355A /* HistoryObject.m */,
 				E9373E4B1F361A230059355A /* HistoryGraphObject.h */,
 				E9373E4C1F361A230059355A /* HistoryGraphObject.m */,
 				E9D9091F1F3D559D004CF99F /* TweetObject.h */,
 				E9D909201F3D559D004CF99F /* TweetObject.m */,
 				E933E6721F3E0E4E002926F5 /* GroupObject.h */,
 				E933E6731F3E0E4E002926F5 /* GroupObject.m */,
+				E9497FD31F46EC1100E6AF8D /* MemberObject.h */,
+				E9497FD41F46EC1100E6AF8D /* MemberObject.m */,
 			);
 			name = Model;
 			sourceTree = "<group>";
 		};
 		6E7F93391F35870F00EFBC71 /* TPKeyboardAvoiding */ = {
 			isa = PBXGroup;
 			children = (
 				6E7F933A1F35872B00EFBC71 /* TPKeyboardAvoidingCollectionView.h */,
 				6E7F933B1F35872B00EFBC71 /* TPKeyboardAvoidingCollectionView.m */,
 				6E7F933C1F35872B00EFBC71 /* TPKeyboardAvoidingScrollView.h */,
 				6E7F933D1F35872B00EFBC71 /* TPKeyboardAvoidingScrollView.m */,
 				6E7F933E1F35872B00EFBC71 /* TPKeyboardAvoidingTableView.h */,
 				6E7F933F1F35872B00EFBC71 /* TPKeyboardAvoidingTableView.m */,
 				6E7F93401F35872B00EFBC71 /* UIScrollView+TPKeyboardAvoidingAdditions.h */,
 				6E7F93411F35872B00EFBC71 /* UIScrollView+TPKeyboardAvoidingAdditions.m */,
 			);
 			name = TPKeyboardAvoiding;
 			sourceTree = "<group>";
 		};
 		6E84E3681F27A700001EB88E = {
 			isa = PBXGroup;
 			children = (
 				6E84E3731F27A700001EB88E /* LifeLog */,
 				6E84E38D1F27A703001EB88E /* LifeLogTests */,
 				6E84E3981F27A703001EB88E /* LifeLogUITests */,
 				DE8269E957EA47CD771BAB33 /* Pods */,
 				020C1721B642EF36F31E1BB4 /* Frameworks */,
+				783929CF869F5081762B3DCA /* Products */,
 			);
 			sourceTree = "<group>";
 		};
 		6E84E3721F27A700001EB88E /* Products */ = {
 			isa = PBXGroup;
 			children = (
 				6E84E3711F27A700001EB88E /* LifeLog.app */,
 				6E84E38A1F27A703001EB88E /* LifeLogTests.xctest */,
 				6E84E3951F27A703001EB88E /* LifeLogUITests.xctest */,
 			);
 			name = Products;
 			sourceTree = "<group>";
 		};
 		6E84E3731F27A700001EB88E /* LifeLog */ = {
 			isa = PBXGroup;
 			children = (
 				6E18CED91F2E40AE0029891F /* Model */,
 				6E18CED51F2E3C0E0029891F /* ServerAPI */,
 				6EDC8BEB1F2C2F3300765ACC /* Common */,
 				6ECC406D1F2A5FA500AAEB97 /* Library */,
 				E99E13A71F336F0C00C78787 /* CustomView */,
 				6E84E3A81F27A8A9001EB88E /* ViewControllers */,
 				6E84E3A71F27A887001EB88E /* AppDelegate */,
 				6E84E3801F27A701001EB88E /* Assets.xcassets */,
 				6E84E3821F27A701001EB88E /* LaunchScreen.storyboard */,
 				6E84E3851F27A701001EB88E /* Info.plist */,
 				6E84E3741F27A701001EB88E /* Supporting Files */,
 			);
 			path = LifeLog;
 			sourceTree = "<group>";
 		};
 		6E84E3741F27A701001EB88E /* Supporting Files */ = {
 			isa = PBXGroup;
 			children = (
 				6E84E3751F27A701001EB88E /* main.m */,
 				6EF163091F29069300DA306C /* Localizable.strings */,
 			);
 			name = "Supporting Files";
 			sourceTree = "<group>";
 		};
 		6E84E38D1F27A703001EB88E /* LifeLogTests */ = {
 			isa = PBXGroup;
 			children = (
 				6E84E38E1F27A703001EB88E /* LifeLogTests.m */,
 				6E84E3901F27A703001EB88E /* Info.plist */,
 			);
 			path = LifeLogTests;
 			sourceTree = "<group>";
 		};
 		6E84E3981F27A703001EB88E /* LifeLogUITests */ = {
 			isa = PBXGroup;
 			children = (
 				6E84E3991F27A703001EB88E /* LifeLogUITests.m */,
 				6E84E39B1F27A703001EB88E /* Info.plist */,
 			);
 			path = LifeLogUITests;
 			sourceTree = "<group>";
 		};
 		6E84E3A71F27A887001EB88E /* AppDelegate */ = {
 			isa = PBXGroup;
 			children = (
 				6E84E3771F27A701001EB88E /* AppDelegate.h */,
 				6E84E3781F27A701001EB88E /* AppDelegate.m */,
 			);
 			name = AppDelegate;
 			sourceTree = "<group>";
 		};
 		6E84E3A81F27A8A9001EB88E /* ViewControllers */ = {
 			isa = PBXGroup;
 			children = (
 				9CBDA0F71F2ECDFD0055DED1 /* BaseViewController */,
 				9CBDA0FB1F2F03490055DED1 /* Register */,
 				6E18CECF1F2E398C0029891F /* Login */,
 				6E84E3AC1F27A954001EB88E /* SNS */,
 				6E84E3C11F27AC89001EB88E /* Map */,
 				6E84E3AB1F27A946001EB88E /* Ranking */,
 				6E84E3AA1F27A924001EB88E /* History */,
 				6E84E3A91F27A915001EB88E /* Home */,
 			);
 			name = ViewControllers;
 			sourceTree = "<group>";
 		};
 		6E84E3A91F27A915001EB88E /* Home */ = {
 			isa = PBXGroup;
 			children = (
 				6E8DA0F31F2BAC0800CCE941 /* Today */,
 				6E84E3AD1F27A975001EB88E /* HomeViewController.h */,
 				6E84E3AE1F27A975001EB88E /* HomeViewController.m */,
 				6E84E3AF1F27A975001EB88E /* HomeViewController.xib */,
 			);
 			name = Home;
 			sourceTree = "<group>";
 		};
 		6E84E3AA1F27A924001EB88E /* History */ = {
 			isa = PBXGroup;
 			children = (
 				6E84E3B21F27A98B001EB88E /* HistoryViewController.h */,
 				6E84E3B31F27A98B001EB88E /* HistoryViewController.m */,
 				6E84E3B41F27A98B001EB88E /* HistoryViewController.xib */,
 				E9F73DC91F338A0F004A3A6F /* HistoryListTableViewCell.h */,
 				E9F73DCA1F338A0F004A3A6F /* HistoryListTableViewCell.m */,
 				E9F73DCB1F338A0F004A3A6F /* HistoryListTableViewCell.xib */,
 			);
 			name = History;
 			sourceTree = "<group>";
 		};
 		6E84E3AB1F27A946001EB88E /* Ranking */ = {
 			isa = PBXGroup;
 			children = (
 				6E84E3B71F27A9A0001EB88E /* RankingViewController.h */,
 				6E84E3B81F27A9A0001EB88E /* RankingViewController.m */,
 				6E84E3B91F27A9A0001EB88E /* RankingViewController.xib */,
 				E9682E2B1F39675A00FE05A2 /* RankingTableViewCell.h */,
 				E9682E2C1F39675A00FE05A2 /* RankingTableViewCell.m */,
 				E9682E2D1F39675A00FE05A2 /* RankingTableViewCell.xib */,
 			);
 			name = Ranking;
 			sourceTree = "<group>";
 		};
 		6E84E3AC1F27A954001EB88E /* SNS */ = {
 			isa = PBXGroup;
 			children = (
-				E933E6751F4050E6002926F5 /* GrouDetail */,
+				E933E6751F4050E6002926F5 /* GroupDetail */,
 				E933E6671F3E0479002926F5 /* SeachGroup */,
 				6E84E3BC1F27A9B1001EB88E /* SNSViewController.h */,
 				6E84E3BD1F27A9B1001EB88E /* SNSViewController.m */,
 				6E84E3BE1F27A9B1001EB88E /* SNSViewController.xib */,
 				E968550E1F3C5D9A00317CEF /* SNSRecentTopicTableViewCell.h */,
 				E968550F1F3C5D9A00317CEF /* SNSRecentTopicTableViewCell.m */,
 				E96855101F3C5D9A00317CEF /* SNSRecentTopicTableViewCell.xib */,
 			);
 			name = SNS;
 			sourceTree = "<group>";
 		};
 		6E84E3C11F27AC89001EB88E /* Map */ = {
 			isa = PBXGroup;
 			children = (
 				6E84E3C21F27ACAE001EB88E /* MapViewController.h */,
 				6E84E3C31F27ACAE001EB88E /* MapViewController.m */,
 				6E84E3C41F27ACAE001EB88E /* MapViewController.xib */,
 			);
 			name = Map;
 			sourceTree = "<group>";
 		};
 		6E8DA0F31F2BAC0800CCE941 /* Today */ = {
 			isa = PBXGroup;
 			children = (
 				6E8DA0F41F2BAC3400CCE941 /* TodayViewController.h */,
 				6E8DA0F51F2BAC3400CCE941 /* TodayViewController.m */,
 				6E8DA0F61F2BAC3400CCE941 /* TodayViewController.xib */,
 			);
 			name = Today;
 			sourceTree = "<group>";
 		};
 		6ECC406D1F2A5FA500AAEB97 /* Library */ = {
 			isa = PBXGroup;
 			children = (
 				6E7F93391F35870F00EFBC71 /* TPKeyboardAvoiding */,
 				6ECC406E1F2A5FB200AAEB97 /* Category */,
 			);
 			name = Library;
 			sourceTree = "<group>";
 		};
 		6ECC406E1F2A5FB200AAEB97 /* Category */ = {
 			isa = PBXGroup;
 			children = (
 				6ECC406F1F2A5FEB00AAEB97 /* NSDate+helper.h */,
 				6ECC40701F2A5FEB00AAEB97 /* NSDate+helper.m */,
 			);
 			name = Category;
 			sourceTree = "<group>";
 		};
 		6EDC8BEB1F2C2F3300765ACC /* Common */ = {
 			isa = PBXGroup;
 			children = (
 				6EDC8BEC1F2C2FB800765ACC /* Utilities.h */,
 				6EDC8BED1F2C2FB800765ACC /* Utilities.m */,
 				6EDC8BF21F2C68D700765ACC /* CMMotionActivityExtra.h */,
 				6EDC8BF31F2C68D700765ACC /* CMMotionActivityExtra.m */,
 			);
 			name = Common;
 			sourceTree = "<group>";
 		};
+		783929CF869F5081762B3DCA /* Products */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
 		9CA8AEE61F31BB1200C5FC74 /* ConfirmForgetPass */ = {
 			isa = PBXGroup;
 			children = (
 				9CA8AEE71F31BB4600C5FC74 /* ConfirmForgetPassViewController.h */,
 				9CA8AEE81F31BB4600C5FC74 /* ConfirmForgetPassViewController.m */,
 				9CA8AEE91F31BB4600C5FC74 /* ConfirmForgetPassViewController.xib */,
 			);
 			name = ConfirmForgetPass;
 			sourceTree = "<group>";
 		};
 		9CBDA0F71F2ECDFD0055DED1 /* BaseViewController */ = {
 			isa = PBXGroup;
 			children = (
 				9CBDA0F81F2ECE2C0055DED1 /* BaseViewController.h */,
 				9CBDA0F91F2ECE2C0055DED1 /* BaseViewController.m */,
 				6E48AF0B1F2F9D3200C1D184 /* CustomTextField.h */,
 				6E48AF0C1F2F9D3200C1D184 /* CustomTextField.m */,
 				E9D909221F3D6E8C004CF99F /* BaseTableViewController.h */,
 				E9D909231F3D6E8C004CF99F /* BaseTableViewController.m */,
 			);
 			name = BaseViewController;
 			sourceTree = "<group>";
 		};
 		9CBDA0FB1F2F03490055DED1 /* Register */ = {
 			isa = PBXGroup;
 			children = (
 				9CBDA0FC1F2F03810055DED1 /* RegisterViewController.h */,
 				9CBDA0FD1F2F03810055DED1 /* RegisterViewController.m */,
 				9CBDA0FE1F2F03810055DED1 /* RegisterViewController.xib */,
 			);
 			name = Register;
 			sourceTree = "<group>";
 		};
 		DE8269E957EA47CD771BAB33 /* Pods */ = {
 			isa = PBXGroup;
 			children = (
 				6E84E3721F27A700001EB88E /* Products */,
 				0FC2D57087AF4571C57FAE08 /* Pods-LifeLog.debug.xcconfig */,
 				4CFDA5714AF852358A1EB515 /* Pods-LifeLog.release.xcconfig */,
 			);
 			name = Pods;
 			sourceTree = "<group>";
 		};
 		E933E6671F3E0479002926F5 /* SeachGroup */ = {
 			isa = PBXGroup;
 			children = (
 				E933E6681F3E04A6002926F5 /* SearchGroupViewController.h */,
 				E933E6691F3E04A6002926F5 /* SearchGroupViewController.m */,
 				E933E66A1F3E04A6002926F5 /* SearchGroupViewController.xib */,
 				E933E66D1F3E09B6002926F5 /* SearchGroupTableViewCell.h */,
 				E933E66E1F3E09B6002926F5 /* SearchGroupTableViewCell.m */,
 				E933E66F1F3E09B6002926F5 /* SearchGroupTableViewCell.xib */,
 			);
 			name = SeachGroup;
 			sourceTree = "<group>";
 		};
-		E933E6751F4050E6002926F5 /* GrouDetail */ = {
+		E933E6751F4050E6002926F5 /* GroupDetail */ = {
 			isa = PBXGroup;
 			children = (
 				E933E6761F40513C002926F5 /* GroupDetailViewController.h */,
 				E933E6771F40513C002926F5 /* GroupDetailViewController.m */,
 				E933E6781F40513C002926F5 /* GroupDetailViewController.xib */,
 			);
-			name = GrouDetail;
+			name = GroupDetail;
 			sourceTree = "<group>";
 		};
 		E9373E441F35966D0059355A /* AutoTranslateView */ = {
 			isa = PBXGroup;
 			children = (
 				E9373E451F3596940059355A /* AutoTransLabel.h */,
 				E9373E461F3596940059355A /* AutoTransLabel.m */,
 				E96855081F3C444900317CEF /* AutoTransButton.h */,
 				E96855091F3C444900317CEF /* AutoTransButton.m */,
 			);
 			name = AutoTranslateView;
 			sourceTree = "<group>";
 		};
 		E99E13A71F336F0C00C78787 /* CustomView */ = {
 			isa = PBXGroup;
 			children = (
 				E9373E441F35966D0059355A /* AutoTranslateView */,
 				E99E13A81F336F1700C78787 /* CollectionView */,
 			);
 			name = CustomView;
 			sourceTree = "<group>";
 		};
 		E99E13A81F336F1700C78787 /* CollectionView */ = {
 			isa = PBXGroup;
 			children = (
 				E99E13AE1F33720600C78787 /* LabelCollectionViewCell.h */,
 				E99E13AF1F33720600C78787 /* LabelCollectionViewCell.m */,
 				E99E13B01F33720600C78787 /* LabelCollectionViewCell.xib */,
 				E99E13A91F336F3600C78787 /* CollectionView.h */,
 				E99E13AA1F336F3600C78787 /* CollectionView.m */,
 				E99E13AC1F336F4500C78787 /* CollectionView.xib */,
 			);
 			name = CollectionView;
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
 /* Begin PBXNativeTarget section */
 		6E84E3701F27A700001EB88E /* LifeLog */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 6E84E39E1F27A703001EB88E /* Build configuration list for PBXNativeTarget "LifeLog" */;
 			buildPhases = (
 				2BB22CAEC0728AA1E086BCE3 /* [CP] Check Pods Manifest.lock */,
 				6E84E36D1F27A700001EB88E /* Sources */,
 				6E84E36E1F27A700001EB88E /* Frameworks */,
 				6E84E36F1F27A700001EB88E /* Resources */,
 				22F89B11794CEB4E265996AC /* [CP] Embed Pods Frameworks */,
 				96653BDB2C24A87C2866C897 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
 			dependencies = (
 			);
 			name = LifeLog;
 			productName = LifeLog;
 			productReference = 6E84E3711F27A700001EB88E /* LifeLog.app */;
 			productType = "com.apple.product-type.application";
 		};
 		6E84E3891F27A703001EB88E /* LifeLogTests */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 6E84E3A11F27A703001EB88E /* Build configuration list for PBXNativeTarget "LifeLogTests" */;
 			buildPhases = (
 				6E84E3861F27A703001EB88E /* Sources */,
 				6E84E3871F27A703001EB88E /* Frameworks */,
 				6E84E3881F27A703001EB88E /* Resources */,
 			);
 			buildRules = (
 			);
 			dependencies = (
 				6E84E38C1F27A703001EB88E /* PBXTargetDependency */,
 			);
 			name = LifeLogTests;
 			productName = LifeLogTests;
 			productReference = 6E84E38A1F27A703001EB88E /* LifeLogTests.xctest */;
 			productType = "com.apple.product-type.bundle.unit-test";
 		};
 		6E84E3941F27A703001EB88E /* LifeLogUITests */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 6E84E3A41F27A703001EB88E /* Build configuration list for PBXNativeTarget "LifeLogUITests" */;
 			buildPhases = (
 				6E84E3911F27A703001EB88E /* Sources */,
 				6E84E3921F27A703001EB88E /* Frameworks */,
 				6E84E3931F27A703001EB88E /* Resources */,
 			);
 			buildRules = (
 			);
 			dependencies = (
 				6E84E3971F27A703001EB88E /* PBXTargetDependency */,
 			);
 			name = LifeLogUITests;
 			productName = LifeLogUITests;
 			productReference = 6E84E3951F27A703001EB88E /* LifeLogUITests.xctest */;
 			productType = "com.apple.product-type.bundle.ui-testing";
 		};
 /* End PBXNativeTarget section */
 /* Begin PBXProject section */
 		6E84E3691F27A700001EB88E /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
 				LastUpgradeCheck = 0830;
 				ORGANIZATIONNAME = PhongNV;
 				TargetAttributes = {
 					6E84E3701F27A700001EB88E = {
 						CreatedOnToolsVersion = 8.3.3;
 						DevelopmentTeam = UXU4V3VUN4;
 						ProvisioningStyle = Automatic;
 					};
 					6E84E3891F27A703001EB88E = {
 						CreatedOnToolsVersion = 8.3.3;
 						ProvisioningStyle = Automatic;
 						TestTargetID = 6E84E3701F27A700001EB88E;
 					};
 					6E84E3941F27A703001EB88E = {
 						CreatedOnToolsVersion = 8.3.3;
 						ProvisioningStyle = Automatic;
 						TestTargetID = 6E84E3701F27A700001EB88E;
 					};
 				};
 			};
 			buildConfigurationList = 6E84E36C1F27A700001EB88E /* Build configuration list for PBXProject "LifeLog" */;
 			compatibilityVersion = "Xcode 3.2";
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
 				Base,
 			);
 			mainGroup = 6E84E3681F27A700001EB88E;
-			productRefGroup = 6E84E3721F27A700001EB88E /* Products */;
+			productRefGroup = 783929CF869F5081762B3DCA /* Products */;
 			projectDirPath = "";
 			projectRoot = "";
 			targets = (
 				6E84E3701F27A700001EB88E /* LifeLog */,
 				6E84E3891F27A703001EB88E /* LifeLogTests */,
 				6E84E3941F27A703001EB88E /* LifeLogUITests */,
 			);
 		};
 /* End PBXProject section */
 /* Begin PBXResourcesBuildPhase section */
 		6E84E36F1F27A700001EB88E /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 				9CBDA1001F2F03810055DED1 /* RegisterViewController.xib in Resources */,
 				6E18CED41F2E39DB0029891F /* LoginViewController.xib in Resources */,
 				E99E13AD1F336F4500C78787 /* CollectionView.xib in Resources */,
 				6E84E3BB1F27A9A0001EB88E /* RankingViewController.xib in Resources */,
 				9CA8AEEB1F31BB4600C5FC74 /* ConfirmForgetPassViewController.xib in Resources */,
 				6E84E3C01F27A9B1001EB88E /* SNSViewController.xib in Resources */,
 				E9682E2F1F39675A00FE05A2 /* RankingTableViewCell.xib in Resources */,
 				E933E6711F3E09B6002926F5 /* SearchGroupTableViewCell.xib in Resources */,
 				6E8DA0F81F2BAC3500CCE941 /* TodayViewController.xib in Resources */,
 				6E84E3841F27A701001EB88E /* LaunchScreen.storyboard in Resources */,
 				6E84E3811F27A701001EB88E /* Assets.xcassets in Resources */,
 				6E84E3C61F27ACAE001EB88E /* MapViewController.xib in Resources */,
 				6EF1630A1F29069300DA306C /* Localizable.strings in Resources */,
 				6E84E3B11F27A975001EB88E /* HomeViewController.xib in Resources */,
 				6E84E3B61F27A98B001EB88E /* HistoryViewController.xib in Resources */,
 				E933E66C1F3E04A6002926F5 /* SearchGroupViewController.xib in Resources */,
 				E96855121F3C5D9A00317CEF /* SNSRecentTopicTableViewCell.xib in Resources */,
 				E933E67A1F40513C002926F5 /* GroupDetailViewController.xib in Resources */,
 				E99E13B21F33720600C78787 /* LabelCollectionViewCell.xib in Resources */,
 				E9F73DCD1F338A0F004A3A6F /* HistoryListTableViewCell.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 		6E84E3881F27A703001EB88E /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 		6E84E3931F27A703001EB88E /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXResourcesBuildPhase section */
 /* Begin PBXShellScriptBuildPhase section */
 		22F89B11794CEB4E265996AC /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-LifeLog/Pods-LifeLog-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 		2BB22CAEC0728AA1E086BCE3 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
 			name = "[CP] Check Pods Manifest.lock";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n";
 			showEnvVarsInLog = 0;
 		};
 		96653BDB2C24A87C2866C897 /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
 			name = "[CP] Copy Pods Resources";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-LifeLog/Pods-LifeLog-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */
 /* Begin PBXSourcesBuildPhase section */
 		6E84E36D1F27A700001EB88E /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 				6E18CED81F2E3C840029891F /* ServerAPI.m in Sources */,
 				6E7F93431F35872B00EFBC71 /* TPKeyboardAvoidingScrollView.m in Sources */,
 				6E7F93421F35872B00EFBC71 /* TPKeyboardAvoidingCollectionView.m in Sources */,
 				E968550A1F3C444900317CEF /* AutoTransButton.m in Sources */,
 				6EA4AF321F40BB7A00F52CFE /* TargetInfor.m in Sources */,
 				E933E6741F3E0E4E002926F5 /* GroupObject.m in Sources */,
 				9CBDA0FA1F2ECE2C0055DED1 /* BaseViewController.m in Sources */,
 				6E8DA0F71F2BAC3400CCE941 /* TodayViewController.m in Sources */,
 				6E7F93451F35872B00EFBC71 /* UIScrollView+TPKeyboardAvoidingAdditions.m in Sources */,
 				E9682E2E1F39675A00FE05A2 /* RankingTableViewCell.m in Sources */,
 				E9D909211F3D559D004CF99F /* TweetObject.m in Sources */,
 				6E48AF0D1F2F9D3300C1D184 /* CustomTextField.m in Sources */,
 				E99E13AB1F336F3600C78787 /* CollectionView.m in Sources */,
 				6E84E3B01F27A975001EB88E /* HomeViewController.m in Sources */,
 				E9373E471F3596940059355A /* AutoTransLabel.m in Sources */,
 				6E84E3791F27A701001EB88E /* AppDelegate.m in Sources */,
 				6E84E3BA1F27A9A0001EB88E /* RankingViewController.m in Sources */,
 				6E7F93441F35872B00EFBC71 /* TPKeyboardAvoidingTableView.m in Sources */,
 				E9F73DCC1F338A0F004A3A6F /* HistoryListTableViewCell.m in Sources */,
 				6EDC8BF41F2C68D700765ACC /* CMMotionActivityExtra.m in Sources */,
 				E933E6791F40513C002926F5 /* GroupDetailViewController.m in Sources */,
 				6EA4AF311F40BB7A00F52CFE /* StepObject.m in Sources */,
 				9CBDA0FF1F2F03810055DED1 /* RegisterViewController.m in Sources */,
 				E9373E4A1F35AA180059355A /* HistoryObject.m in Sources */,
 				9CA8AEEA1F31BB4600C5FC74 /* ConfirmForgetPassViewController.m in Sources */,
 				E99E13B11F33720600C78787 /* LabelCollectionViewCell.m in Sources */,
 				6EDC8BEE1F2C2FB800765ACC /* Utilities.m in Sources */,
 				E96855111F3C5D9A00317CEF /* SNSRecentTopicTableViewCell.m in Sources */,
 				6E84E3C51F27ACAE001EB88E /* MapViewController.m in Sources */,
 				6E18CEDC1F2E40F50029891F /* User.m in Sources */,
 				6ECC40711F2A5FEB00AAEB97 /* NSDate+helper.m in Sources */,
+				E9497FD51F46EC1100E6AF8D /* MemberObject.m in Sources */,
 				6E18CED31F2E39DB0029891F /* LoginViewController.m in Sources */,
 				6EA4AF331F40BB7A00F52CFE /* TopObject.m in Sources */,
 				E9D909241F3D6E8C004CF99F /* BaseTableViewController.m in Sources */,
 				6E84E3761F27A701001EB88E /* main.m in Sources */,
 				E933E6701F3E09B6002926F5 /* SearchGroupTableViewCell.m in Sources */,
 				6E84E3B51F27A98B001EB88E /* HistoryViewController.m in Sources */,
 				E9373E4D1F361A230059355A /* HistoryGraphObject.m in Sources */,
 				E933E66B1F3E04A6002926F5 /* SearchGroupViewController.m in Sources */,
 				6E84E3BF1F27A9B1001EB88E /* SNSViewController.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 		6E84E3861F27A703001EB88E /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 				6E84E38F1F27A703001EB88E /* LifeLogTests.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 		6E84E3911F27A703001EB88E /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 				6E84E39A1F27A703001EB88E /* LifeLogUITests.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXSourcesBuildPhase section */
 /* Begin PBXTargetDependency section */
 		6E84E38C1F27A703001EB88E /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = 6E84E3701F27A700001EB88E /* LifeLog */;
 			targetProxy = 6E84E38B1F27A703001EB88E /* PBXContainerItemProxy */;
 		};
 		6E84E3971F27A703001EB88E /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = 6E84E3701F27A700001EB88E /* LifeLog */;
 			targetProxy = 6E84E3961F27A703001EB88E /* PBXContainerItemProxy */;
 		};
 /* End PBXTargetDependency section */
 /* Begin PBXVariantGroup section */
 		6E84E3821F27A701001EB88E /* LaunchScreen.storyboard */ = {
 			isa = PBXVariantGroup;
 			children = (
 				6E84E3831F27A701001EB88E /* Base */,
 			);
 			name = LaunchScreen.storyboard;
 			sourceTree = "<group>";
 		};
 /* End PBXVariantGroup section */
 /* Begin XCBuildConfiguration section */
 		6E84E39C1F27A703001EB88E /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					"$(inherited)",
 				);
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 10.3;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
 		};
 		6E84E39D1F27A703001EB88E /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 10.3;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;
 		};
 		6E84E39F1F27A703001EB88E /* Debug */ = {
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 0FC2D57087AF4571C57FAE08 /* Pods-LifeLog.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = LifeLog/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-framework",
 					"\"CircleProgressBar\"",
 					"-all_load",
 					"-ObjC",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = mobileworld.jp.lifelog;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 			};
 			name = Debug;
 		};
 		6E84E3A01F27A703001EB88E /* Release */ = {
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 4CFDA5714AF852358A1EB515 /* Pods-LifeLog.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = LifeLog/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-framework",
 					"\"CircleProgressBar\"",
 					"-all_load",
 					"-ObjC",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = mobileworld.jp.lifelog;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 			};
 			name = Release;
 		};
 		6E84E3A21F27A703001EB88E /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				INFOPLIST_FILE = LifeLogTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.mav.LifeLogTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/LifeLog.app/LifeLog";
 			};
 			name = Debug;
 		};
 		6E84E3A31F27A703001EB88E /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				INFOPLIST_FILE = LifeLogTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.mav.LifeLogTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/LifeLog.app/LifeLog";
 			};
 			name = Release;
 		};
 		6E84E3A51F27A703001EB88E /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				INFOPLIST_FILE = LifeLogUITests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.mav.LifeLogUITests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TEST_TARGET_NAME = LifeLog;
 			};
 			name = Debug;
 		};
 		6E84E3A61F27A703001EB88E /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				INFOPLIST_FILE = LifeLogUITests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.mav.LifeLogUITests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TEST_TARGET_NAME = LifeLog;
 			};
 			name = Release;
 		};
 /* End XCBuildConfiguration section */
 /* Begin XCConfigurationList section */
 		6E84E36C1F27A700001EB88E /* Build configuration list for PBXProject "LifeLog" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				6E84E39C1F27A703001EB88E /* Debug */,
 				6E84E39D1F27A703001EB88E /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
 		6E84E39E1F27A703001EB88E /* Build configuration list for PBXNativeTarget "LifeLog" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				6E84E39F1F27A703001EB88E /* Debug */,
 				6E84E3A01F27A703001EB88E /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
 		6E84E3A11F27A703001EB88E /* Build configuration list for PBXNativeTarget "LifeLogTests" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				6E84E3A21F27A703001EB88E /* Debug */,
 				6E84E3A31F27A703001EB88E /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
 		6E84E3A41F27A703001EB88E /* Build configuration list for PBXNativeTarget "LifeLogUITests" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				6E84E3A51F27A703001EB88E /* Debug */,
 				6E84E3A61F27A703001EB88E /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
 	};
 	rootObject = 6E84E3691F27A700001EB88E /* Project object */;
 }

LifeLog/LifeLog/Entities.h

Diff comments View file @ 7fc917f

 //
 //  Entities.h
 //  LifeLog
 //
 //  Created by Nguyen Van Phong on 7/30/17.
 //  Copyright © 2017 PhongNV. All rights reserved.
 //
 #ifndef Entities_h
 #define Entities_h
 #import <MBProgressHUD/MBProgressHUD.h>
+#import "MemberObject.h"
 #import "GroupObject.h"
 #import "TweetObject.h"
 #import "HistoryGraphObject.h"
 #import "HistoryObject.h"
 #import "User.h"
 #import "TopObject.h"
 #endif /* Entities_h */

LifeLog/LifeLog/GroupDetailViewController.h

Diff comments View file @ 7fc917f

 //
 //  GroupDetailViewController.h
 //  LifeLog
 //
 //  Created by nvtu on 8/13/17.
 //  Copyright © 2017 PhongNV. All rights reserved.
 //
 #import <UIKit/UIKit.h>
 #import "BaseTableViewController.h"
 #import "Entities.h"
 #import "AutoTransButton.h"
 @interface GroupDetailViewController : BaseTableViewController {
     GroupObject * _curGroup;
+    BOOL        isMemberList;
 }
 @property (weak, nonatomic) IBOutlet UIImageView *imgAva;
 @property (weak, nonatomic) IBOutlet UILabel *lblGrpName;
 @property (weak, nonatomic) IBOutlet UILabel *lbbGrpActiveMode;
 @property (weak, nonatomic) IBOutlet UILabel *lblGrpGoal;
 @property (weak, nonatomic) IBOutlet AutoTransButton *btJoinGrp;
 @property (weak, nonatomic) IBOutlet AutoTransButton *btSwitch;
 - (IBAction)clickBack:(id)sender;
 - (void) setGroup : (GroupObject *) object;
-- (IBAction)clickSwitch:(AutoTransButton*)sender;
+- (IBAction)clickSwitch:(AutoTransButton *)sender;
+- (IBAction)clickJoin:(AutoTransButton *)sender;
 @end

LifeLog/LifeLog/GroupDetailViewController.m

Diff comments View file @ 7fc917f

 //
 //  GroupDetailViewController.m
 //  LifeLog
 //
 //  Created by nvtu on 8/13/17.
 //  Copyright © 2017 PhongNV. All rights reserved.
 //
 #import "GroupDetailViewController.h"
 #import <SDWebImage/UIImageView+WebCache.h>
 #import "Utilities.h"
 #import "ServerAPI.h"
 #import "SNSRecentTopicTableViewCell.h"
 @interface GroupDetailViewController ()
 @end
 @implementation GroupDetailViewController
 - (void)viewDidLoad {
     [super viewDidLoad];
-    [self setupView];
+    isMemberList = false;
     //register nib for table view
     [self.tableBase registerNib:[UINib nibWithNibName:@"SNSRecentTopicTableViewCell" bundle:nil] forCellReuseIdentifier:@"RecentTopicCell"];
     if(_curGroup != nil) {
         [self requestGroupDetail];
     }
     // Do any additional setup after loading the view from its nib.
 }
 - (void)didReceiveMemoryWarning {
     [super didReceiveMemoryWarning];
     // Dispose of any resources that can be recreated.
 }
 - (void) setGroup : (GroupObject *) object {
     _curGroup = object;
 }
-- (IBAction)clickSwitch:(id)sender {
-}
 - (void)setupView {
     if(_curGroup != nil) {
         if(_curGroup.avatar && ![_curGroup.avatar isKindOfClass:[NSNull class]]) {
             [self.imgAva sd_setImageWithURL:[NSURL URLWithString:[Utilities getImageLink:_curGroup.avatar]]];
         }
-        self.lblGrpName.text = _curGroup.name;
+        [self.lblGrpName setText:_curGroup.name];
-        self.lblGrpGoal.text = _curGroup.goal;
+        [self.lblGrpGoal setText:_curGroup.goal];
+        [self.btJoinGrp setHidden:_curGroup.isJoin];
         NSString *mode = @"";
         if(_curGroup.runMode) {
             mode = [mode stringByAppendingString:@"ランニング\n"];
         }
         if(_curGroup.walkMode) {
             mode = [mode stringByAppendingString:@"ウォーキング\n"];
         }
         if(_curGroup.bikeMode) {
             mode = [mode stringByAppendingString:@"バイク\n"];
         }
         self.lbbGrpActiveMode.text = mode;
     }
 }
 #pragma mark IBAction
 - (IBAction)clickBack:(id)sender {
     [self.navigationController popViewControllerAnimated:true];
 }
+- (IBAction)clickSwitch:(AutoTransButton *)sender {
+    isMemberList = !isMemberList;
+    [self resetData];
+}
+- (IBAction)clickJoin:(AutoTransButton *)sender {
+    NSString * token = [[NSUserDefaults standardUserDefaults] stringForKey:kToken];
+    MBProgressHUD *hudView = [MBProgressHUD showHUDAddedTo:self.view animated:true];
+    [[ServerAPI server] requestTweetsList:token groupID:_curGroup.groupID withPage:_curPage CompletionHandler:^(NSArray *array, NSError *error){
+        dispatch_async(dispatch_get_main_queue(), ^{
+            if(hudView != nil) {
+                [hudView hideAnimated:true];
+            }
+        });
+    }];
+}
 #pragma mark UITableView Delegate
 - (UITableViewCell *) tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
     SNSRecentTopicTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:@"RecentTopicCell"];
-    TweetObject *object = [_curDataList objectAtIndex:indexPath.row];
+    if(isMemberList) {
-    if(object.avatarLink && ![object.avatarLink isKindOfClass:[NSNull class]]) {
+        MemberObject *object = [_curDataList objectAtIndex:indexPath.row];
-        [cell.imgAvatar sd_setImageWithURL:[NSURL URLWithString:[Utilities getImageLink:object.avatarLink]]];
+        if(object.avatar && ![object.avatar isKindOfClass:[NSNull class]]) {
+            [cell.imgAvatar sd_setImageWithURL:[NSURL URLWithString:[Utilities getImageLink:object.avatar]]];
+        }
+        cell.lblUsername.text   = @"";
+        cell.lblDateTime.text   = @"";
+        cell.lblDes.text        = object.userName;
+        cell.lblMode.text       = @"";
+        cell.lblDistance.text   = @"";
+        cell.lblDuration.text   = @"";
     }
-    cell.lblDateTime.text   = [Utilities stringFromDate:object.createDate withFormat:@"YYYY/MM/dd    hh:mm"];
+    else {
-    cell.lblUsername.text   = object.userName;
+        TweetObject *object = [_curDataList objectAtIndex:indexPath.row];
-    cell.lblDes.text        = object.content;
+        if(object.avatar && ![object.avatar isKindOfClass:[NSNull class]]) {
-    cell.lblMode.text       = object.mode;
+            [cell.imgAvatar sd_setImageWithURL:[NSURL URLWithString:[Utilities getImageLink:object.avatar]]];
-    cell.lblDistance.text   = [NSString stringWithFormat:@"%.0f m", object.distance];
+        }
-    cell.lblDuration.text   = object.time;
+        cell.lblDateTime.text   = [Utilities stringFromDate:object.createDate withFormat:@"YYYY/MM/dd    hh:mm"];
+        cell.lblUsername.text   = object.userName;
+        cell.lblDes.text        = object.content;
+        cell.lblMode.text       = object.mode;
+        cell.lblDistance.text   = [NSString stringWithFormat:@"%.0f m", object.distance];
+        cell.lblDuration.text   = object.time;
+    }
     return cell;
 }
 #pragma mark Private Function
 - (void) requestGroupDetail {
     NSString * token = [[NSUserDefaults standardUserDefaults] stringForKey:kToken];
-//    MBProgressHUD *hudView = [MBProgressHUD showHUDAddedTo:self.view animated:true];
+    MBProgressHUD *hudView = [MBProgressHUD showHUDAddedTo:self.view animated:true];
     [[ServerAPI server] getGroupDetail:token withGroupID:_curGroup.groupID CompletionHandler:^(GroupObject *object, NSError *error) {
-//        [hudView hideAnimated:true];
         GroupDetailViewController __weak *weakSelf = self;
         _curGroup = object;
         dispatch_async(dispatch_get_main_queue(), ^{
+            [hudView hideAnimated:true];
             [weakSelf setupView];
             [weakSelf callRequestToUpdateData];
         });
     }];
 }
 -(void) callRequestToUpdateData {
     [super callRequestToUpdateData];
     NSString * token = [[NSUserDefaults standardUserDefaults] stringForKey:kToken];
     MBProgressHUD *hudView = nil;
     if(_curPage == 1 && !self.refreshControl.isRefreshing) {
         hudView = [MBProgressHUD showHUDAddedTo:self.view animated:true];
     }
-    [[ServerAPI server] requestTweetsList:token groupID:_curGroup.groupID withPage:_curPage CompletionHandler:^(NSArray *array, NSError *error){
+    if(isMemberList) {
-        dispatch_async(dispatch_get_main_queue(), ^{
+        [[ServerAPI server] requestMemberList:token groupID:_curGroup.groupID withPage:_curPage CompletionHandler:^(NSArray *array, NSError *error){
-            if(hudView != nil) {
+            dispatch_async(dispatch_get_main_queue(), ^{
-                [hudView hideAnimated:true];
+                if(hudView != nil) {
-            }
+                    [hudView hideAnimated:true];
-        });
+                }
-        GroupDetailViewController __weak *weakSelf = self;
+            });
-        [weakSelf updateTableData:array error:error];
+            GroupDetailViewController __weak *weakSelf = self;
-    }];
+            [weakSelf updateTableData:array error:error];
+        }];
+    }
+    else {
+        [[ServerAPI server] requestTweetsList:token groupID:_curGroup.groupID withPage:_curPage CompletionHandler:^(NSArray *array, NSError *error){
+            dispatch_async(dispatch_get_main_queue(), ^{
+                if(hudView != nil) {
+                    [hudView hideAnimated:true];
+                }
+            });
+            GroupDetailViewController __weak *weakSelf = self;
+            [weakSelf updateTableData:array error:error];
+        }];

LifeLog/LifeLog/GroupDetailViewController.xib

Diff comments View file @ 7fc917f

 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12118" systemVersion="16D32" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12121" systemVersion="16A323" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12086"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12089"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="GroupDetailViewController">
             <connections>
                 <outlet property="btJoinGrp" destination="caN-x7-hJz" id="B17-YC-Rmk"/>
                 <outlet property="btSwitch" destination="gBg-k9-tgw" id="3ZZ-Qb-d3a"/>
                 <outlet property="imgAva" destination="qYg-Gw-R2b" id="f9w-A2-u4G"/>
                 <outlet property="lbbGrpActiveMode" destination="O8z-6V-YFd" id="s8J-3i-pW3"/>
                 <outlet property="lblGrpGoal" destination="Bdy-dI-j47" id="AKx-8y-Ifm"/>
                 <outlet property="lblGrpName" destination="YWV-pS-TCo" id="VeU-Ov-uSD"/>
                 <outlet property="tableBase" destination="4VU-Ye-7Au" id="m1e-cS-Sxf"/>
                 <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
             </connections>
         </placeholder>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="i5M-Pr-FkT">
             <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="25d-3H-0fr" userLabel="ViewHeader">
                     <rect key="frame" x="0.0" y="0.0" width="375" height="46"/>
                     <subviews>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="SNS" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DxD-Cy-0wi" customClass="AutoTransLabel">
                             <rect key="frame" x="0.0" y="0.0" width="375" height="46"/>
                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                             <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                             <nil key="highlightedColor"/>
                             <userDefinedRuntimeAttributes>
                                 <userDefinedRuntimeAttribute type="string" keyPath="localizeKey" value="lifelog.grDetail.title"/>
                             </userDefinedRuntimeAttributes>
                         </label>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="O3M-Ba-zHF">
                             <rect key="frame" x="0.0" y="5" width="70" height="36"/>
                             <constraints>
                                 <constraint firstAttribute="width" constant="70" id="2Mk-ly-c0t"/>
                             </constraints>
                             <state key="normal" image="today_back_button"/>
                             <connections>
                                 <action selector="clickBack:" destination="-1" eventType="touchUpInside" id="gS4-F3-fzi"/>
                             </connections>
                         </button>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="y09-DG-Krp">
                             <rect key="frame" x="330" y="0.0" width="45" height="46"/>
                             <constraints>
                                 <constraint firstAttribute="width" constant="45" id="hHa-aE-1zd"/>
                             </constraints>
                             <state key="normal" image="icon_menu"/>
                         </button>
                     </subviews>
                     <color key="backgroundColor" red="0.098039215690000001" green="0.098039215690000001" blue="0.098039215690000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <constraints>
                         <constraint firstItem="y09-DG-Krp" firstAttribute="top" secondItem="25d-3H-0fr" secondAttribute="top" id="65z-ZM-a3D"/>
                         <constraint firstItem="O3M-Ba-zHF" firstAttribute="leading" secondItem="25d-3H-0fr" secondAttribute="leading" id="CQk-IB-W9y"/>
                         <constraint firstAttribute="bottom" secondItem="y09-DG-Krp" secondAttribute="bottom" id="IWC-4b-gp6"/>
                         <constraint firstItem="O3M-Ba-zHF" firstAttribute="top" secondItem="25d-3H-0fr" secondAttribute="top" constant="5" id="JWL-bD-I2Z"/>
                         <constraint firstItem="DxD-Cy-0wi" firstAttribute="top" secondItem="25d-3H-0fr" secondAttribute="top" id="WYM-oV-6xn"/>
                         <constraint firstAttribute="bottom" secondItem="O3M-Ba-zHF" secondAttribute="bottom" constant="5" id="ZA0-Bo-IQF"/>
                         <constraint firstItem="DxD-Cy-0wi" firstAttribute="leading" secondItem="25d-3H-0fr" secondAttribute="leading" id="cbx-fE-OaR"/>
                         <constraint firstAttribute="trailing" secondItem="DxD-Cy-0wi" secondAttribute="trailing" id="i0L-w8-Oxm"/>
                         <constraint firstAttribute="trailing" secondItem="y09-DG-Krp" secondAttribute="trailing" id="nNZ-jP-k6U"/>
                         <constraint firstAttribute="bottom" secondItem="DxD-Cy-0wi" secondAttribute="bottom" id="oxP-oa-3FJ"/>
                         <constraint firstAttribute="height" constant="46" id="u2G-4s-RB5"/>
                     </constraints>
                 </view>
-                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YWV-pS-TCo">
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YWV-pS-TCo">
                     <rect key="frame" x="15" y="54" width="345" height="21"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="21" id="fQO-ja-W9R"/>
                     </constraints>
                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                     <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                     <nil key="highlightedColor"/>
                 </label>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="O8z-6V-YFd">
                     <rect key="frame" x="15" y="85" width="243" height="60"/>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                     <constraints>
                         <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="60" id="Bid-NM-Ree"/>
                     </constraints>
                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                     <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                     <nil key="highlightedColor"/>
                 </label>
-                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Bdy-dI-j47">
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Bdy-dI-j47">
                     <rect key="frame" x="15" y="160" width="345" height="80"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="80" id="jgH-57-Bae"/>
                     </constraints>
                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                     <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                     <nil key="highlightedColor"/>
                 </label>
                 <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="qYg-Gw-R2b">
                     <rect key="frame" x="280" y="85" width="80" height="60"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="80" id="NEk-vg-zus"/>
                         <constraint firstAttribute="height" constant="60" id="qlv-ht-SUw"/>
                     </constraints>
                 </imageView>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="gBg-k9-tgw" customClass="AutoTransButton">
                     <rect key="frame" x="15" y="270" width="162" height="30"/>
                     <color key="backgroundColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="30" id="6Ir-ZZ-NOb"/>
                     </constraints>
                     <state key="normal" title="メンバーを見る">
                         <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                     </state>
                     <userDefinedRuntimeAttributes>
                         <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
                             <integer key="value" value="5"/>
                         </userDefinedRuntimeAttribute>
                         <userDefinedRuntimeAttribute type="string" keyPath="localizeKey" value="lifelog.grDetail.bt.viewMem"/>
                     </userDefinedRuntimeAttributes>
                     <connections>
-                        <action selector="clickSwitch:" destination="-1" eventType="touchUpInside" id="3wX-Tc-XA3"/>
+                        <action selector="clickSwitch:" destination="-1" eventType="touchUpInside" id="z4V-ym-fqS"/>
                     </connections>
                 </button>
-                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="caN-x7-hJz" customClass="AutoTransButton">
+                <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="caN-x7-hJz" customClass="AutoTransButton">
                     <rect key="frame" x="197" y="270" width="162" height="30"/>
                     <color key="backgroundColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="30" id="gIs-Km-dbx"/>
                     </constraints>
                     <state key="normal" title="グループに参加する">
                         <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                     </state>
                     <userDefinedRuntimeAttributes>
                         <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
                             <integer key="value" value="5"/>
                         </userDefinedRuntimeAttribute>
                         <userDefinedRuntimeAttribute type="string" keyPath="localizeKey" value="lifelog.grDetail.bt.joinGr"/>
                     </userDefinedRuntimeAttributes>
+                    <connections>
+                        <action selector="clickJoin:" destination="-1" eventType="touchUpInside" id="Ukt-bi-Sw2"/>
+                    </connections>
                 </button>
                 <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="none" rowHeight="100" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="4VU-Ye-7Au">
                     <rect key="frame" x="0.0" y="310" width="375" height="307"/>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                     <connections>
                         <outlet property="dataSource" destination="-1" id="TLB-6X-bRI"/>
                         <outlet property="delegate" destination="-1" id="QcJ-Yh-deE"/>
                     </connections>
                 </tableView>
             </subviews>
             <color key="backgroundColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
             <constraints>
                 <constraint firstItem="25d-3H-0fr" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" id="5o2-0w-AL5"/>
                 <constraint firstAttribute="trailing" secondItem="25d-3H-0fr" secondAttribute="trailing" id="7IX-2R-C0n"/>
                 <constraint firstItem="O8z-6V-YFd" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="15" id="81K-BQ-6tU"/>
                 <constraint firstAttribute="bottom" secondItem="4VU-Ye-7Au" secondAttribute="bottom" constant="50" id="GKY-NB-YYF"/>
                 <constraint firstItem="O8z-6V-YFd" firstAttribute="top" secondItem="YWV-pS-TCo" secondAttribute="bottom" constant="10" id="HOo-rH-ysj"/>
                 <constraint firstItem="Bdy-dI-j47" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="15" id="I1a-bY-ME9"/>
                 <constraint firstItem="YWV-pS-TCo" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="15" id="IS9-SU-75m"/>
                 <constraint firstAttribute="trailing" secondItem="Bdy-dI-j47" secondAttribute="trailing" constant="15" id="Ka2-Ki-Pu6"/>
                 <constraint firstItem="qYg-Gw-R2b" firstAttribute="top" secondItem="YWV-pS-TCo" secondAttribute="bottom" constant="10" id="One-fp-LTK"/>
                 <constraint firstAttribute="trailing" secondItem="qYg-Gw-R2b" secondAttribute="trailing" constant="15" id="PMd-CT-MVj"/>
                 <constraint firstItem="gBg-k9-tgw" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="15" id="bTf-qW-d1y"/>
                 <constraint firstItem="YWV-pS-TCo" firstAttribute="top" secondItem="25d-3H-0fr" secondAttribute="bottom" constant="8" id="cKj-l3-dgv"/>
                 <constraint firstItem="4VU-Ye-7Au" firstAttribute="top" secondItem="caN-x7-hJz" secondAttribute="bottom" constant="10" id="eQe-Kl-cMp"/>
                 <constraint firstItem="4VU-Ye-7Au" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="fru-BN-M5T"/>
                 <constraint firstItem="caN-x7-hJz" firstAttribute="top" secondItem="gBg-k9-tgw" secondAttribute="top" id="gUS-Ty-4Hk"/>
                 <constraint firstItem="qYg-Gw-R2b" firstAttribute="leading" secondItem="O8z-6V-YFd" secondAttribute="trailing" constant="22" id="gzU-2Q-G96"/>
                 <constraint firstItem="caN-x7-hJz" firstAttribute="leading" secondItem="gBg-k9-tgw" secondAttribute="trailing" constant="20" id="hWK-jf-zee"/>
                 <constraint firstItem="25d-3H-0fr" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="jhT-CE-fr7"/>
                 <constraint firstItem="caN-x7-hJz" firstAttribute="width" secondItem="gBg-k9-tgw" secondAttribute="width" id="mD6-eL-KB7"/>
                 <constraint firstItem="gBg-k9-tgw" firstAttribute="top" secondItem="Bdy-dI-j47" secondAttribute="bottom" constant="30" id="mgw-uX-VOK"/>
                 <constraint firstAttribute="trailing" secondItem="YWV-pS-TCo" secondAttribute="trailing" constant="15" id="rEO-bb-Pqr"/>
                 <constraint firstAttribute="trailing" secondItem="caN-x7-hJz" secondAttribute="trailing" constant="16" id="rRn-Vw-t5g"/>
                 <constraint firstItem="Bdy-dI-j47" firstAttribute="top" secondItem="O8z-6V-YFd" secondAttribute="bottom" constant="15" id="xEO-fP-Riz"/>
                 <constraint firstAttribute="trailing" secondItem="4VU-Ye-7Au" secondAttribute="trailing" id="ylN-vm-QF2"/>
             </constraints>
             <point key="canvasLocation" x="24.5" y="52.5"/>
         </view>
     </objects>
     <resources>
         <image name="icon_menu" width="30" height="30"/>
         <image name="today_back_button" width="73" height="37"/>
     </resources>
 </document>

LifeLog/LifeLog/HistoryViewController.xib

Diff comments View file @ 7fc917f

LifeLog/LifeLog/MemberObject.h

Diff comments View file @ 7fc917f

File was created	1	//
	2	// MemberObject.h
	3	// LifeLog
	4	//
	5	// Created by nvtu on 8/18/17.
	6	// Copyright © 2017 PhongNV. All rights reserved.
	7	//
	8
	9	#import <Foundation/Foundation.h>
	10
	11	@interface MemberObject : NSObject
	12
	13	@property (nonatomic) int userID;
	14	@property (nonatomic) int gender;
	15
	16	@property (nonatomic, strong) NSString * userName;
	17	@property (nonatomic, strong) NSString * nickName;
	18	@property (nonatomic, strong) NSString * avatar;
	19
	20	@property (nonatomic, strong) NSDate * joinDate;
	21	@property (nonatomic, strong) NSDate * birthDay;
	22
	23	-(id) initWithData : (NSDictionary *) dict;
	24
	25	@end
	26

LifeLog/LifeLog/MemberObject.m

Diff comments View file @ 7fc917f

File was created	1	//
	2	// MemberObject.m
	3	// LifeLog
	4	//
	5	// Created by nvtu on 8/18/17.
	6	// Copyright © 2017 PhongNV. All rights reserved.
	7	//
	8
	9	#import "MemberObject.h"
	10	#import "Utilities.h"
	11
	12	@implementation MemberObject
	13
	14	-(id) initWithData : (NSDictionary *) dict {
	15	if([dict objectForKey:@"user_id"] != nil) {
	16	self.userID = [dict[@"user_id"] intValue];
	17	}
	18	if([dict objectForKey:@"gender"] != nil) {
	19	self.gender = [dict[@"gender"] intValue];
	20	}
	21	if([dict objectForKey:@"username"] != nil) {
	22	self.userName = dict[@"username"];
	23	}
	24	if([dict objectForKey:@"nickname"] != nil) {
	25	self.nickName = dict[@"nickname"];
	26	}
	27	if([dict objectForKey:@"profile_image"] != nil) {
	28	self.avatar = dict[@"profile_image"];
	29	}
	30	if([dict objectForKey:@"birthday"] != nil) {
	31	NSString *dateString = dict[@"birthday"];
	32	self.birthDay = [Utilities dateFromString:dateString withFormat:@"yyyy-MM-dd"];
	33	}
	34	else {
	35	self.birthDay = [NSDate date];
	36	}
	37	if([dict objectForKey:@"join_date"] != nil) {
	38	NSString *dateString = dict[@"join_date"];
	39	self.joinDate = [Utilities dateFromString:dateString withFormat:@"yyyy-MM-dd HH:mm:ss"];
	40	}
	41	else {
	42	self.joinDate = [NSDate date];
	43	}
	44	return self;
	45	}
	46
	47	@end
	48

LifeLog/LifeLog/RankingViewController.xib

Diff comments View file @ 7fc917f

LifeLog/LifeLog/SNSViewController.m

Diff comments View file @ 7fc917f

LifeLog/LifeLog/SNSViewController.xib

Diff comments View file @ 7fc917f

LifeLog/LifeLog/ServerAPI.h

Diff comments View file @ 7fc917f

 //
 //  ServerAPI.h
 //  LifeLog
 //
 //  Created by Nguyen Van Phong on 7/30/17.
 //  Copyright © 2017 PhongNV. All rights reserved.
 //
 #import <Foundation/Foundation.h>
 #import "Entities.h"
 extern NSString *const kServerAddress;
 extern NSString *const kUser;
 extern NSString *const kToken;
 extern NSString *const kNotificationToken;
 @interface ServerAPI : NSObject
 + (instancetype) server;
 @property (nonatomic, assign) NSTimeInterval timeOutInterval;
 #pragma mark - Login and Register
 - (void)loginWithEmail:(NSString *)email Password:(NSString *)password CompletionHandler: (void (^)(User *, NSString *, NSError *)) completion;
 - (void)registerUserWithParams:(NSDictionary *)params CompletionHandler: (void (^)(User *, NSString *, NSError *)) completion;
 - (void)uploadImage:(NSString *)token andImageData:(NSData *)data CompletionHandler:(void (^)(NSString *, NSError *)) completion;
 - (void)forgetPass:(NSString *)email CompletionHandler:(void (^)(NSError *)) completion;
 - (void)confirmForgetPass:(NSString *)email withConfirm:(NSString *)confirm CompletionHandler:(void (^)(NSError *)) completion;
 #pragma mark - Home Screen Function
 - (void)requestTopWithMode:(int)mode andDate:(NSString *)date CompletionHandler:(void (^)(TopObject *, NSError *)) completion;
 - (void)requestCreateLog:(int)mode withStep:(int)numStep startDate:(NSString *)startDate endDate:(NSString *)endDate CompletionHandler:(void (^)(NSError *))completion;
 #pragma mark - History Screen Function
 - (void) requestHistory:(NSString *)token atDate:(NSDate *)date withType:(int)type andMode:(int) mode CompletionHandler:(void (^)(HistoryObject *, NSError *)) completion;
 - (void) requestHistoryGraph:(NSString *)token withType:(int)type andMode:(int) mode CompletionHandler:(void (^)(HistoryGraphObject *, NSError *)) completion;
 - (void) requestHistoryList:(NSString *)token withType:(int)type andMode:(int) mode AtPage:(int) page CompletionHandler:(void (^)(NSArray *, NSError *)) completion;
+- (void) requestJoinGroup:(NSString *)token groupID: (int) groupID CompletionHandler:(void (^)(NSError *)) completion;
 #pragma mark - SNS Screen Function
 /*
     Get tweet of group and get recent tweet is same API
     If groupID equal -1, it will request recent tweet. Otherwise will request tweet of group
 */
 - (void) requestTweetsList:(NSString *)token groupID: (int) groupID withPage:(int)page CompletionHandler:(void (^)(NSArray *, NSError *)) completion;
 - (void) searchGroup:(NSString *)token withKey:(NSString *)key andPage:(int)page CompletionHandler:(void (^)(NSArray *, NSError *)) completion;
 #pragma mark - Group Function
 - (void) getGroupDetail:(NSString *)token withGroupID:(int)groupID CompletionHandler:(void (^)(GroupObject *, NSError *)) completion;
+- (void) requestMemberList:(NSString *)token groupID: (int) groupID withPage:(int)page CompletionHandler:(void (^)(NSArray *, NSError *)) completion;
 #pragma mark - Common API
 - (void)refreshToken: (NSString *)userID CompletionHandler:(void (^)(NSString *, NSError *))completion;
 @end

LifeLog/LifeLog/ServerAPI.m

Diff comments View file @ 7fc917f

 //
 //  ServerAPI.m
 //  LifeLog
 //
 //  Created by Nguyen Van Phong on 7/30/17.
 //  Copyright © 2017 PhongNV. All rights reserved.
 //
 #import "ServerAPI.h"
 NSString *const kServerAddress = @"http://clover.timesfun.jp:9001/";
 NSString *const kUser = @"KEY_USER";
 NSString *const kToken = @"KEY_TOKEN";
 NSString *const kNotificationToken = @"TOKEN_INVALID";
 @implementation NSString (NSString_Extended)
 - (NSString *)urlencode {
     NSMutableString *output = [NSMutableString string];
     const unsigned char *source = (const unsigned char *)[self UTF8String];
     int sourceLen = (int)strlen((const char *)source);
     for (int i = 0; i < sourceLen; ++i) {
         const unsigned char thisChar = source[i];
         if (thisChar == ' '){
             [output appendString:@"+"];
         } else if (thisChar == '.' || thisChar == '-' || thisChar == '_' || thisChar == '~' ||
                    (thisChar >= 'a' && thisChar <= 'z') ||
                    (thisChar >= 'A' && thisChar <= 'Z') ||
                    (thisChar >= '0' && thisChar <= '9')) {
             [output appendFormat:@"%c", thisChar];
         } else {
             [output appendFormat:@"%%%02X", thisChar];
         }
     }
     return output;
 }
 @end
 @implementation ServerAPI
 static ServerAPI *_server = nil;
 NSURLSessionDataTask * searchTask;
 @synthesize timeOutInterval = _timeOutInterval;
 + (instancetype)server
 {
     @synchronized(self) {
         if (_server == nil) {
             _server = [[ServerAPI alloc] init];
         }
     }
     return _server;
 }
 - (instancetype)init
 {
     self = [super init];
     if (self != nil) {
         self.timeOutInterval = 150;
     }
     return self;
 }
 #pragma mark - Login and Register
 // Login
 - (void)loginWithEmail:(NSString *)email Password:(NSString *)password CompletionHandler: (void (^)(User *, NSString *, NSError *)) completion
 {
     [self _request:[kServerAddress stringByAppendingFormat: @"login"] method:@"POST" token:@"" paras:@{@"email":email, @"password": password} completion:^(NSData *data, NSError *error) {
         if (completion == NULL) {
             return ;
         }
         if (error == nil)
         {
             NSDictionary *dataResult =  [NSJSONSerialization JSONObjectWithData:data options: NSJSONReadingAllowFragments error: &error];
             int status = [dataResult[@"status"] intValue];
             if (status == 1) { // status = 1 success
                 NSString *token = dataResult[@"result"][@"token"];
                 NSDictionary *dictUser = dataResult[@"result"][@"user"];
                 User *user = [[User alloc] init];
                 user.user_id = [NSString stringWithFormat:@"%@",dictUser[@"id"]];
                 user.username = [NSString stringWithFormat:@"%@",dictUser[@"username"]];
                 user.full_name = [NSString stringWithFormat:@"%@",dictUser[@"full_name"]];
                 user.nickname = [NSString stringWithFormat:@"%@",dictUser[@"nickname"]];
                 user.email = [NSString stringWithFormat:@"%@",dictUser[@"email"]];
                 user.password = [NSString stringWithFormat:@"%@",dictUser[@"password"]];
                 user.birthday = [NSString stringWithFormat:@"%@",dictUser[@"birthday"]];
                 user.address = [NSString stringWithFormat:@"%@",dictUser[@"address"]];
                 user.gender = [[NSString stringWithFormat:@"%@",dictUser[@"gender"]] intValue];
                 user.height = [[NSString stringWithFormat:@"%@",dictUser[@"height"]] floatValue];
                 user.weight = [[NSString stringWithFormat:@"%@",dictUser[@"weight"]] floatValue];
                 user.user_description = [NSString stringWithFormat:@"%@",dictUser[@"description"]];
                 user.created_at = [NSString stringWithFormat:@"%@",dictUser[@"created_at"]];
                 user.physical_activity = [NSString stringWithFormat:@"%@",dictUser[@"physical_activity"]];
                 user.profile_image = [NSString stringWithFormat:@"%@",dictUser[@"profile_image"]];
                 user.updated_at = [NSString stringWithFormat:@"%@",dictUser[@"updated_at"]];
                 user.delete_flag = [[NSString stringWithFormat:@"%@",dictUser[@"delete_flag"]] intValue];
                 user.fat_rate = [[NSString stringWithFormat:@"%@",dictUser[@"fat_rate"]] intValue];
                 user.profiles_share = [[NSString stringWithFormat:@"%@",dictUser[@"profiles_share"]] intValue];
                 user.remember_me = [[NSString stringWithFormat:@"%@",dictUser[@"remember_me"]] intValue];
                 user.sound_notifications_share = [[NSString stringWithFormat:@"%@",dictUser[@"sound_notifications_share"]] intValue];
                 user.spend_calo_in_day = [[NSString stringWithFormat:@"%@",dictUser[@"spend_calo_in_day"]] intValue];
                 user.target = [[NSString stringWithFormat:@"%@",dictUser[@"target"]] intValue];
                 completion(user, token, nil);
             }
             else { // status = 0 error
                 NSString *message = dataResult[@"message"];
                 if (message == nil) {
                     message = @"Unknown error";
                 }
                 NSError *loginFaild = [NSError errorWithDomain:@"LifeLog_Domain" code:-1 userInfo:@{@"message":message}];
                 completion(nil, nil, loginFaild);
             }
         }
         else
         {
             completion(nil, nil, error);
         }
     }];
 }
 // Register
 - (void)registerUserWithParams:(NSDictionary *)params CompletionHandler: (void (^)(User *, NSString *, NSError *)) completion {
     [self _request:[kServerAddress stringByAppendingFormat: @"register"] method:@"POST" token:@"" paras:params completion:^(NSData *data, NSError *error) {
         if (completion == NULL) {
             return ;
         }
         if (error == nil)
         {
             NSDictionary *dataResult =  [NSJSONSerialization JSONObjectWithData:data options: NSJSONReadingAllowFragments error: &error];
             int status = [dataResult[@"status"] intValue];
             if (status == 1) { // status = 1 success
                 NSString *token = dataResult[@"result"][@"token"];
                 NSDictionary *dictUser = dataResult[@"result"][@"user"];
                 User *user = [[User alloc] init];
                 user.user_id = [NSString stringWithFormat:@"%@",dictUser[@"id"]];
                 user.username = [NSString stringWithFormat:@"%@",dictUser[@"username"]];
                 user.full_name = [NSString stringWithFormat:@"%@",dictUser[@"full_name"]];
                 user.nickname = [NSString stringWithFormat:@"%@",dictUser[@"nickname"]];
                 user.email = [NSString stringWithFormat:@"%@",dictUser[@"email"]];
                 user.password = [NSString stringWithFormat:@"%@",dictUser[@"password"]];
                 user.birthday = [NSString stringWithFormat:@"%@",dictUser[@"birthday"]];
                 user.address = [NSString stringWithFormat:@"%@",dictUser[@"address"]];
                 user.gender = [[NSString stringWithFormat:@"%@",dictUser[@"gender"]] intValue];
                 user.height = [[NSString stringWithFormat:@"%@",dictUser[@"height"]] floatValue];
                 user.weight = [[NSString stringWithFormat:@"%@",dictUser[@"weight"]] floatValue];
                 user.user_description = [NSString stringWithFormat:@"%@",dictUser[@"description"]];
                 user.created_at = [NSString stringWithFormat:@"%@",dictUser[@"created_at"]];
                 user.physical_activity = [NSString stringWithFormat:@"%@",dictUser[@"physical_activity"]];
                 user.profile_image = [NSString stringWithFormat:@"%@",dictUser[@"profile_image"]];
                 user.updated_at = [NSString stringWithFormat:@"%@",dictUser[@"updated_at"]];
                 user.delete_flag = [[NSString stringWithFormat:@"%@",dictUser[@"delete_flag"]] intValue];
                 user.fat_rate = [[NSString stringWithFormat:@"%@",dictUser[@"fat_rate"]] intValue];
                 user.profiles_share = [[NSString stringWithFormat:@"%@",dictUser[@"profiles_share"]] intValue];
                 user.remember_me = [[NSString stringWithFormat:@"%@",dictUser[@"remember_me"]] intValue];
                 user.sound_notifications_share = [[NSString stringWithFormat:@"%@",dictUser[@"sound_notifications_share"]] intValue];
                 user.spend_calo_in_day = [[NSString stringWithFormat:@"%@",dictUser[@"spend_calo_in_day"]] intValue];
                 user.target = [[NSString stringWithFormat:@"%@",dictUser[@"target"]] intValue];
                 completion(user, token, nil);
             }
             else { // status = 0 error
                 NSString *message = dataResult[@"message"];
                 if (message == nil) {
                     message = @"Unknown error";
                 }
                 NSError *loginFaild = [NSError errorWithDomain:@"LifeLog_Domain" code:-1 userInfo:@{@"message":message}];
                 completion(nil, nil, loginFaild);
             }
         }
         else
         {
             completion(nil, nil, error);
         }
     }];
 }
 - (void)forgetPass:(NSString *)email CompletionHandler:(void (^)(NSError *)) completion {
     [self _request:[kServerAddress stringByAppendingFormat: @"forgetPass"] method:@"POST" token:@"" paras:@{@"email":email} completion:^(NSData *data, NSError *error) {
         if (completion == NULL) {
             return ;
         }
         if (error == nil)
         {
             NSDictionary *dataResult =  [NSJSONSerialization JSONObjectWithData:data options: NSJSONReadingAllowFragments error: &error];
             int status = [dataResult[@"status"] intValue];
             if (status == 1) { // status = 1 success
                 completion(nil);
             }
             else { // status = 0 error
                 NSString *message = dataResult[@"message"];
                 if (message == nil) {
                     message = @"Unknown error";
                 }
                 NSError *forgetPass = [NSError errorWithDomain:@"LifeLog_Domain" code:-1 userInfo:@{@"message":message}];
                 completion(forgetPass);
             }
         }
         else
         {
             completion(error);
         }
     }];
 }
 - (void)confirmForgetPass:(NSString *)email withConfirm:(NSString *)confirm CompletionHandler:(void (^)(NSError *)) completion {
     [self _request:[kServerAddress stringByAppendingFormat: @"forgetPass/confirm"] method:@"POST" token:@"" paras:@{@"email":email, @"code_confirm": confirm} completion:^(NSData *data, NSError *error) {
         if (completion == NULL) {
             return ;
         }
         if (error == nil)
         {
             NSDictionary *dataResult =  [NSJSONSerialization JSONObjectWithData:data options: NSJSONReadingAllowFragments error: &error];
             int status = [dataResult[@"status"] intValue];
             if (status == 1) { // status = 1 success
                 completion(nil);
             }
             else { // status = 0 error
                 NSString *message = dataResult[@"message"];
                 NSError *confirmForgetPass = [NSError errorWithDomain:@"LifeLog_Domain" code:-1 userInfo:@{@"message":message}];
                 completion(confirmForgetPass);
             }
         }
         else
         {
             completion(error);
         }
   }];
 }
 - (void)uploadImage:(NSString *)token andImageData:(NSData *)data CompletionHandler:(void (^)(NSString *, NSError *)) completion {
     NSDictionary *dict = nil;
     NSString *base64Encoded = [data base64EncodedStringWithOptions:0];
     if (token != nil) {
         dict = @{@"token":token, @"img": base64Encoded};
     }
     else {
         dict = @{@"img": base64Encoded};
     }
     [self _request:[kServerAddress stringByAppendingFormat: @"upload-image"] method:@"POST" token:token paras:dict completion:^(NSData *data, NSError *error) {
         if (completion == NULL) {
             return ;
         }
         if (error == nil)
         {
             NSDictionary *dataResult =  [NSJSONSerialization JSONObjectWithData:data options: NSJSONReadingAllowFragments error: &error];
             NSString *image_profile = [NSString stringWithFormat:@"%@", dataResult[@"message"]];
             completion(image_profile, nil);
         }
         else
         {
             completion(nil, error);
         }
     }];
 }
 -(NSString *) convertIntToString : (int) type {
     switch (type) {
         case 1:
             return @"week";
             break;
         case 2:
             return @"oneMonth";
             break;
         case 3:
             return @"threeMonth";
             break;
         case 4:
             return @"sixMonth";
             break;
         default:
             return @"today";
             break;
     }
 }
 #pragma mark - Home Screen Function
 - (void)requestTopWithMode:(int)mode andDate:(NSString *)date CompletionHandler:(void (^)(TopObject *, NSError *)) completion
 {
     NSString * token = [[NSUserDefaults standardUserDefaults] stringForKey:kToken];
     NSString *url = [kServerAddress stringByAppendingFormat:@"api/top/%d/%@", mode, date];
     [self _request:url method:@"GET" token:token paras:nil completion:^(NSData *data, NSError *error) {
         if (completion == NULL) {
             return ;
         }
         if (error == nil)
         {
             NSDictionary *dataResult =  [NSJSONSerialization JSONObjectWithData:data options: NSJSONReadingAllowFragments error: &error];
             int status = [dataResult[@"status"] intValue];
             if (status == 1) { // status = 1 success
                 if(dataResult[@"result"] != nil) {
                     NSDictionary * dictResult = dataResult[@"result"];
                     TopObject *topObject = [[TopObject alloc] init];
                     TargetInfor *targetInfor = [[TargetInfor alloc] initWithData:dictResult[@"targetInf"]];
                     topObject.targetInfor = targetInfor;
                     topObject.kcal = [[NSString stringWithFormat:@"%@", dictResult[@"kcal"]] intValue];
                     topObject.distance = [[NSString stringWithFormat:@"%@", dictResult[@"distance"]] floatValue];
                     topObject.time = [NSString stringWithFormat:@"%@", dictResult[@"time"]];
                     NSMutableArray *arrayStep = [[NSMutableArray alloc] init];
                     NSArray *array = dictResult[@"dataChart"];
                     for(NSDictionary *dict in array) {
                         StepObject *object = [[StepObject alloc] init];
                         if([dict objectForKey:@"numStep"] != nil) {
                             object.step = [dict[@"numStep"] intValue];
                         }
                         if([dict objectForKey:@"hour"] != nil) {
                             object.hour = [dict[@"hour"] intValue];
                         }
                         switch (mode) {
                             case 1:
                                 object.typeStep = @"walking";
                                 break;
                             case 2:
                                 object.typeStep = @"running";
                                 break;
                             case 3:
                                 object.typeStep = @"bike";
                                 break;
                             default:
                                 break;
                         }
                         [arrayStep addObject:object];
                     }
                     topObject.dataChart = [[NSMutableArray alloc] initWithArray:arrayStep];
                     completion(topObject, nil);
                 }
                 else {
                     NSError *errorObject = [NSError errorWithDomain:@"LifeLog_Domain" code:-1 userInfo:@{@"message":@"Unknown Error"}];
                     completion(nil, errorObject);
                 }
             }
             else {
                 NSString *message = dataResult[@"message"];
                 if (message == nil) {
                     message = @"Unknown error";
                 }
                 if ([message isEqualToString:@"Token is invalid"]) {
                     [self performSelectorOnMainThread:@selector(checkToken) withObject:nil waitUntilDone:YES];
                     [self requestTopWithMode:mode andDate:date CompletionHandler:completion];
                 }
                 else {
                     NSError *errorObject = [NSError errorWithDomain:@"LifeLog_Domain" code:-1 userInfo:@{@"message":message}];
                     completion(nil, errorObject);
                 }
             }
         }
         else
         {
             completion(nil, error);
         }
     }];
 }
 - (void)requestCreateLog:(int)mode withStep:(int)numStep startDate:(NSString *)startDate endDate:(NSString *)endDate CompletionHandler:(void (^)(NSError *))completion {
     NSString * token = [[NSUserDefaults standardUserDefaults] stringForKey:kToken];
     NSString *url = [kServerAddress stringByAppendingFormat:@"api/createLog"];
     NSDictionary *dict = @{@"mode": [NSNumber numberWithInt:mode], @"numStep": [NSNumber numberWithInt:numStep], @"startTime": startDate, @"endTime": endDate};
     [self _request:url method:@"POST" token:token paras:dict completion:^(NSData *data, NSError *error) {
         if (completion == NULL) {
             return ;
         }
         if (error == nil)
         {
             NSDictionary *dataResult =  [NSJSONSerialization JSONObjectWithData:data options: NSJSONReadingAllowFragments error: &error];
             int status = [dataResult[@"status"] intValue];
             if (status == 1) { // status = 1 success
                 completion(nil);
             }
             else {
                 NSString *message = dataResult[@"message"];
                 if (message == nil) {
                     message = @"Unknown error";
                 }
                 if ([message isEqualToString:@"Token is invalid"]) {
                     [self performSelectorOnMainThread:@selector(checkToken) withObject:nil waitUntilDone:YES];
                     [self requestCreateLog:mode withStep:numStep startDate:startDate endDate:endDate CompletionHandler:completion];
                 }
                 else {
                     NSError *errorObject = [NSError errorWithDomain:@"LifeLog_Domain" code:-1 userInfo:@{@"message":message}];
                     completion(errorObject);
                 }
             }
         }
         else
         {
             completion(error);
         }
     }];
 }
 #pragma mark - History Screen Function
 - (void) requestHistory:(NSString *)token atDate:(NSDate *)date withType:(int)type andMode:(int) mode CompletionHandler:(void (^)(HistoryObject *, NSError *)) completion {
     NSString *url = [kServerAddress stringByAppendingFormat:@"/api/history/%@/%d", [self convertIntToString:type], mode];
     NSLog(@"requestHistory link %@", url);
     [self _request:url method:@"GET" token:token paras:nil completion:^(NSData *data, NSError *error) {
         if (completion == NULL) {
             return ;
         }
         if (error == nil)
         {
             NSDictionary *dataResult =  [NSJSONSerialization JSONObjectWithData:data options: NSJSONReadingAllowFragments error: &error];
             NSLog(@"%@", dataResult);
             int status = [dataResult[@"status"] intValue];
             if (status == 1) { // status = 1 success
                 HistoryObject * object = [[HistoryObject alloc] initWithData:dataResult[@"result"]];
                 completion(object, nil);
             }
             else {
                 NSString *message = dataResult[@"message"];
                 if (message == nil) {
                     message = @"Unknown error";
                 }
                 if ([message isEqualToString:@"Token is invalid"]) {
                     [self performSelectorOnMainThread:@selector(checkToken) withObject:nil waitUntilDone:YES];
                     NSString *tokenNew = [[NSUserDefaults standardUserDefaults] objectForKey:kToken];
                     [self requestHistory:tokenNew atDate:date withType:type andMode:mode CompletionHandler:completion];
                 }
                 else {
                     NSError *errorObject = [NSError errorWithDomain:@"LifeLog_Domain" code:-1 userInfo:@{@"message":message}];
                     completion(nil, errorObject);
                 }
             }
         }
         else
         {
             completion(nil, error);
         }
     }];
 }
 - (void) requestHistoryGraph:(NSString *)token withType:(int)type andMode:(int) mode CompletionHandler:(void (^)(HistoryGraphObject *, NSError *)) completion {
     NSString *url = [kServerAddress stringByAppendingFormat:@"/api/history/graph/%@/%d", [self convertIntToString:type], mode];
     NSLog(@"requestHistoryGraph link %@", url);
     [self _request:url method:@"GET" token:token paras:nil completion:^(NSData *data, NSError *error) {
         if (completion == NULL) {
             return ;
         }
         if (error == nil)
         {
             NSDictionary *dataResult =  [NSJSONSerialization JSONObjectWithData:data options: NSJSONReadingAllowFragments error: &error];
             NSLog(@"%@", dataResult);
             int status = [dataResult[@"status"] intValue];
             if (status == 1) { // status = 1 success
                 HistoryGraphObject * object = [[HistoryGraphObject alloc] initWithData:dataResult[@"result"]];
                 completion(object, nil);
             }
             else {
                 NSString *message = dataResult[@"message"];
                 if (message == nil) {
                     message = @"Unknown error";
                 }
                 if ([message isEqualToString:@"Token is invalid"]) {
                     [self performSelectorOnMainThread:@selector(checkToken) withObject:nil waitUntilDone:YES];
                     NSString *tokenNew = [[NSUserDefaults standardUserDefaults] objectForKey:kToken];
                     [self requestHistoryGraph:tokenNew withType:type andMode:mode CompletionHandler:completion];
                 }
                 else {
                     NSError *errorObject = [NSError errorWithDomain:@"LifeLog_Domain" code:-1 userInfo:@{@"message":message}];
                     completion(nil, errorObject);
                 }
             }
         }
         else
         {
             completion(nil, error);
         }
     }];
 }
 - (void) requestHistoryList:(NSString *)token withType:(int)type andMode:(int) mode AtPage:(int) page CompletionHandler:(void (^)(NSArray *, NSError *)) completion {
     NSString *url = [kServerAddress stringByAppendingFormat:@"/api/history/list/%@/%d?page=%d&record=50", [self convertIntToString:type], mode, page];
     NSLog(@"requestHistoryList link %@", url);
     [self _request:url method:@"GET" token:token paras:nil completion:^(NSData *data, NSError *error) {
         if (completion == NULL) {
             return ;
         }
         if (error == nil)
         {
             NSDictionary *dataResult =  [NSJSONSerialization JSONObjectWithData:data options: NSJSONReadingAllowFragments error: &error];
             NSLog(@"%@", dataResult);
             int status = [dataResult[@"status"] intValue];
             if (status == 1) { // status = 1 success
                 if(dataResult[@"result"] != nil) {
                     NSArray * array = dataResult[@"result"][@"data"];
                     NSMutableArray * arrayHistory = [[NSMutableArray alloc] init];
                     for(NSDictionary * dict in array) {
                         HistoryObject * object = [[HistoryObject alloc] initWithData:dict];
                         [arrayHistory addObject:object];
                     }
                     completion(arrayHistory, nil);
                 }
                 else {
                     NSError *errorObject = [NSError errorWithDomain:@"LifeLog_Domain" code:-1 userInfo:@{@"message":@"Unknown Error"}];
                     completion(nil, errorObject);
                 }
             }
             else {
                 NSString *message = dataResult[@"message"];
                 if (message == nil) {
                     message = @"Unknown error";
                 }
                 if ([message isEqualToString:@"Token is invalid"]) {
                     [self performSelectorOnMainThread:@selector(checkToken) withObject:nil waitUntilDone:YES];
                     NSString *tokenNew = [[NSUserDefaults standardUserDefaults] objectForKey:kToken];
                     [self requestHistoryList:tokenNew withType:type andMode:mode AtPage:page CompletionHandler:completion];
                 }
                 else {
                     NSError *errorObject = [NSError errorWithDomain:@"LifeLog_Domain" code:-1 userInfo:@{@"message":message}];
                     completion(nil, errorObject);
                 }
             }
         }
         else
         {
             completion(nil, error);
         }
     }];
 }
 #pragma mark - SNS Screen Function
 - (void) requestTweetsList:(NSString *)token groupID: (int) groupID withPage:(int)page CompletionHandler:(void (^)(NSArray *, NSError *)) completion {
     NSString *url = [kServerAddress stringByAppendingFormat:@"/api/sns/%d", page];
     if(groupID > -1) {
         url = [kServerAddress stringByAppendingFormat:@"api/tweet/list?group_id=%d&page=%d&record=10", groupID, page];
     }
     NSLog(@"requestTweetsList link %@", url);
     [self _request:url method:@"GET" token:token paras:nil completion:^(NSData *data, NSError *error) {
         if (completion == NULL) {
             return ;
         }
         if (error == nil)
         {
             NSDictionary *dataResult =  [NSJSONSerialization JSONObjectWithData:data options: NSJSONReadingAllowFragments error: &error];
             NSLog(@"%@", dataResult);
             int status = [dataResult[@"status"] intValue];
             if (status == 1) { // status = 1 success
                 if(dataResult[@"result"] != nil) {
                     NSArray * array = dataResult[@"result"];
                     NSMutableArray * arrayTweets = [[NSMutableArray alloc] init];
                     for(NSDictionary * dict in array) {
                         TweetObject * object = [[TweetObject alloc] initWithData:dict];
                         [arrayTweets addObject:object];
                     }
                     completion(arrayTweets, nil);
                 }
                 else {
                     NSError *errorObject = [NSError errorWithDomain:@"LifeLog_Domain" code:-1 userInfo:@{@"message":@"Unknown Error"}];
                     completion(nil, errorObject);
                 }
             }
             else {
                 NSString *message = dataResult[@"message"];
                 if (message == nil) {
                     message = @"Unknown error";
                 }
                 if ([message isEqualToString:@"Token is invalid"]) {
                     [self performSelectorOnMainThread:@selector(checkToken) withObject:nil waitUntilDone:YES];
                     NSString *tokenNew = [[NSUserDefaults standardUserDefaults] objectForKey:kToken];
                     [self requestTweetsList:tokenNew groupID:groupID withPage:page CompletionHandler:completion];
                 }
                 else {
                     NSError *errorObject = [NSError errorWithDomain:@"LifeLog_Domain" code:-1 userInfo:@{@"message":message}];
                     completion(nil, errorObject);
                 }
             }
         }
         else
         {
             completion(nil, error);
         }
     }];
 }
 - (void) searchGroup:(NSString *)token withKey:(NSString *)key andPage:(int)page CompletionHandler:(void (^)(NSArray *, NSError *)) completion {
     NSString *url = [kServerAddress stringByAppendingFormat:@"api/sns/group/search"];
     NSLog(@"searchGroup link %@ page %d", url, page);
     if(searchTask != nil) {
         [searchTask cancel];
     }
     searchTask = [self _request:url method:@"POST" token:token paras:@{@"keyword":key, @"page": [NSNumber numberWithInt:page]}  completion:^(NSData *data, NSError *error) {
         searchTask = nil;
         if (completion == NULL) {
             return ;
         }
         if (error == nil)
         {
             NSDictionary *dataResult =  [NSJSONSerialization JSONObjectWithData:data options: NSJSONReadingAllowFragments error: &error];
             NSLog(@"%@", dataResult);
             int status = [dataResult[@"status"] intValue];
             if (status == 1) { // status = 1 success
                 if(dataResult[@"result"] != nil) {
                     NSArray * array = dataResult[@"result"];
                     NSMutableArray * arrayTweets = [[NSMutableArray alloc] init];
                     for(NSDictionary * dict in array) {
                         GroupObject * object = [[GroupObject alloc] initWithData:dict];
                         [arrayTweets addObject:object];
                     }
                     completion(arrayTweets, nil);
                 }
                 else {
                     NSError *errorObject = [NSError errorWithDomain:@"LifeLog_Domain" code:-1 userInfo:@{@"message":@"Unknown Error"}];
                     completion(nil, errorObject);
                 }
             }
             else {
                 NSString *message = dataResult[@"message"];
                 NSError *errorObject = [NSError errorWithDomain:@"LifeLog_Domain" code:-1 userInfo:@{@"message":message}];
                 completion(nil, errorObject);
             }
         }
         else
         {
             completion(nil, error);
         }
     }];
 }
 #pragma mark - Group Function
 - (void) getGroupDetail:(NSString *)token withGroupID:(int)groupID CompletionHandler:(void (^)(GroupObject *, NSError *)) completion {
     NSString *url = [kServerAddress stringByAppendingFormat:@"api/sns/group/detail/%d", groupID];
     NSLog(@"getGroupDetail link %@", url);
     [self _request:url method:@"GET" token:token paras:nil completion:^(NSData *data, NSError *error) {
         if (completion == NULL) {
             return ;
         }
         if (error == nil)
         {
             NSDictionary *dataResult =  [NSJSONSerialization JSONObjectWithData:data options: NSJSONReadingAllowFragments error: &error];
             NSLog(@"%@", dataResult);
             int status = [dataResult[@"status"] intValue];
             if (status == 1) { // status = 1 success
                 if(dataResult[@"result"] != nil) {
                     NSArray * array = dataResult[@"result"];
                     GroupObject * object = [[GroupObject alloc] initWithData:array[0]];
                     completion(object, nil);
                 }
                 else {
                     NSError *errorObject = [NSError errorWithDomain:@"LifeLog_Domain" code:-1 userInfo:@{@"message":@"Unknown Error"}];
                     completion(nil, errorObject);
                 }
             }
             else {
                 NSString *message = dataResult[@"message"];
                 if (message == nil) {
                     message = @"Unknown error";
                 }
                 if ([message isEqualToString:@"Token is invalid"]) {
                     [self performSelectorOnMainThread:@selector(checkToken) withObject:nil waitUntilDone:YES];
                     NSString *tokenNew = [[NSUserDefaults standardUserDefaults] objectForKey:kToken];
                     [self getGroupDetail:tokenNew withGroupID:groupID CompletionHandler:completion];
                 }
                 else {
                     NSError *errorObject = [NSError errorWithDomain:@"LifeLog_Domain" code:-1 userInfo:@{@"message":message}];
                     completion(nil, errorObject);
                 }
             }
         }
         else
         {
             completion(nil, error);
         }
     }];
 }
+- (void) requestMemberList:(NSString *)token groupID: (int) groupID withPage:(int)page CompletionHandler:(void (^)(NSArray *, NSError *)) completion {
+    NSString *url = [kServerAddress stringByAppendingFormat:@"api/sns/group/member/%d/%d", groupID, page];
+    NSLog(@"requestMemberList link %@ page %d", url, page);
+    [self _request:url method:@"GET" token:token paras:nil  completion:^(NSData *data, NSError *error) {
+        if (completion == NULL) {
+            return ;
+        }
+        if (error == nil)
+        {
+            NSDictionary *dataResult =  [NSJSONSerialization JSONObjectWithData:data options: NSJSONReadingAllowFragments error: &error];
+            NSLog(@"%@", dataResult);
+            int status = [dataResult[@"status"] intValue];
+            if (status == 1) { // status = 1 success
+                if(dataResult[@"result"] != nil) {
+                    NSArray * array = dataResult[@"result"];
+                    NSMutableArray * arrayTweets = [[NSMutableArray alloc] init];
+                    for(NSDictionary * dict in array) {
+                        MemberObject * object = [[MemberObject alloc] initWithData:dict];
+                        [arrayTweets addObject:object];
+                    }
+                    completion(arrayTweets, nil);
+                }
+                else {
+                    NSError *errorObject = [NSError errorWithDomain:@"LifeLog_Domain" code:-1 userInfo:@{@"message":@"Unknown Error"}];
+                    completion(nil, errorObject);
+                }
+            }
+            else {
+                NSString *message = dataResult[@"message"];
+                if (message == nil) {
+                    message = @"Unknown error";
+                }
+                if ([message isEqualToString:@"Token is invalid"]) {
+                    [self performSelectorOnMainThread:@selector(checkToken) withObject:nil waitUntilDone:YES];
+                    NSString *tokenNew = [[NSUserDefaults standardUserDefaults] objectForKey:kToken];
+                    [self requestMemberList:tokenNew groupID:groupID withPage:page CompletionHandler:completion];
+                }
+                else {
+                    NSError *errorObject = [NSError errorWithDomain:@"LifeLog_Domain" code:-1 userInfo:@{@"message":message}];
+                    completion(nil, errorObject);
+                }
+            }
+        }
+        else
+        {
+            completion(nil, error);
+        }
+    }];
+}
+- (void) requestJoinGroup:(NSString *)token groupID: (int) groupID CompletionHandler:(void (^)(NSError *)) completion {
+    NSString *url = [kServerAddress stringByAppendingFormat:@"api/sns/group/join"];
+    NSLog(@"requestJoinGroup link %@", url);
+    searchTask = [self _request:url method:@"POST" token:token paras:@{@"group_id": [NSNumber numberWithInt:groupID]}  completion:^(NSData *data, NSError *error) {
+        searchTask = nil;
+        if (completion == NULL) {
+            return ;
+        }
+        if (error == nil)
+        {
+            NSDictionary *dataResult =  [NSJSONSerialization JSONObjectWithData:data options: NSJSONReadingAllowFragments error: &error];
+            NSLog(@"%@", dataResult);
+            int status = [dataResult[@"status"] intValue];
+            if (status == 1) { // status = 1 success
+                if(dataResult[@"result"] != nil) {
+                    completion(nil);
+                }
+                else {
+                    NSError *errorObject = [NSError errorWithDomain:@"LifeLog_Domain" code:-1 userInfo:@{@"message":@"Unknown Error"}];
+                    completion(errorObject);
+                }
+            }
+            else {
+                NSString *message = dataResult[@"message"];
+                if ([message isEqualToString:@"Token is invalid"]) {
+                    [self performSelectorOnMainThread:@selector(checkToken) withObject:nil waitUntilDone:YES];
+                    NSString *tokenNew = [[NSUserDefaults standardUserDefaults] objectForKey:kToken];
+                    [self requestJoinGroup:tokenNew groupID:groupID CompletionHandler:completion];
+                }
+                else {
+                    NSError *errorObject = [NSError errorWithDomain:@"LifeLog_Domain" code:-1 userInfo:@{@"message":message}];
+                    completion(errorObject);
+                }
+            }
+        }
+        else
+        {
+            completion(error);
+        }
+    }];
+}
 #pragma mark - Common API
 - (void)refreshToken: (NSString *)userID CompletionHandler:(void (^)(NSString *, NSError *))completion {
     [self _request:[kServerAddress stringByAppendingFormat: @"refreshToken"] method:@"POST" token:@"" paras:@{@"userId":userID} completion:^(NSData *data, NSError *error) {
         if (completion == NULL) {
             return ;
         }
         if (error == nil)
         {
             NSDictionary *dataResult =  [NSJSONSerialization JSONObjectWithData:data options: NSJSONReadingAllowFragments error: &error];
             int status = [dataResult[@"status"] intValue];
             if (status == 1) { // status = 1 success
                 NSArray *arrayResult = dataResult[@"result"];
                 if (arrayResult.count > 0) {
                     NSString *token = arrayResult[0];
                     completion(token, nil);
                 }
                 else {
                     NSError *errorObject = [NSError errorWithDomain:@"LifeLog_Domain" code:-1 userInfo:@{@"message":@"Unknown Error"}];
                     completion(nil, errorObject);
                 }
             }
             else { // status = 0 error
                 NSString *message = dataResult[@"message"];
                 if (message == nil) {
                     message = @"Unknown error";
                 }
                 NSError *loginFaild = [NSError errorWithDomain:@"LifeLog_Domain" code:-1 userInfo:@{@"message":message}];
                 completion(nil, loginFaild);
             }
         }
         else
         {
             completion(nil, error);
         }
     }];
 }
 #pragma mark - Private Function
 - (void) checkToken {
     // [[NSNotificationCenter defaultCenter] postNotificationName:kNotificationToken object:nil];
     NSData *data = [[NSUserDefaults standardUserDefaults] objectForKey:kUser];
     User *user = (User *)[NSKeyedUnarchiver unarchiveObjectWithData:data];
     if (user != nil) {
         [self refreshToken:user.user_id CompletionHandler:^(NSString *token, NSError *error) {
             if (error == nil) {
                 [[NSUserDefaults standardUserDefaults] setObject:token forKey:kToken];
                 [[NSUserDefaults standardUserDefaults] synchronize];
             }
         }];
     }
 }
 - (NSData *) _encodeDictionary: (NSDictionary *) dictionary
 {
     NSMutableArray *parts = [[NSMutableArray alloc] init];
     for (id key in dictionary)
     {
         NSString *encodedValue = [[dictionary[key] description] urlencode];
         NSString *encodedKey = [[key description] urlencode];//[[key description] stringByAddingPercentEscapesUsingEncoding: NSUTF8StringEncoding];
         NSString *part = [NSString stringWithFormat: @"%@=%@", encodedKey, encodedValue];
         [parts addObject:part];
     }
     NSString *encodedDictionary = [parts componentsJoinedByString:@"&"];
     return [encodedDictionary dataUsingEncoding: NSUTF8StringEncoding];
 }
 - (NSURLSessionDataTask *) _request:(NSString *)address method:(NSString *)method token:(NSString *) token paras:(NSDictionary *)paras completion:(void (^)(NSData *data, NSError *error))completion
 {
     NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL: [NSURL URLWithString:address]];
     request.HTTPMethod = method;
     [request setValue: @"application/json" forHTTPHeaderField: @"Accept"];
     [request setValue: @"application/json" forHTTPHeaderField: @"Content-Type"];
     if(token != nil && ![token  isEqual: @""]) {
         [request setValue: token forHTTPHeaderField: @"token"];
     }
     [request setTimeoutInterval:self.timeOutInterval];
     if (paras != nil)
     {
         NSData *encodedData = [self _encodeDictionary: paras];
         [request setValue: [NSString stringWithFormat: @"%lu", (unsigned long) encodedData.length] forHTTPHeaderField: @"Content-Length"];
         [request setValue: @"application/x-www-form-urlencoded charset=utf-8" forHTTPHeaderField: @"Content-Type"];
         [request setHTTPBody: encodedData];
     }
     NSURLSession *session = [NSURLSession sharedSession];
     NSURLSessionDataTask *task = [session dataTaskWithRequest:request
                                             completionHandler:
                                   ^(NSData *data, NSURLResponse *response, NSError *error) {
                                       if (completion == NULL) {
                                           return ;
                                       }
                                       if (error == nil)
                                       {
                                           completion(data, nil);
                                       }
                                       else
                                       {
                                           completion(nil, error);
                                       }
                                   }];
     [task resume];
     return task;
 }
 -(void)waitUntilDone:(void(^)(void))waitBlock {
     //use your statement or call method here
     if(waitBlock){
         waitBlock();
     }
 }
 @end

LifeLog/LifeLog/TweetObject.h

Diff comments View file @ 7fc917f

LifeLog/LifeLog/TweetObject.m

Diff comments View file @ 7fc917f

1	//	1	//
2	// SNSViewController.m	2	// SNSViewController.m
3	// LifeLog	3	// LifeLog
4	//	4	//
5	// Created by Nguyen Van Phong on 7/25/17.	5	// Created by Nguyen Van Phong on 7/25/17.
6	// Copyright © 2017 PhongNV. All rights reserved.	6	// Copyright © 2017 PhongNV. All rights reserved.
7	//	7	//
8		8
9	#import "SNSViewController.h"	9	#import "SNSViewController.h"
10		10
11	#import <SDWebImage/UIImageView+WebCache.h>	11	#import <SDWebImage/UIImageView+WebCache.h>
12		12
13	#import "ServerAPI.h"	13	#import "ServerAPI.h"
14	#import "Utilities.h"	14	#import "Utilities.h"
15		15
16	#import "SNSRecentTopicTableViewCell.h"	16	#import "SNSRecentTopicTableViewCell.h"
17	#import "SearchGroupViewController.h"	17	#import "SearchGroupViewController.h"
18	#import "GroupDetailViewController.h"	18	#import "GroupDetailViewController.h"
19		19
20	@interface SNSViewController ()	20	@interface SNSViewController ()
21		21
22	@end	22	@end
23		23
24	@implementation SNSViewController	24	@implementation SNSViewController
25		25
26	- (void)viewDidLoad {	26	- (void)viewDidLoad {
27	[super viewDidLoad];	27	[super viewDidLoad];
28	// Do any additional setup after loading the view from its nib.	28	// Do any additional setup after loading the view from its nib.
29	self.title = NSLocalizedString(@"lifelog.tapbar.sns", nil);	29	self.title = NSLocalizedString(@"lifelog.tapbar.sns", nil);
30		30
31	[self callRequestToUpdateData];	31	[self callRequestToUpdateData];
32		32
33	//register nib for table view	33	//register nib for table view
34	[self.tableBase registerNib:[UINib nibWithNibName:@"SNSRecentTopicTableViewCell" bundle:nil] forCellReuseIdentifier:@"RecentTopicCell"];	34	[self.tableBase registerNib:[UINib nibWithNibName:@"SNSRecentTopicTableViewCell" bundle:nil] forCellReuseIdentifier:@"RecentTopicCell"];
35	}	35	}
36		36
37	- (void)didReceiveMemoryWarning {	37	- (void)didReceiveMemoryWarning {
38	[super didReceiveMemoryWarning];	38	[super didReceiveMemoryWarning];
39	// Dispose of any resources that can be recreated.	39	// Dispose of any resources that can be recreated.
40	}	40	}
41		41
42	#pragma mark IBAction	42	#pragma mark IBAction
43	- (IBAction)clickRecommendGroup:(id)sender {	43	- (IBAction)clickRecommendGroup:(id)sender {
44	SearchGroupViewController * search = [[SearchGroupViewController alloc] init];	44	SearchGroupViewController * search = [[SearchGroupViewController alloc] init];
45	[self.navigationController pushViewController:search animated:true];	45	[self.navigationController pushViewController:search animated:true];
46	}	46	}
47		47
48	- (IBAction)clickMyGroup:(id)sender {	48	- (IBAction)clickMyGroup:(id)sender {
49	// GroupDetailViewController * detail = [[GroupDetailViewController alloc] init];	49	// GroupDetailViewController * detail = [[GroupDetailViewController alloc] init];
50	// [self.navigationController pushViewController:detail animated:true];	50	// [self.navigationController pushViewController:detail animated:true];
51	}	51	}
52		52
53	#pragma mark UITableView Delegate	53	#pragma mark UITableView Delegate
54	- (UITableViewCell ) tableView:(UITableView )tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {	54	- (UITableViewCell ) tableView:(UITableView )tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
55	SNSRecentTopicTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:@"RecentTopicCell"];	55	SNSRecentTopicTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:@"RecentTopicCell"];
56	TweetObject *object = [_curDataList objectAtIndex:indexPath.row];	56	TweetObject *object = [_curDataList objectAtIndex:indexPath.row];
57	if(object.avatarLink && ![object.avatarLink isKindOfClass:[NSNull class]]) {	57	if(object.avatar && ![object.avatar isKindOfClass:[NSNull class]]) {
58	[cell.imgAvatar sd_setImageWithURL:[NSURL URLWithString:[Utilities getImageLink:object.avatarLink]]];	58	[cell.imgAvatar sd_setImageWithURL:[NSURL URLWithString:[Utilities getImageLink:object.avatar]]];
59	}	59	}
60	cell.lblDateTime.text = [Utilities stringFromDate:object.createDate withFormat:@"YYYY/MM/dd hh:mm"];	60	cell.lblDateTime.text = [Utilities stringFromDate:object.createDate withFormat:@"YYYY/MM/dd hh:mm"];
61	cell.lblUsername.text = object.userName;	61	cell.lblUsername.text = object.userName;
62	cell.lblDes.text = object.content;	62	cell.lblDes.text = object.content;
63	cell.lblMode.text = object.mode;	63	cell.lblMode.text = object.mode;
64	cell.lblDistance.text = [NSString stringWithFormat:@"%.0f m", object.distance];	64	cell.lblDistance.text = [NSString stringWithFormat:@"%.0f m", object.distance];
65	cell.lblDuration.text = object.time;	65	cell.lblDuration.text = object.time;
66	return cell;	66	return cell;
67	}	67	}
68		68
69	#pragma mark Private Function	69	#pragma mark Private Function
70		70
71	-(void) callRequestToUpdateData {	71	-(void) callRequestToUpdateData {
72	[super callRequestToUpdateData];	72	[super callRequestToUpdateData];
73		73
74	NSString * token = [[NSUserDefaults standardUserDefaults] stringForKey:kToken];	74	NSString * token = [[NSUserDefaults standardUserDefaults] stringForKey:kToken];
75	MBProgressHUD *hudView = nil;	75	MBProgressHUD *hudView = nil;
76	if(_curPage == 1 && !self.refreshControl.isRefreshing) {	76	if(_curPage == 1 && !self.refreshControl.isRefreshing) {
77	hudView = [MBProgressHUD showHUDAddedTo:self.view animated:true];	77	hudView = [MBProgressHUD showHUDAddedTo:self.view animated:true];
78	}	78	}
79	[[ServerAPI server] requestTweetsList:token groupID:-1 withPage:_curPage CompletionHandler:^(NSArray array, NSError error){	79	[[ServerAPI server] requestTweetsList:token groupID:-1 withPage:_curPage CompletionHandler:^(NSArray array, NSError error){
80	dispatch_async(dispatch_get_main_queue(), ^{	80	dispatch_async(dispatch_get_main_queue(), ^{
81	if(hudView != nil) {	81	if(hudView != nil) {
82	[hudView hideAnimated:true];	82	[hudView hideAnimated:true];
83	}	83	}
84	});	84	});
85	SNSViewController __weak *weakSelf = self;	85	SNSViewController __weak *weakSelf = self;
86	[weakSelf updateTableData:array error:error];	86	[weakSelf updateTableData:array error:error];
87	}];	87	}];
88	}	88	}
89		89
90	@end	90	@end
91		91

1	//	1	//
2	// TweetObject.h	2	// TweetObject.h
3	// LifeLog	3	// LifeLog
4	//	4	//
5	// Created by nvtu on 8/11/17.	5	// Created by nvtu on 8/11/17.
6	// Copyright © 2017 PhongNV. All rights reserved.	6	// Copyright © 2017 PhongNV. All rights reserved.
7	//	7	//
8		8
9	#import <Foundation/Foundation.h>	9	#import <Foundation/Foundation.h>
10		10
11	@interface TweetObject : NSObject	11	@interface TweetObject : NSObject
12		12
13	@property (nonatomic) int tweetID;	13	@property (nonatomic) int tweetID;
14	@property (nonatomic) int groupID;	14	@property (nonatomic) int groupID;
15	@property (nonatomic) int userID;	15	@property (nonatomic) int userID;
16	@property (nonatomic) float distance;	16	@property (nonatomic) float distance;
17		17
18	@property (nonatomic, strong) NSString * content;	18	@property (nonatomic, strong) NSString * content;
19	@property (nonatomic, strong) NSString * mode;	19	@property (nonatomic, strong) NSString * mode;
20	@property (nonatomic, strong) NSString * time;	20	@property (nonatomic, strong) NSString * time;
21	@property (nonatomic, strong) NSString * userName;	21	@property (nonatomic, strong) NSString * userName;
22	@property (nonatomic, strong) NSString * avatarLink;	22	@property (nonatomic, strong) NSString * avatar;
23	@property (nonatomic, strong) NSDate * createDate;	23	@property (nonatomic, strong) NSDate * createDate;
24		24
25	-(id) initWithData : (NSDictionary *) dict;	25	-(id) initWithData : (NSDictionary *) dict;
26		26
27	@end	27	@end
28		28

1	//	1	//
2	// TweetObject.m	2	// TweetObject.m
3	// LifeLog	3	// LifeLog
4	//	4	//
5	// Created by nvtu on 8/11/17.	5	// Created by nvtu on 8/11/17.
6	// Copyright © 2017 PhongNV. All rights reserved.	6	// Copyright © 2017 PhongNV. All rights reserved.
7	//	7	//
8		8
9	#import "TweetObject.h"	9	#import "TweetObject.h"
10	#import "Utilities.h"	10	#import "Utilities.h"
11		11
12	@implementation TweetObject	12	@implementation TweetObject
13		13
14	-(id) initWithData : (NSDictionary *) dict {	14	-(id) initWithData : (NSDictionary *) dict {
15	if([dict objectForKey:@"id"] != nil) {	15	if([dict objectForKey:@"id"] != nil) {
16	self.tweetID = [dict[@"id"] intValue];	16	self.tweetID = [dict[@"id"] intValue];
17	}	17	}
18	if([dict objectForKey:@"group_id"] != nil) {	18	if([dict objectForKey:@"group_id"] != nil) {
19	self.groupID = [dict[@"group_id"] intValue];	19	self.groupID = [dict[@"group_id"] intValue];
20	}	20	}
21	if([dict objectForKey:@"tweet_content"] != nil) {	21	if([dict objectForKey:@"tweet_content"] != nil) {
22	self.content = dict[@"tweet_content"];	22	self.content = dict[@"tweet_content"];
23	}	23	}
24	if([dict objectForKey:@"mode"] != nil) {	24	if([dict objectForKey:@"mode"] != nil) {
25	int modeInt = [dict[@"mode"] intValue];	25	int modeInt = [dict[@"mode"] intValue];
26	switch (modeInt) {	26	switch (modeInt) {
27	case 2:	27	case 2:
28	self.mode = @"running";	28	self.mode = @"running";
29	break;	29	break;
30	case 3:	30	case 3:
31	self.mode = @"bike";	31	self.mode = @"bike";
32	break;	32	break;
33	default:	33	default:
34	self.mode = @"walking";	34	self.mode = @"walking";
35	break;	35	break;
36	}	36	}
37	}	37	}
38	if([dict objectForKey:@"distance"] != nil) {	38	if([dict objectForKey:@"distance"] != nil) {
39	self.distance = [dict[@"distance"] floatValue];	39	self.distance = [dict[@"distance"] floatValue];
40	}	40	}
41	if([dict objectForKey:@"time"] != nil) {	41	if([dict objectForKey:@"time"] != nil) {
42	self.time = dict[@"time"];	42	self.time = dict[@"time"];
43	}	43	}
44	if([dict objectForKey:@"user_id"] != nil) {	44	if([dict objectForKey:@"user_id"] != nil) {
45	self.userID = [dict[@"user_id"] intValue];	45	self.userID = [dict[@"user_id"] intValue];
46	}	46	}
47	if([dict objectForKey:@"user_created"] != nil) {	47	if([dict objectForKey:@"user_created"] != nil) {
48	self.userID = [dict[@"user_created"] intValue];	48	self.userID = [dict[@"user_created"] intValue];
49	}	49	}
50	if([dict objectForKey:@"username"] != nil) {	50	if([dict objectForKey:@"username"] != nil) {
51	self.userName = dict[@"username"];	51	self.userName = dict[@"username"];
52	}	52	}
53	if([dict objectForKey:@"full_name"] != nil) {	53	if([dict objectForKey:@"full_name"] != nil) {
54	self.userName = dict[@"full_name"];	54	self.userName = dict[@"full_name"];
55	}	55	}
56	if([dict objectForKey:@"profile_image"] != nil) {	56	if([dict objectForKey:@"profile_image"] != nil) {
57	self.avatarLink = dict[@"profile_image"];	57	self.avatar = dict[@"profile_image"];
58	}	58	}
59	if([dict objectForKey:@"created_at"] != nil) {	59	if([dict objectForKey:@"created_at"] != nil) {
60	NSString *dateString = dict[@"created_at"];	60	NSString *dateString = dict[@"created_at"];
61	self.createDate = [Utilities dateFromString:dateString withFormat:@"yyyy-MM-dd hh:mm:ss"];	61	self.createDate = [Utilities dateFromString:dateString withFormat:@"yyyy-MM-dd hh:mm:ss"];
62	}	62	}
63	else if([dict objectForKey:@"date_created"] != nil && [dict objectForKey:@"time_created"] != nil) {	63	else if([dict objectForKey:@"date_created"] != nil && [dict objectForKey:@"time_created"] != nil) {
64	NSString *dateString = dict[@"date_created"];	64	NSString *dateString = dict[@"date_created"];
65	[dateString stringByAppendingString:@" "];	65	[dateString stringByAppendingString:@" "];
66	[dateString stringByAppendingString:dict[@"time_created"]];	66	[dateString stringByAppendingString:dict[@"time_created"]];
67	self.createDate = [Utilities dateFromString:dateString withFormat:@"yyyy-MM-dd hh:mm:ss"];	67	self.createDate = [Utilities dateFromString:dateString withFormat:@"yyyy-MM-dd hh:mm:ss"];
68	}	68	}
69	else {	69	else {
70	self.createDate = [NSDate date];	70	self.createDate = [NSDate date];
71	}	71	}
72	return self;	72	return self;
73	}	73	}
74		74
75	@end	75	@end
76		76