Skip to content

Commit 7360850

Browse files
author
panshiyu
committed
modify
1 parent 4a229cd commit 7360850

5 files changed

Lines changed: 10 additions & 21 deletions

File tree

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ DerivedData
1717
*.ipa
1818
*.xcuserstate
1919

20+
Coding_iOS/Views/.DS_Store
2021
# CocoaPods
2122
#
2223
# We recommend against adding the Pods directory to your .gitignore. However
@@ -25,4 +26,4 @@ DerivedData
2526
#
2627
Pods/
2728
.idea/
28-
*.xcbkptlist
29+
*.xcbkptlist

‎Coding_iOS/Controllers/Topic/CSHotTopicVC.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
257257
- (void)updateDisplayByTopic:(NSDictionary*)data {
258258

259259
_nameLabel.text = [NSString stringWithFormat:@"#%@#",data[@"name"]];
260-
_userCountLabel.text = [NSString stringWithFormat:@"%@人参与",data[@"user_count"]];
260+
_userCountLabel.text = [NSString stringWithFormat:@"%@人参与",data[@"speackers"]];
261261

262262
if (data[@"hot_tweet"]) {
263263
Tweet *tweet = [NSObject objectOfClass:@"Tweet" fromJSON:data[@"hot_tweet"]];

‎Coding_iOS/Controllers/Topic/CSTopicCreateVC.m‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -368,22 +368,8 @@ @implementation CSMySearchDisplayController
368368
- (void)setActive:(BOOL)visible animated:(BOOL)animated
369369
{
370370
[super setActive:visible animated:animated];
371-
372-
// [self.navigationController setNavigationBarHidden:NO animated:NO];
373371
[self.searchContentsController.navigationController setNavigationBarHidden: NO animated: NO];
374-
//
375-
// CGRect frame = self.searchResultsTableView.frame;
376-
// frame.origin.y = CGRectGetHeight(self.searchContentsController.navigationController.navigationBar.frame);
377-
//
378-
// frame.size.height = CGRectGetHeight(frame) - CGRectGetMinY(frame);
379-
//
380-
// self.searchResultsTableView.frame = frame;
381-
//
382-
// frame = self.searchBar.frame;
383-
// self.searchBar.frame = frame;
384-
385-
//[self.searchContentsController.view insertSubview:self.searchBar aboveSubview:self.searchResultsTableView];
386-
372+
387373
}
388374

389375

‎Coding_iOS/Controllers/Topic/CSTopicDetailVC.m‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ - (void)refreshheader {
6565
if (data) {
6666
[self.tableHeader updateWithTopic:data];
6767
}
68-
6968
}];
7069
}
7170

‎Coding_iOS/Controllers/Topic/CSTopicHeaderView.m‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,12 +121,13 @@ - (void)updateWithTopic:(NSDictionary *)data {
121121
_refTopic = data;
122122
_nameLabel.text = [NSString stringWithFormat:@"#%@#",data[@"name"]];
123123

124-
NSArray *userlist = data[@"user_list"];
125-
_userCountLabel.text = [NSString stringWithFormat:@"%@人参与/%d人关注",data[@"user_count"],[userlist count]];
124+
125+
_userCountLabel.text = [NSString stringWithFormat:@"%@人参与/%@人关注",data[@"speackers"],data[@"watchers"]];
126126

127127
NSString *imageName = _watched? @"btn_project_added":@"btn_project_add";
128128
[_rightBtn setImage:[UIImage imageNamed:imageName] forState:UIControlStateNormal];
129129

130+
NSArray *userlist = data[@"user_list"];
130131
if (!_avatalist) {
131132
_avatalist = [NSMutableArray array];
132133

@@ -140,7 +141,9 @@ - (void)updateWithTopic:(NSDictionary *)data {
140141
}
141142

142143
[self addSubview:iconView];
143-
[iconView sd_setImageWithURL:[NSURL URLWithString:user[@"avatar"]]];
144+
// [iconView sd_setImageWithURL:[user[@"avatar"] urlWithCodePath]];
145+
[iconView sd_setImageWithURL:[user[@"avatar"] urlImageWithCodePathResizeToView:iconView] placeholderImage:[UIImage imageNamed:@"icon_user_monkey"]];
146+
144147
[_avatalist addObject:iconView];
145148
}
146149
}

0 commit comments

Comments
 (0)