lyhungcoder@gmail.com / Lifelog

Browse Code »

Commit e796f8345cf407df174166eb3d8c949a6b12f59f

Authored by nvtu11790@gmail.com 2017-08-26 15:06:37 +0900

1 parent 29486f50ff

Exists in master and in 1 other branch

Add ranking API in Ranking Screen, display result in screen

Showing 14 changed files with 212 additions and 88 deletions Inline Diff

LifeLog/LifeLog.xcodeproj/project.pbxproj
LifeLog/LifeLog/BaseTableViewController.m
LifeLog/LifeLog/Entities.h
LifeLog/LifeLog/HistoryGraphObject.h
LifeLog/LifeLog/HistoryGraphObject.m
LifeLog/LifeLog/RankingObject.h
LifeLog/LifeLog/RankingObject.m
LifeLog/LifeLog/RankingTableViewCell.h
LifeLog/LifeLog/RankingTableViewCell.m
LifeLog/LifeLog/RankingViewController.h
LifeLog/LifeLog/RankingViewController.m
LifeLog/LifeLog/RankingViewController.xib
LifeLog/LifeLog/ServerAPI.h
LifeLog/LifeLog/ServerAPI.m

LifeLog/LifeLog.xcodeproj/project.pbxproj

Diff comments View file @ e796f83

 // !$*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 */; };
 		E95F4CED1F475C6A00D27E80 /* CreateGroupViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E95F4CEB1F475C6A00D27E80 /* CreateGroupViewController.m */; };
 		E95F4CEE1F475C6A00D27E80 /* CreateGroupViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E95F4CEC1F475C6A00D27E80 /* CreateGroupViewController.xib */; };
 		E95F4CF31F48B39200D27E80 /* MyGroupViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E95F4CF11F48B39200D27E80 /* MyGroupViewController.m */; };
 		E95F4CF41F48B39200D27E80 /* MyGroupViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E95F4CF21F48B39200D27E80 /* MyGroupViewController.xib */; };
 		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 */; };
