From 7aa2027583dc8d6ca20d372caa8a9ae1ac86714d Mon Sep 17 00:00:00 2001 From: nvtu Date: Fri, 11 Aug 2017 11:39:23 +0700 Subject: [PATCH] Add API get recent tweets list in SNS Screen --- LifeLog/LifeLog.xcodeproj/project.pbxproj | 6 ++ LifeLog/LifeLog/Entities.h | 1 + LifeLog/LifeLog/HistoryViewController.m | 14 +++- LifeLog/LifeLog/SNSRecentTopicTableViewCell.h | 2 +- LifeLog/LifeLog/SNSRecentTopicTableViewCell.xib | 11 ++- LifeLog/LifeLog/SNSViewController.h | 8 +- LifeLog/LifeLog/SNSViewController.m | 106 +++++++++++++++++++++--- LifeLog/LifeLog/ServerAPI.h | 4 + LifeLog/LifeLog/ServerAPI.m | 45 +++++++++- LifeLog/LifeLog/TweetObject.h | 27 ++++++ LifeLog/LifeLog/TweetObject.m | 66 +++++++++++++++ LifeLog/LifeLog/Utilities.h | 5 ++ LifeLog/LifeLog/Utilities.m | 25 ++++++ LifeLog/Podfile | 1 + 14 files changed, 295 insertions(+), 26 deletions(-) create mode 100644 LifeLog/LifeLog/TweetObject.h create mode 100644 LifeLog/LifeLog/TweetObject.m diff --git a/LifeLog/LifeLog.xcodeproj/project.pbxproj b/LifeLog/LifeLog.xcodeproj/project.pbxproj index b111bf4..a60a697 100644 --- a/LifeLog/LifeLog.xcodeproj/project.pbxproj +++ b/LifeLog/LifeLog.xcodeproj/project.pbxproj @@ -57,6 +57,7 @@ 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 */; }; 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 */ @@ -167,6 +168,8 @@ E99E13AE1F33720600C78787 /* LabelCollectionViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LabelCollectionViewCell.h; sourceTree = ""; }; E99E13AF1F33720600C78787 /* LabelCollectionViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LabelCollectionViewCell.m; sourceTree = ""; }; E99E13B01F33720600C78787 /* LabelCollectionViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = LabelCollectionViewCell.xib; sourceTree = ""; }; + E9D9091F1F3D559D004CF99F /* TweetObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TweetObject.h; sourceTree = ""; }; + E9D909201F3D559D004CF99F /* TweetObject.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TweetObject.m; sourceTree = ""; }; E9F73DC91F338A0F004A3A6F /* HistoryListTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HistoryListTableViewCell.h; sourceTree = ""; }; E9F73DCA1F338A0F004A3A6F /* HistoryListTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HistoryListTableViewCell.m; sourceTree = ""; }; E9F73DCB1F338A0F004A3A6F /* HistoryListTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = HistoryListTableViewCell.xib; sourceTree = ""; }; @@ -238,6 +241,8 @@ E9373E491F35AA180059355A /* HistoryObject.m */, E9373E4B1F361A230059355A /* HistoryGraphObject.h */, E9373E4C1F361A230059355A /* HistoryGraphObject.m */, + E9D9091F1F3D559D004CF99F /* TweetObject.h */, + E9D909201F3D559D004CF99F /* TweetObject.m */, ); name = Model; sourceTree = ""; @@ -727,6 +732,7 @@ 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 */, diff --git a/LifeLog/LifeLog/Entities.h b/LifeLog/LifeLog/Entities.h index efc0af5..8e88afd 100644 --- a/LifeLog/LifeLog/Entities.h +++ b/LifeLog/LifeLog/Entities.h @@ -11,6 +11,7 @@ #import +#import "TweetObject.h" #import "HistoryGraphObject.h" #import "HistoryObject.h" #import "User.h" diff --git a/LifeLog/LifeLog/HistoryViewController.m b/LifeLog/LifeLog/HistoryViewController.m index 4e46fdd..6147f6b 100644 --- a/LifeLog/LifeLog/HistoryViewController.m +++ b/LifeLog/LifeLog/HistoryViewController.m @@ -150,16 +150,19 @@ if(self.tableListHistory.alpha == 0.0) { [[ServerAPI server] requestHistory:token atDate:_curDate withType:type andMode:mode CompletionHandler:^(HistoryObject *object, NSError *error) { HistoryViewController __weak *weakSelf = self; + dispatch_async(dispatch_get_main_queue(), ^{ + if(hudView != nil) { + [hudView hideAnimated:true]; + } + }); if(error == nil) { _curHisObj = object; dispatch_async(dispatch_get_main_queue(), ^{ - [hudView hideAnimated:true]; [weakSelf updateView]; }); } else { dispatch_async(dispatch_get_main_queue(), ^{ - [hudView hideAnimated:true]; NSString *message = [error.userInfo objectForKey:@"message"]; [Utilities showErrorMessage:message withViewController:weakSelf]; }); @@ -185,16 +188,19 @@ else { [[ServerAPI server] requestHistoryList:token withType:type andMode:mode AtPage:1 CompletionHandler:^(NSMutableArray *object, NSError *error) { HistoryViewController __weak *weakSelf = self; + dispatch_async(dispatch_get_main_queue(), ^{ + if(hudView != nil) { + [hudView hideAnimated:true]; + } + }); if(error == nil) { _curHisList = object; dispatch_async(dispatch_get_main_queue(), ^{ - [hudView hideAnimated:true]; [weakSelf.tableListHistory reloadData]; }); } else { dispatch_async(dispatch_get_main_queue(), ^{ - [hudView hideAnimated:true]; NSString *message = [error.userInfo objectForKey:@"message"]; [Utilities showErrorMessage:message withViewController:weakSelf]; }); diff --git a/LifeLog/LifeLog/SNSRecentTopicTableViewCell.h b/LifeLog/LifeLog/SNSRecentTopicTableViewCell.h index 162d691..b007a56 100644 --- a/LifeLog/LifeLog/SNSRecentTopicTableViewCell.h +++ b/LifeLog/LifeLog/SNSRecentTopicTableViewCell.h @@ -12,7 +12,7 @@ @property (weak, nonatomic) IBOutlet UIImageView *imgAvatar; @property (weak, nonatomic) IBOutlet UILabel *lblDateTime; -@property (weak, nonatomic) IBOutlet UILabel *lblLocation; +@property (weak, nonatomic) IBOutlet UILabel *lblUsername; @property (weak, nonatomic) IBOutlet UILabel *lblDes; @property (weak, nonatomic) IBOutlet UILabel *lblMode; @property (weak, nonatomic) IBOutlet UILabel *lblDistance; diff --git a/LifeLog/LifeLog/SNSRecentTopicTableViewCell.xib b/LifeLog/LifeLog/SNSRecentTopicTableViewCell.xib index a95dcac..2fe548e 100644 --- a/LifeLog/LifeLog/SNSRecentTopicTableViewCell.xib +++ b/LifeLog/LifeLog/SNSRecentTopicTableViewCell.xib @@ -5,7 +5,6 @@ - @@ -15,14 +14,14 @@ - + - - + + - +