From 5cc9773c6d0a86e66862d362f0ce9c3874b0b04c Mon Sep 17 00:00:00 2001 From: nvtu Date: Mon, 21 Aug 2017 11:54:50 +0700 Subject: [PATCH] Move fill data code from parent table view to child tableview cell --- LifeLog/LifeLog/GroupDetailViewController.m | 26 ++------------------- LifeLog/LifeLog/MyGroupViewController.m | 27 ++-------------------- LifeLog/LifeLog/SNSRecentTopicTableViewCell.h | 3 +++ LifeLog/LifeLog/SNSRecentTopicTableViewCell.m | 33 +++++++++++++++++++++++++++ LifeLog/LifeLog/SNSViewController.m | 15 +----------- 5 files changed, 41 insertions(+), 63 deletions(-) diff --git a/LifeLog/LifeLog/GroupDetailViewController.m b/LifeLog/LifeLog/GroupDetailViewController.m index 50529a3..edf64e1 100644 --- a/LifeLog/LifeLog/GroupDetailViewController.m +++ b/LifeLog/LifeLog/GroupDetailViewController.m @@ -151,33 +151,11 @@ SNSRecentTopicTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:@"RecentTopicCell"]; if(isMemberList) { MemberObject *object = [_curDataList objectAtIndex:indexPath.row]; - if(object.avatar && ![object.avatar isKindOfClass:[NSNull class]]) { - [cell.imgAvatar sd_setImageWithURL:[NSURL URLWithString:[Utilities getImageLink:object.avatar]]]; - } - else { - [cell.imgAvatar setImage:[UIImage imageNamed:@"avatar_default"]]; - } - cell.lblUsername.text = @""; - cell.lblDateTime.text = @""; - cell.lblDes.text = object.userName; - cell.lblMode.text = @""; - cell.lblDistance.text = @""; - cell.lblDuration.text = @""; + [cell setMemberData:object]; } else { TweetObject *object = [_curDataList objectAtIndex:indexPath.row]; - if(object.avatar && ![object.avatar isKindOfClass:[NSNull class]]) { - [cell.imgAvatar sd_setImageWithURL:[NSURL URLWithString:[Utilities getImageLink:object.avatar]]]; - } - else { - [cell.imgAvatar setImage:[UIImage imageNamed:@"avatar_default"]]; - } - cell.lblDateTime.text = [Utilities stringFromDate:object.createDate withFormat:@"YYYY/MM/dd hh:mm" locale:@""]; - cell.lblUsername.text = object.userName; - cell.lblDes.text = object.content; - cell.lblMode.text = object.mode; - cell.lblDistance.text = [NSString stringWithFormat:@"%.0f m", object.distance]; - cell.lblDuration.text = object.time; + [cell setTweetsData:object]; } return cell; diff --git a/LifeLog/LifeLog/MyGroupViewController.m b/LifeLog/LifeLog/MyGroupViewController.m index a4538ce..4844091 100644 --- a/LifeLog/LifeLog/MyGroupViewController.m +++ b/LifeLog/LifeLog/MyGroupViewController.m @@ -7,7 +7,6 @@ // #import "MyGroupViewController.h" -#import #import "Utilities.h" #import "ServerAPI.h" @@ -85,33 +84,11 @@ SNSRecentTopicTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:@"RecentTopicCell"]; if(isMemberList) { MemberObject *object = [_curDataList objectAtIndex:indexPath.row]; - if(object.avatar && ![object.avatar isKindOfClass:[NSNull class]]) { - [cell.imgAvatar sd_setImageWithURL:[NSURL URLWithString:[Utilities getImageLink:object.avatar]]]; - } - else { - [cell.imgAvatar setImage:[UIImage imageNamed:@"avatar_default"]]; - } - cell.lblUsername.text = @""; - cell.lblDateTime.text = @""; - cell.lblDes.text = object.userName; - cell.lblMode.text = @""; - cell.lblDistance.text = @""; - cell.lblDuration.text = @""; + [cell setMemberData:object]; } else { TweetObject *object = [_curDataList objectAtIndex:indexPath.row]; - if(object.avatar && ![object.avatar isKindOfClass:[NSNull class]]) { - [cell.imgAvatar sd_setImageWithURL:[NSURL URLWithString:[Utilities getImageLink:object.avatar]]]; - } - else { - [cell.imgAvatar setImage:[UIImage imageNamed:@"avatar_default"]]; - } - cell.lblDateTime.text = [Utilities stringFromDate:object.createDate withFormat:@"YYYY/MM/dd hh:mm" locale:@""]; - cell.lblUsername.text = object.userName; - cell.lblDes.text = object.content; - cell.lblMode.text = object.mode; - cell.lblDistance.text = [NSString stringWithFormat:@"%.0f m", object.distance]; - cell.lblDuration.text = object.time; + [cell setTweetsData:object]; } return cell; } diff --git a/LifeLog/LifeLog/SNSRecentTopicTableViewCell.h b/LifeLog/LifeLog/SNSRecentTopicTableViewCell.h index b007a56..752ad17 100644 --- a/LifeLog/LifeLog/SNSRecentTopicTableViewCell.h +++ b/LifeLog/LifeLog/SNSRecentTopicTableViewCell.h @@ -7,6 +7,7 @@ // #import +#import "Entities.h" @interface SNSRecentTopicTableViewCell : UITableViewCell @@ -18,4 +19,6 @@ @property (weak, nonatomic) IBOutlet UILabel *lblDistance; @property (weak, nonatomic) IBOutlet UILabel *lblDuration; +-(void) setMemberData : (MemberObject *) object; +-(void) setTweetsData : (TweetObject *) object; @end diff --git a/LifeLog/LifeLog/SNSRecentTopicTableViewCell.m b/LifeLog/LifeLog/SNSRecentTopicTableViewCell.m index 27f68c1..9b2625d 100644 --- a/LifeLog/LifeLog/SNSRecentTopicTableViewCell.m +++ b/LifeLog/LifeLog/SNSRecentTopicTableViewCell.m @@ -7,6 +7,9 @@ // #import "SNSRecentTopicTableViewCell.h" +#import + +#import "Utilities.h" @implementation SNSRecentTopicTableViewCell @@ -21,4 +24,34 @@ // Configure the view for the selected state } +-(void) setMemberData : (MemberObject *) 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.lblUsername.text = @""; + self.lblDateTime.text = @""; + self.lblDes.text = object.userName; + self.lblMode.text = @""; + self.lblDistance.text = @""; + self.lblDuration.text = @""; +} + +-(void) setTweetsData : (TweetObject *) 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.lblDateTime.text = [Utilities stringFromDate:object.createDate withFormat:@"YYYY/MM/dd hh:mm" locale:@""]; + self.lblUsername.text = object.userName; + self.lblDes.text = object.content; + self.lblMode.text = object.mode; + self.lblDistance.text = [NSString stringWithFormat:@"%.0f m", object.distance]; + self.lblDuration.text = object.time; +} + @end diff --git a/LifeLog/LifeLog/SNSViewController.m b/LifeLog/LifeLog/SNSViewController.m index 0c14764..ec6925d 100644 --- a/LifeLog/LifeLog/SNSViewController.m +++ b/LifeLog/LifeLog/SNSViewController.m @@ -8,8 +8,6 @@ #import "SNSViewController.h" -#import - #import "ServerAPI.h" #import "Utilities.h" @@ -55,18 +53,7 @@ - (UITableViewCell *) tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { SNSRecentTopicTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:@"RecentTopicCell"]; TweetObject *object = [_curDataList objectAtIndex:indexPath.row]; - if(object.avatar && ![object.avatar isKindOfClass:[NSNull class]]) { - [cell.imgAvatar sd_setImageWithURL:[NSURL URLWithString:[Utilities getImageLink:object.avatar]]]; - } - else { - [cell.imgAvatar setImage:[UIImage imageNamed:@"avatar_default"]]; - } - cell.lblDateTime.text = [Utilities stringFromDate:object.createDate withFormat:@"YYYY/MM/dd hh:mm" locale:@""]; - cell.lblUsername.text = object.userName; - cell.lblDes.text = object.content; - cell.lblMode.text = object.mode; - cell.lblDistance.text = [NSString stringWithFormat:@"%.0f m", object.distance]; - cell.lblDuration.text = object.time; + [cell setTweetsData:object]; return cell; } -- 1.8.5.3