+		E97588FC1F513BAD00782484 /* RankingObject.m in Sources */ = {isa = PBXBuildFile; fileRef = E97588FB1F513BAD00782484 /* RankingObject.m */; };
 		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>"; };
 		E95F4CEA1F475C6A00D27E80 /* CreateGroupViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CreateGroupViewController.h; sourceTree = "<group>"; };
 		E95F4CEB1F475C6A00D27E80 /* CreateGroupViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CreateGroupViewController.m; sourceTree = "<group>"; };
 		E95F4CEC1F475C6A00D27E80 /* CreateGroupViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = CreateGroupViewController.xib; sourceTree = "<group>"; };
 		E95F4CF01F48B39200D27E80 /* MyGroupViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MyGroupViewController.h; sourceTree = "<group>"; };
 		E95F4CF11F48B39200D27E80 /* MyGroupViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MyGroupViewController.m; sourceTree = "<group>"; };
 		E95F4CF21F48B39200D27E80 /* MyGroupViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MyGroupViewController.xib; 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>"; };
+		E97588FA1F513BAD00782484 /* RankingObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RankingObject.h; sourceTree = "<group>"; };
+		E97588FB1F513BAD00782484 /* RankingObject.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RankingObject.m; 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 */,
+				E97588FA1F513BAD00782484 /* RankingObject.h */,
+				E97588FB1F513BAD00782484 /* RankingObject.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 = (
 				E95F4CEF1F48B37100D27E80 /* MyGroup */,
 				E95F4CE91F475C4B00D27E80 /* CreateGroup */,
 				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 /* GroupDetail */ = {
 			isa = PBXGroup;
 			children = (
 				E933E6761F40513C002926F5 /* GroupDetailViewController.h */,
 				E933E6771F40513C002926F5 /* GroupDetailViewController.m */,
 				E933E6781F40513C002926F5 /* GroupDetailViewController.xib */,
 			);
 			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>";
 		};
 		E95F4CE91F475C4B00D27E80 /* CreateGroup */ = {
 			isa = PBXGroup;
 			children = (
 				E95F4CEA1F475C6A00D27E80 /* CreateGroupViewController.h */,
 				E95F4CEB1F475C6A00D27E80 /* CreateGroupViewController.m */,
 				E95F4CEC1F475C6A00D27E80 /* CreateGroupViewController.xib */,
 			);
 			name = CreateGroup;
 			sourceTree = "<group>";
 		};
 		E95F4CEF1F48B37100D27E80 /* MyGroup */ = {
 			isa = PBXGroup;
 			children = (
 				E95F4CF01F48B39200D27E80 /* MyGroupViewController.h */,
 				E95F4CF11F48B39200D27E80 /* MyGroupViewController.m */,
 				E95F4CF21F48B39200D27E80 /* MyGroupViewController.xib */,
 			);
 			name = MyGroup;
 			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 = 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 */,
 				E95F4CEE1F475C6A00D27E80 /* CreateGroupViewController.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 */,
 				E95F4CF41F48B39200D27E80 /* MyGroupViewController.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 */,
 				E95F4CED1F475C6A00D27E80 /* CreateGroupViewController.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 */,
+				E97588FC1F513BAD00782484 /* RankingObject.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 */,
 				E95F4CF31F48B39200D27E80 /* MyGroupViewController.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;

LifeLog/LifeLog/BaseTableViewController.m

Diff comments View file @ e796f83

 //
 //  BaseTableViewController.m
 //  LifeLog
 //
 //  Created by nvtu on 8/11/17.
 //  Copyright © 2017 PhongNV. All rights reserved.
 //
 #import "BaseTableViewController.h"
 #import "Utilities.h"
 @interface BaseTableViewController ()
 @end
 @implementation BaseTableViewController
 - (void)viewDidLoad {
     [super viewDidLoad];
     _firstTime = false;
     _curPage   = 1;
     _isEndOfResult = false;
     _isDisableLoadMore = false;
     _curDataList = [[NSMutableArray alloc] init];
     self.refreshControl = [[UIRefreshControl alloc] init];
     [self.refreshControl addTarget:self action:@selector(refreshTable) forControlEvents:UIControlEventValueChanged];
     [self.tableBase addSubview:self.refreshControl];
     // Do any additional setup after loading the view.
 }
 - (void)didReceiveMemoryWarning {
     [super didReceiveMemoryWarning];
     // Dispose of any resources that can be recreated.
 }
 -(void) callRequestToUpdateData {
     _isLoading = true;
 }
 -(void) resetData {
     _isLoading = false;
     _isEndOfResult = false;
     _firstTime = false;
     _curPage = 1;
     [_curDataList removeAllObjects];
     [self.tableBase reloadData];
     [self callRequestToUpdateData];
 }
 -(void) refreshTable {
     [self resetData];
 }
 -(void) updateTableData : (NSArray *) array error: (NSError *) error {
     BaseTableViewController __weak *weakSelf = self;
     _isLoading = false;
     _firstTime = true;
     if(self.refreshControl != nil) {
         dispatch_async(dispatch_get_main_queue(), ^{
             [self.refreshControl endRefreshing];
         });
     }
     if(error == nil) {
+        if(_curPage == 1) {
+            [_curDataList removeAllObjects];
+        }
         if(array.count != 0) {
-            if(_curPage == 1) {
-                [_curDataList removeAllObjects];
-            }
             [_curDataList addObjectsFromArray:array];
             dispatch_async(dispatch_get_main_queue(), ^{
                 [weakSelf.tableBase reloadData];
             });
         }
         else {
             if(_curPage != 1) {
                 _isEndOfResult = true;
                 _curPage -= 1;
             }
             else {
                 dispatch_async(dispatch_get_main_queue(), ^{
                     [weakSelf.tableBase reloadData];
                 });
             }
         }
     }
     else {
         _curPage = MAX(1, _curPage - 1);
         dispatch_async(dispatch_get_main_queue(), ^{
             NSString *message = [error.userInfo objectForKey:@"message"];
             [Utilities showErrorMessage:message withViewController:weakSelf];
         });
     }
 }
 #pragma mark UITableView Delegate
 - (NSInteger) numberOfSectionsInTableView:(UITableView *)tableView {
     if((_curDataList == nil || _curDataList.count == 0) && _firstTime) {
         UILabel * noDataLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, tableView.frame.size.width, tableView.frame.size.height)];
         noDataLabel.text            = @"No data available";
         noDataLabel.backgroundColor = [UIColor clearColor];
         noDataLabel.textColor       = [UIColor whiteColor];
         noDataLabel.textAlignment   = NSTextAlignmentCenter;
         tableView.backgroundView    = noDataLabel;
         tableView.backgroundView.layer.zPosition -= 1;
         return 0;
     }
     tableView.backgroundView = nil;
     return 1;
 }
 - (NSInteger) tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
     return _curDataList.count;
 }
 - (void) tableView:(UITableView *)tableView willDisplayCell:(UITableViewCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPath {
     NSInteger lastRowIndex = [tableView numberOfRowsInSection:0] - 1;
     if (indexPath.row == lastRowIndex) {
         // This is the last cell
         if(!_isLoading && !_isDisableLoadMore) {
             _curPage += 1;
             [self callRequestToUpdateData];
         }
     }

LifeLog/LifeLog/Entities.h

Diff comments View file @ e796f83

 //
 //  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"
+#import "RankingObject.h"
 #endif /* Entities_h */

LifeLog/LifeLog/HistoryGraphObject.h

View file @ e796f83

1	//		File was deleted
2	// HistoryGraphObject.h
3	// LifeLog
4	//
5	// Created by nvtu on 8/5/17.
6	// Copyright © 2017 PhongNV. All rights reserved.
7	//
8
9	#import <Foundation/Foundation.h>
10
11	@interface HistoryGraphObject : NSObject
12
13	@property (nonatomic, strong) NSMutableArray * arrayTime;
14	@property (nonatomic, strong) NSMutableArray * arrayStep;
15
16	-(id) initWithData : (NSDictionary *) dict;
17
18	@end
19		1	//

LifeLog/LifeLog/HistoryGraphObject.m

View file @ e796f83

1	//		File was deleted
2	// HistoryGraphObject.m
3	// LifeLog
4	//
5	// Created by nvtu on 8/5/17.
6	// Copyright © 2017 PhongNV. All rights reserved.
7	//
8
9	#import "HistoryGraphObject.h"
10
11	@implementation HistoryGraphObject
12
13	-(id) initWithData : (NSDictionary *) dict {
14
15	if([dict objectForKey:@"data"] != nil) {
16	self.arrayStep = [[NSMutableArray alloc] init];
17	self.arrayTime = [[NSMutableArray alloc] init];
18	NSArray *arrayGraph = dict[@"data"];
19	for(NSDictionary *sub in arrayGraph) {
20	if([sub objectForKey:@"hour"] != nil && [sub objectForKey:@"step"] != nil) {
21	[self.arrayTime addObject:[sub objectForKey:@"hour"]];
22	[self.arrayStep addObject:[sub objectForKey:@"step"]];
23	}
24	}
25	}
26	else {
27	return nil;
28	}
29	return self;
30	}
31
32
33	@end
34		1	//

LifeLog/LifeLog/RankingObject.h

Diff comments View file @ e796f83

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

LifeLog/LifeLog/RankingObject.m

Diff comments View file @ e796f83

File was created	1	//
	2	// RankingObject.m
	3	// LifeLog
	4	//
	5	// Created by nvtu on 8/26/17.
	6	// Copyright © 2017 PhongNV. All rights reserved.
	7	//
	8
	9	#import "RankingObject.h"
	10
	11	@implementation RankingObject
	12
	13	-(id) initWithData : (NSDictionary *) dict {
	14	if([dict objectForKey:@"user_id"] != nil) {
	15	self.userID = [dict[@"user_id"] intValue];
	16	}
	17	if([dict objectForKey:@"rank"] != nil) {
	18	self.rank = [dict[@"rank"] intValue];
	19	}
	20	if([dict objectForKey:@"steps"] != nil) {
	21	self.steps = [dict[@"steps"] intValue];
	22	}
	23	if([dict objectForKey:@"distance"] != nil) {
	24	self.distance = [dict[@"distance"] floatValue];
	25	}
	26	if([dict objectForKey:@"time"] != nil) {
	27	self.time = [dict[@"time"] intValue];
	28	}
	29	if([dict objectForKey:@"username"] != nil) {
	30	self.userName = dict[@"username"];
	31	}
	32	if([dict objectForKey:@"profile_image"] != nil) {
	33	self.avatar = dict[@"profile_image"];
	34	}
	35	return self;
	36	}
	37
	38	@end
	39

LifeLog/LifeLog/RankingTableViewCell.h

Diff comments View file @ e796f83

 //
 //  RankingTableViewCell.h
 //  LifeLog
 //
 //  Created by nvtu on 8/8/17.
 //  Copyright © 2017 PhongNV. All rights reserved.
 //
 #import <UIKit/UIKit.h>
+#import "RankingObject.h"
 @interface RankingTableViewCell : UITableViewCell
 @property (weak, nonatomic) IBOutlet UILabel *lblIndex;
 @property (weak, nonatomic) IBOutlet UILabel *lblName;
 @property (weak, nonatomic) IBOutlet UILabel *lblStep;
 @property (weak, nonatomic) IBOutlet UILabel *lblTime;
 @property (weak, nonatomic) IBOutlet UILabel *lblDistance;
 @property (weak, nonatomic) IBOutlet UIImageView *imgAvatar;
+-(void) setRankingData : (RankingObject *) object;
 @end

LifeLog/LifeLog/RankingTableViewCell.m

Diff comments View file @ e796f83

 //
 //  RankingTableViewCell.m
 //  LifeLog
 //
 //  Created by nvtu on 8/8/17.
 //  Copyright © 2017 PhongNV. All rights reserved.
 //
 #import "RankingTableViewCell.h"
+#import <SDWebImage/UIImageView+WebCache.h>
+#import "Utilities.h"
 @implementation RankingTableViewCell
 - (void)awakeFromNib {
     [super awakeFromNib];
     // Initialization code
 }
 - (void)setSelected:(BOOL)selected animated:(BOOL)animated {
     [super setSelected:selected animated:animated];
     // Configure the view for the selected state
 }
+-(void) setRankingData : (RankingObject *) object {
+    if(object.avatar && ![object.avatar isKindOfClass:[NSNull class]]) {
+        [self.imgAvatar sd_setImageWithURL:[NSURL URLWithString:[Utilities getImageLink:object.avatar]]];
+    }
+    else {
+        [self.imgAvatar setImage:[UIImage imageNamed:@"avatar_default"]];
+    }
+    self.lblIndex.text = [NSString stringWithFormat:@"%d", object.rank];
+    self.lblName.text = object.userName;
+    self.lblDistance.text = [NSString stringWithFormat:@"%0.1f km", object.distance];
+    self.lblStep.text = [NSString stringWithFormat:@"%d 歩", object.steps];
+    self.lblTime.text = [Utilities convertSecondToShortTime:object.time];
+}
 @end

LifeLog/LifeLog/RankingViewController.h

Diff comments View file @ e796f83

1	//	1	//
2	// RankingViewController.h	2	// RankingViewController.h
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 <UIKit/UIKit.h>	9	#import <UIKit/UIKit.h>
10		10
		11	#import "BaseTableViewController.h"
11	#import "CollectionView.h"	12	#import "CollectionView.h"
12		13
13	@interface RankingViewController : UIViewController	14	@interface RankingViewController : BaseTableViewController {
		15	NSDate * _startDate;
		16	NSDate * _endDate;
		17	}
14		18
15	@property (weak, nonatomic) IBOutlet CollectionView *viewCollectionTime;	19	@property (weak, nonatomic) IBOutlet CollectionView *viewCollectionTime;
16	@property (weak, nonatomic) IBOutlet CollectionView *viewCollectionMode;	20	@property (weak, nonatomic) IBOutlet CollectionView *viewCollectionMode;
17	@property (weak, nonatomic) IBOutlet CollectionView *viewCollectionType;	21	@property (weak, nonatomic) IBOutlet CollectionView *viewCollectionType;
18		22	@property (weak, nonatomic) IBOutlet UILabel *lblDateTime;
19	@property (weak, nonatomic) IBOutlet UITableView *tableRank;
20		23
21	- (IBAction)clickButton:(UIButton *)sender;	24	- (IBAction)clickButton:(UIButton *)sender;
22	@end	25	@end

LifeLog/LifeLog/RankingViewController.m

Diff comments View file @ e796f83

 //
 //  RankingViewController.m
 //  LifeLog
 //
 //  Created by Nguyen Van Phong on 7/25/17.
 //  Copyright © 2017 PhongNV. All rights reserved.
 //
 #import "RankingViewController.h"
 #import "RankingTableViewCell.h"
+#import "ServerAPI.h"
+#import "Utilities.h"
 @interface RankingViewController ()
 @end
 @implementation RankingViewController
 - (void)viewDidLoad {
     [super viewDidLoad];
     // Do any additional setup after loading the view from its nib.
     self.title = NSLocalizedString(@"lifelog.rank.title", nil);
     [self setupView];
+    _startDate = [NSDate date];
+    _endDate   = _startDate;
+    self.lblDateTime.text = [Utilities stringFromDate:_endDate withFormat:@"YYYY年MM月dd日 EEEE" locale:@"ja_JP"];
     //register nib for table view
-    [self.tableRank registerNib:[UINib nibWithNibName:@"RankingTableViewCell" bundle:nil] forCellReuseIdentifier:@"RankCell"];
+    [self.tableBase registerNib:[UINib nibWithNibName:@"RankingTableViewCell" bundle:nil] forCellReuseIdentifier:@"RankCell"];
+    [self callRequestToUpdateData];
 }
 - (void)didReceiveMemoryWarning {
     [super didReceiveMemoryWarning];
     // Dispose of any resources that can be recreated.
 }
 #pragma mark Setup and Update View
 - (void)setupView {
     NSArray *timeTitle = [NSArray arrayWithObjects:NSLocalizedString(@"lifelog.rank.time.1", nil), NSLocalizedString(@"lifelog.rank.time.2", nil), NSLocalizedString(@"lifelog.rank.time.3", nil), NSLocalizedString(@"lifelog.rank.time.4", nil), nil];
     [self.viewCollectionTime setButtonNumber:timeTitle.count];
     [self.viewCollectionTime setSpacing:1];
     [self.viewCollectionTime setArrayTitle:timeTitle];
     self.viewCollectionTime.changeCurrentIndex = ^(int index){
-        [self callRequestToUpdateData];
+        [self changeDate];
     };
     NSArray *modeTitle = [NSArray arrayWithObjects:NSLocalizedString(@"lifelog.rank.mode.1", nil), NSLocalizedString(@"lifelog.rank.mode.2", nil), NSLocalizedString(@"lifelog.rank.mode.3", nil), NSLocalizedString(@"lifelog.rank.mode.4", nil), nil];
     [self.viewCollectionMode setButtonNumber:modeTitle.count];
     [self.viewCollectionMode setSpacing:1];
     [self.viewCollectionMode setArrayTitle:modeTitle];
     self.viewCollectionMode.changeCurrentIndex = ^(int index){
         [self callRequestToUpdateData];
     };
     NSArray *typeTitle = [NSArray arrayWithObjects:NSLocalizedString(@"lifelog.rank.type.1", nil), NSLocalizedString(@"lifelog.rank.type.2", nil), NSLocalizedString(@"lifelog.rank.type.3", nil), NSLocalizedString(@"lifelog.rank.type.4", nil), nil];
     [self.viewCollectionType setButtonNumber:typeTitle.count];
     [self.viewCollectionType setSpacing:1];
     [self.viewCollectionType setArrayTitle:typeTitle];
     self.viewCollectionMode.changeCurrentIndex = ^(int index){
         [self callRequestToUpdateData];
     };
 }
 #pragma mark IBAction function
 - (IBAction)clickButton:(UIButton *)sender {
 }
 #pragma mark UITableView Delegate
-- (NSInteger) numberOfSectionsInTableView:(UITableView *)tableView {
-//    if(_curHisList == nil || _curHisList.count == 0) {
-//        UILabel * noDataLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, tableView.frame.size.width, tableView.frame.size.height)];
-//        noDataLabel.text             = @"No data available";
-//        noDataLabel.backgroundColor  = [UIColor clearColor];
-//        noDataLabel.textColor        = [UIColor whiteColor];
-//        noDataLabel.textAlignment    = NSTextAlignmentCenter;
-//        tableView.backgroundView = noDataLabel;
-//        tableView.backgroundView.layer.zPosition -= 1;
-//        return 0;
-//    }
-//    tableView.backgroundView = nil;
-    return 1;
-}
-- (NSInteger) tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
-    return 6;
-}
 -  (UITableViewCell *) tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
     RankingTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:@"RankCell"];
+    [cell setRankingData:[_curDataList objectAtIndex:indexPath.row]];
     return cell;
 }
 #pragma mark Private function
 - (void)callRequestToUpdateData {
+    [super callRequestToUpdateData];
+    NSString * token = [[NSUserDefaults standardUserDefaults] stringForKey:kToken];
+    MBProgressHUD *hudView = nil;
+    int mode = self.viewCollectionMode.getCurrentIndex + 1;
+    //dont have all
+    mode = fmin(mode, 3);
+    if(_curPage == 1 && !self.refreshControl.isRefreshing) {
+        hudView = [MBProgressHUD showHUDAddedTo:self.view animated:true];
+    }
+    [[ServerAPI server] requestRankingList:token startDate:_startDate endDate:_endDate mode:mode page:_curPage CompletionHandler:^(NSArray *array, NSError *error){
+        dispatch_async(dispatch_get_main_queue(), ^{
+            if(hudView != nil) {
+                [hudView hideAnimated:true];
+            }
+        });
+        RankingViewController __weak *weakSelf = self;
+        [weakSelf updateTableData:array error:error];
+    }];
+}
+- (void) changeDate {
+    switch (self.viewCollectionTime.getCurrentIndex) {
+        case 1:
+            _startDate = [_endDate dateByAddingTimeInterval:-86400 * 7];
+            break;
+        case 2:
+            _startDate = [_endDate dateByAddingTimeInterval:-86400 * 30];
+            break;
+        case 3:

LifeLog/LifeLog/RankingViewController.xib

Diff comments View file @ e796f83

 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12089"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12086"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="RankingViewController">
             <connections>
-                <outlet property="tableRank" destination="R3A-K9-MFe" id="uEX-sL-6D2"/>
+                <outlet property="lblDateTime" destination="5Ro-k6-fvT" id="5uO-ff-Pmc"/>
+                <outlet property="tableBase" destination="R3A-K9-MFe" id="Tf9-Rg-PEW"/>
                 <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
                 <outlet property="viewCollectionMode" destination="B33-xX-Jro" id="HP4-Xb-LJm"/>
                 <outlet property="viewCollectionTime" destination="syA-uK-pbr" id="WdA-Cq-Flj"/>
                 <outlet property="viewCollectionType" destination="oUo-Eo-tz5" id="bjw-El-34G"/>
             </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="GBx-lY-9YI" 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="ランキング" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="p97-40-8m9" 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.rank.title"/>
                             </userDefinedRuntimeAttributes>
                         </label>
                         <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="qPe-ff-jRp">
                             <rect key="frame" x="0.0" y="5" width="70" height="36"/>
                             <constraints>
                                 <constraint firstAttribute="width" constant="70" id="bEy-jt-69Q"/>
                             </constraints>
                             <state key="normal" image="today_back_button"/>
                         </button>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="WGc-2i-Swk">
                             <rect key="frame" x="330" y="0.0" width="45" height="46"/>
                             <constraints>
                                 <constraint firstAttribute="width" constant="45" id="nJ2-jH-Z45"/>
                             </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 firstAttribute="bottom" secondItem="WGc-2i-Swk" secondAttribute="bottom" id="0hd-fk-kJG"/>
                         <constraint firstAttribute="bottom" secondItem="p97-40-8m9" secondAttribute="bottom" id="78G-b2-wAu"/>
                         <constraint firstItem="qPe-ff-jRp" firstAttribute="leading" secondItem="GBx-lY-9YI" secondAttribute="leading" id="9ND-Te-qX9"/>
                         <constraint firstItem="qPe-ff-jRp" firstAttribute="top" secondItem="GBx-lY-9YI" secondAttribute="top" constant="5" id="9ZX-A3-Bnp"/>
                         <constraint firstItem="p97-40-8m9" firstAttribute="top" secondItem="GBx-lY-9YI" secondAttribute="top" id="CVN-ke-5KK"/>
                         <constraint firstAttribute="height" constant="46" id="SDI-ij-KbH"/>
                         <constraint firstItem="p97-40-8m9" firstAttribute="leading" secondItem="GBx-lY-9YI" secondAttribute="leading" id="U19-fM-q7G"/>
                         <constraint firstAttribute="bottom" secondItem="qPe-ff-jRp" secondAttribute="bottom" constant="5" id="jU7-xM-YKX"/>
                         <constraint firstItem="WGc-2i-Swk" firstAttribute="top" secondItem="GBx-lY-9YI" secondAttribute="top" id="knL-Yf-VTN"/>
                         <constraint firstAttribute="trailing" secondItem="p97-40-8m9" secondAttribute="trailing" id="sLL-ca-92S"/>
                         <constraint firstAttribute="trailing" secondItem="WGc-2i-Swk" secondAttribute="trailing" id="v0h-pb-83W"/>
                     </constraints>
                 </view>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="syA-uK-pbr" customClass="CollectionView">
                     <rect key="frame" x="0.0" y="46" width="375" height="30"/>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="30" id="ezW-Qs-M7K"/>
                     </constraints>
                 </view>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="B33-xX-Jro" customClass="CollectionView">
                     <rect key="frame" x="0.0" y="116" width="375" height="30"/>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="30" id="snn-FM-11r"/>
                     </constraints>
                 </view>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="u5D-xz-8dK">
                     <rect key="frame" x="0.0" y="76" width="375" height="40"/>
                     <subviews>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5Ro-k6-fvT">
                             <rect key="frame" x="0.0" y="0.0" width="375" height="40"/>
                             <string key="text" base64-UTF8="YES">
 MjAxNuW5tCAx5pyIMjLml6XjgIDvvI3jgIAyMDE35bm0IDHmnIgyMeaXpQ0KAA
 </string>
                             <fontDescription key="fontDescription" type="system" pointSize="13"/>
                             <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                             <nil key="highlightedColor"/>
                         </label>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="eiH-Sk-3VV">
                             <rect key="frame" x="15" y="5" width="30" height="30"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="30" id="kEd-sQ-0ub"/>
                                 <constraint firstAttribute="width" constant="30" id="sFT-sr-7pL"/>
                             </constraints>
                             <state key="normal" image="icon_left"/>
                             <connections>
                                 <action selector="clickButton:" destination="-1" eventType="touchUpInside" id="f1Y-rj-F7d"/>
                             </connections>
                         </button>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Usl-Cl-d9d">
                             <rect key="frame" x="330" y="5" width="30" height="30"/>
                             <constraints>
                                 <constraint firstAttribute="width" constant="30" id="uFf-AY-LsL"/>
                                 <constraint firstAttribute="height" constant="30" id="v8w-hV-CY1"/>
                             </constraints>
                             <state key="normal" image="icon_right"/>
                             <connections>
                                 <action selector="clickButton:" destination="-1" eventType="touchUpInside" id="OB1-mE-CGE"/>
                             </connections>
                         </button>
                     </subviews>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="40" id="C5o-Zd-KjG"/>
                         <constraint firstAttribute="bottom" secondItem="5Ro-k6-fvT" secondAttribute="bottom" id="DQQ-wh-s1Q"/>
                         <constraint firstAttribute="trailing" secondItem="5Ro-k6-fvT" secondAttribute="trailing" id="E0c-bJ-AIi"/>
                         <constraint firstItem="5Ro-k6-fvT" firstAttribute="top" secondItem="u5D-xz-8dK" secondAttribute="top" id="Mrk-FC-rqh"/>
                         <constraint firstItem="eiH-Sk-3VV" firstAttribute="centerY" secondItem="u5D-xz-8dK" secondAttribute="centerY" id="k2J-Lc-ZDI"/>
                         <constraint firstItem="5Ro-k6-fvT" firstAttribute="leading" secondItem="u5D-xz-8dK" secondAttribute="leading" id="rj5-0J-xs3"/>
                         <constraint firstItem="Usl-Cl-d9d" firstAttribute="centerY" secondItem="u5D-xz-8dK" secondAttribute="centerY" id="sJX-n3-1pz"/>
                         <constraint firstItem="eiH-Sk-3VV" firstAttribute="leading" secondItem="u5D-xz-8dK" secondAttribute="leading" constant="15" id="to7-WU-7xo"/>
                         <constraint firstAttribute="trailing" secondItem="Usl-Cl-d9d" secondAttribute="trailing" constant="15" id="yDF-9k-XlW"/>
                     </constraints>
                 </view>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="oUo-Eo-tz5" customClass="CollectionView">
                     <rect key="frame" x="0.0" y="577" width="375" height="40"/>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="40" id="Trr-Ku-Ssy"/>
                     </constraints>
                 </view>
                 <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" rowHeight="80" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="R3A-K9-MFe">
                     <rect key="frame" x="0.0" y="147" width="375" height="429"/>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                     <color key="separatorColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                     <connections>
                         <outlet property="dataSource" destination="-1" id="JJX-cg-LPL"/>
                         <outlet property="delegate" destination="-1" id="u0m-93-lsi"/>
                     </connections>
                 </tableView>
             </subviews>
             <color key="backgroundColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
             <constraints>
                 <constraint firstItem="B33-xX-Jro" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="2Mu-hy-FVU"/>
                 <constraint firstItem="GBx-lY-9YI" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" id="5CL-wT-MBg"/>
                 <constraint firstItem="u5D-xz-8dK" firstAttribute="top" secondItem="syA-uK-pbr" secondAttribute="bottom" id="5uu-dZ-oXI"/>
                 <constraint firstItem="syA-uK-pbr" firstAttribute="top" secondItem="GBx-lY-9YI" secondAttribute="bottom" id="6FQ-vy-d4N"/>
                 <constraint firstItem="u5D-xz-8dK" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="75z-RN-ObF"/>
                 <constraint firstItem="R3A-K9-MFe" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="LyL-9p-qcd"/>
                 <constraint firstItem="oUo-Eo-tz5" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="M7I-ue-lip"/>
                 <constraint firstAttribute="trailing" secondItem="B33-xX-Jro" secondAttribute="trailing" id="Pjd-Ay-GaV"/>
                 <constraint firstItem="oUo-Eo-tz5" firstAttribute="top" secondItem="R3A-K9-MFe" secondAttribute="bottom" constant="1" id="QMu-aq-2Zt"/>
                 <constraint firstAttribute="trailing" secondItem="syA-uK-pbr" secondAttribute="trailing" id="Qnl-Pp-y2G"/>
                 <constraint firstItem="B33-xX-Jro" firstAttribute="top" secondItem="u5D-xz-8dK" secondAttribute="bottom" id="VOl-jo-wU3"/>
                 <constraint firstItem="GBx-lY-9YI" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="YjB-ef-xTt"/>
                 <constraint firstItem="syA-uK-pbr" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="aTf-mb-wlT"/>
                 <constraint firstAttribute="bottom" secondItem="oUo-Eo-tz5" secondAttribute="bottom" constant="50" id="cux-Vm-qq7"/>
                 <constraint firstAttribute="trailing" secondItem="R3A-K9-MFe" secondAttribute="trailing" id="jBn-JI-SQP"/>
                 <constraint firstItem="R3A-K9-MFe" firstAttribute="top" secondItem="B33-xX-Jro" secondAttribute="bottom" constant="1" id="jTi-59-XsZ"/>
                 <constraint firstAttribute="trailing" secondItem="u5D-xz-8dK" secondAttribute="trailing" id="mDB-o3-gtA"/>
                 <constraint firstAttribute="trailing" secondItem="GBx-lY-9YI" secondAttribute="trailing" id="yaf-8r-ySL"/>
                 <constraint firstAttribute="trailing" secondItem="oUo-Eo-tz5" secondAttribute="trailing" id="zkl-by-qMp"/>
             </constraints>
             <point key="canvasLocation" x="26.5" y="52.5"/>
         </view>
     </objects>
     <resources>
         <image name="icon_left" width="30" height="30"/>
         <image name="icon_menu" width="30" height="30"/>
         <image name="icon_right" width="30" height="30"/>
         <image name="today_back_button" width="73" height="37"/>
     </resources>
 </document>

LifeLog/LifeLog/ServerAPI.h

Diff comments View file @ e796f83

 //
 //  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 startDate:(NSDate *)startDate endDate:(NSDate *)endDate CompletionHandler:(void (^)(NSArray *, NSError *)) completion;
 - (void) requestHistoryList:(NSString *)token startDate:(NSDate *)startDate endDate:(NSDate *)endDate CompletionHandler:(void (^)(NSArray *, NSError *)) completion;
 - (void) requestJoinGroup:(NSString *)token groupID: (int) groupID CompletionHandler:(void (^)(NSError *)) completion;
 -(void) requestCreateGroup:(NSString *)token withGroup:(GroupObject *)group CompletionHandler:(void (^)(GroupObject *, NSError *)) completion;
 - (void) requestGroupList:(NSString *)token CompletionHandler:(void (^)(NSArray *, 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 - Ranking API
+- (void) requestRankingList:(NSString *)token startDate:(NSDate *)startDate endDate:(NSDate *)endDate mode:(int) mode page:(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 @ e796f83

 //
 //  ServerAPI.m
 //  LifeLog
 //
 //  Created by Nguyen Van Phong on 7/30/17.
 //  Copyright © 2017 PhongNV. All rights reserved.
 //
 #import "ServerAPI.h"
 #import "Utilities.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 startDate:(NSDate *)startDate endDate:(NSDate *)endDate CompletionHandler:(void (^)(NSArray *, NSError *)) completion {
     NSString *url = [kServerAddress stringByAppendingFormat:@"/api/history/%@/%@", [Utilities stringFromDate:startDate withFormat:@"YYYYMMdd" locale:@""], [Utilities stringFromDate:endDate withFormat:@"YYYYMMdd" locale:@""]];
     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
                 NSMutableArray * arrayHistory = [[NSMutableArray alloc] init];
                 NSDictionary * arrResult = dataResult[@"result"];
                 if(arrResult != nil) {
                     NSArray *arrayKey = [NSArray arrayWithObjects:@"mode_1", @"mode_2", @"mode_3", nil];
                     for(NSString * key in arrayKey) {
                         NSDictionary *mode = [arrResult objectForKey:key];
                         if(![[arrResult objectForKey:key] isKindOfClass:[NSNull class]]) {
                             HistoryObject * objectMode = [[HistoryObject alloc] initWithData:mode];
                             [arrayHistory addObject:objectMode];
                         }
                         else {
                             [arrayHistory addObject:[[HistoryObject alloc] init]];
                         }
                     }
                 }
                 completion(arrayHistory, 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 startDate:startDate endDate:endDate 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 startDate:(NSDate *)startDate endDate:(NSDate *)endDate CompletionHandler:(void (^)(NSArray *, NSError *)) completion {
     NSString *url = [kServerAddress stringByAppendingFormat:@"/api/history/detail/%@/%@", [Utilities stringFromDate:startDate withFormat:@"YYYYMMdd" locale:@""], [Utilities stringFromDate:endDate withFormat:@"YYYYMMdd" locale:@""]];
     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) {
                     NSMutableArray * arrayHistory = [[NSMutableArray alloc] init];
                     NSDictionary * arrResult = dataResult[@"result"];
                     if(arrResult != nil) {
                         NSArray *arrayKey = [NSArray arrayWithObjects:@"mode_1", @"mode_2", @"mode_3", nil];
                         for(NSString * key in arrayKey) {
                             NSDictionary *mode = [arrResult objectForKey:key];
                             if(![[arrResult objectForKey:key] isKindOfClass:[NSNull class]]) {
                                 NSMutableArray *array = [[NSMutableArray alloc] init];
                                 for(NSString *key in mode.allKeys) {
                                     HistoryObject * objectMode = [[HistoryObject alloc] initWithData:mode[key]];
                                     objectMode.date = [Utilities dateFromString:key withFormat:@"yyyy-MM-dd"];
                                     [array addObject:objectMode];
                                 }
                                 [arrayHistory addObject:array];
                             }
                             else {
                                 [arrayHistory addObject:[[NSArray alloc] init]];
                             }
                         }
                     }
                     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 startDate:startDate endDate:endDate 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];
+    NSString *url = [kServerAddress stringByAppendingFormat:@"api/tweet/list?page=%d&record=10", 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) requestCreateGroup:(NSString *)token withGroup:(GroupObject *)group CompletionHandler:(void (^)(GroupObject *, NSError *)) completion {
     NSString *url = [kServerAddress stringByAppendingFormat:@"api/groups/newGroup"];
     NSLog(@"requestCreateGroup link %@", url);
     NSDictionary * dict = @{@"group_name":group.name,
                             @"goal":group.goal,
                             @"walk_mode_active":[NSNumber numberWithBool:group.walkMode],
                             @"run_mode_active":[NSNumber numberWithBool:group.runMode],
                             @"bike_mode_active":[NSNumber numberWithBool:group.bikeMode],
                             @"step_mode_active":[NSNumber numberWithBool:group.stepMode],
                             @"gym_mode_active":[NSNumber numberWithBool:group.gymMode],
                             @"beginer_mode_active":[NSNumber numberWithBool:group.beginMode],
                             @"walk_mode_goal":[NSNumber numberWithBool:group.walkGoal],
                             @"run_mode_goal":[NSNumber numberWithBool:group.runGoal],
                             @"bike_mode_goal":[NSNumber numberWithBool:group.bikeGoal]};
     [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];
             NSLog(@"%@", dataResult);
             int status = [dataResult[@"status"] intValue];
             if (status == 1) { // status = 1 success
                 if(dataResult[@"result"] != nil) {
                     NSDictionary * dict = dataResult[@"result"];
                     group.groupID = [dict[@"group_id"] intValue];
                     completion(group, 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 requestCreateGroup:tokenNew withGroup:group CompletionHandler:completion];
                 }
                 else {
                     NSError *errorObject = [NSError errorWithDomain:@"LifeLog_Domain" code:-1 userInfo:@{@"message":message}];
                     completion(nil, errorObject);
                 }
             }
         }
         else
         {
             completion(nil, error);
         }
     }];
 }
 - (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] andGroupID:groupID];
                     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);
     [self _request:url method:@"POST" token:token paras:@{@"group_id": [NSNumber numberWithInt:groupID]}  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) {
                     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);
         }
     }];
 }
 - (void) requestGroupList:(NSString *)token CompletionHandler:(void (^)(NSArray *, NSError *)) completion {
     NSString *url = [kServerAddress stringByAppendingFormat:@"api/groups/list"];
     NSLog(@"requestGroupList 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 * arrayGroup = [[NSMutableArray alloc] init];
                     for(NSDictionary * dict in array) {
                         GroupObject * object = [[GroupObject alloc] initWithShortData:dict];
                         [arrayGroup addObject:object];
                     }
                     completion(arrayGroup, 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 requestGroupList:tokenNew CompletionHandler:completion];
                 }
                 else {
                     NSError *errorObject = [NSError errorWithDomain:@"LifeLog_Domain" code:-1 userInfo:@{@"message":message}];
                     completion(nil, errorObject);
                 }
             }
         }
         else
         {
             completion(nil, error);
         }
     }];
 }
+#pragma mark - Ranking API
+- (void) requestRankingList:(NSString *)token startDate:(NSDate *)startDate endDate:(NSDate *)endDate mode:(int) mode page:(int) page CompletionHandler:(void (^)(NSArray *, NSError *)) completion {
+    NSString *url = [kServerAddress stringByAppendingFormat:@"api/ranking/%d/%@/%@/%d", mode, [Utilities stringFromDate:startDate withFormat:@"YYYYMMdd" locale:@""], [Utilities stringFromDate:endDate withFormat:@"YYYYMMdd" locale:@""], page];
+    NSLog(@"requestRaningList 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
+                NSArray * array = dataResult[@"result"];
+                NSMutableArray * arrayRanking = [[NSMutableArray alloc] init];
+                for(NSDictionary * dict in array) {
+                    RankingObject * object = [[RankingObject alloc] initWithData:dict];
+                    [arrayRanking addObject:object];
+                }
+                completion(arrayRanking, 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 requestRankingList:tokenNew startDate:startDate endDate:endDate mode:mode page:page CompletionHandler:completion];
+                }
+                else {
+                    NSError *errorObject = [NSError errorWithDomain:@"LifeLog_Domain" code:-1 userInfo:@{@"message":message}];
+                    completion(nil, errorObject);
+                }
+            }
+        }
+        else
+        {
+            completion(nil, 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