LiwxCoder
diff --git a/Collapse file
‎.gitignore‎
Copy file name to clipboardExpand all lines: .gitignore
+2-1Lines changed: 2 additions & 1 deletion b/Collapse file
‎.gitignore‎
Copy file name to clipboardExpand all lines: .gitignore
+2-1Lines changed: 2 additions & 1 deletion
diff --git a/Collapse file
‎Coding_iOS/Controllers/Topic/CSHotTopicVC.m‎
Copy file name to clipboardExpand all lines: Coding_iOS/Controllers/Topic/CSHotTopicVC.m
+1-1Lines changed: 1 addition & 1 deletion b/Collapse file
‎Coding_iOS/Controllers/Topic/CSHotTopicVC.m‎
Copy file name to clipboardExpand all lines: Coding_iOS/Controllers/Topic/CSHotTopicVC.m
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/Collapse file
‎Coding_iOS/Controllers/Topic/CSTopicCreateVC.m‎
Copy file name to clipboardExpand all lines: Coding_iOS/Controllers/Topic/CSTopicCreateVC.m
+1-15Lines changed: 1 addition & 15 deletions b/Collapse file
‎Coding_iOS/Controllers/Topic/CSTopicCreateVC.m‎
Copy file name to clipboardExpand all lines: Coding_iOS/Controllers/Topic/CSTopicCreateVC.m
+1-15Lines changed: 1 addition & 15 deletions
diff --git a/Collapse file
‎Coding_iOS/Controllers/Topic/CSTopicDetailVC.m‎
Copy file name to clipboardExpand all lines: Coding_iOS/Controllers/Topic/CSTopicDetailVC.m
-1Lines changed: 0 additions & 1 deletion b/Collapse file
‎Coding_iOS/Controllers/Topic/CSTopicDetailVC.m‎
Copy file name to clipboardExpand all lines: Coding_iOS/Controllers/Topic/CSTopicDetailVC.m
-1Lines changed: 0 additions & 1 deletion
diff --git a/Collapse file
‎Coding_iOS/Controllers/Topic/CSTopicHeaderView.m‎
Copy file name to clipboardExpand all lines: Coding_iOS/Controllers/Topic/CSTopicHeaderView.m
+6-3Lines changed: 6 additions & 3 deletions b/Collapse file
‎Coding_iOS/Controllers/Topic/CSTopicHeaderView.m‎
Copy file name to clipboardExpand all lines: Coding_iOS/Controllers/Topic/CSTopicHeaderView.m
+6-3Lines changed: 6 additions & 3 deletions
@@ -17,6 +17,7 @@ DerivedData
 *.ipa
 *.xcuserstate
 
+Coding_iOS/Views/.DS_Store
 # CocoaPods
 #
 # We recommend against adding the Pods directory to your .gitignore. However
@@ -25,4 +26,4 @@ DerivedData
 #
 Pods/
 .idea/
-*.xcbkptlist
+*.xcbkptlist
@@ -257,7 +257,7 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
 - (void)updateDisplayByTopic:(NSDictionary*)data {
 
     _nameLabel.text = [NSString stringWithFormat:@"#%@#",data[@"name"]];
-    _userCountLabel.text = [NSString stringWithFormat:@"%@人参与",data[@"user_count"]];
+    _userCountLabel.text = [NSString stringWithFormat:@"%@人参与",data[@"speackers"]];
 
     if (data[@"hot_tweet"]) {
         Tweet *tweet = [NSObject objectOfClass:@"Tweet" fromJSON:data[@"hot_tweet"]];
 
@@ -368,22 +368,8 @@ @implementation CSMySearchDisplayController
 - (void)setActive:(BOOL)visible animated:(BOOL)animated
 {
     [super setActive:visible animated:animated];
-    
-//    [self.navigationController setNavigationBarHidden:NO animated:NO];
     [self.searchContentsController.navigationController setNavigationBarHidden: NO animated: NO];
-//
-//    CGRect frame = self.searchResultsTableView.frame;
-//    frame.origin.y = CGRectGetHeight(self.searchContentsController.navigationController.navigationBar.frame);
-//    
-//    frame.size.height = CGRectGetHeight(frame) - CGRectGetMinY(frame);
-//    
-//    self.searchResultsTableView.frame = frame;
-//    
-//    frame = self.searchBar.frame;
-//    self.searchBar.frame = frame;
-    
-    //[self.searchContentsController.view insertSubview:self.searchBar aboveSubview:self.searchResultsTableView];
-    
+
 }
 
 
 
@@ -65,7 +65,6 @@ - (void)refreshheader {
         if (data) {
             [self.tableHeader updateWithTopic:data];
         }
-        
     }];
 }
 
 
@@ -121,12 +121,13 @@ - (void)updateWithTopic:(NSDictionary *)data {
     _refTopic = data;
     _nameLabel.text = [NSString stringWithFormat:@"#%@#",data[@"name"]];
 
-    NSArray *userlist = data[@"user_list"];
-    _userCountLabel.text = [NSString stringWithFormat:@"%@人参与/%d人关注",data[@"user_count"],[userlist count]];
+    
+    _userCountLabel.text = [NSString stringWithFormat:@"%@人参与/%@人关注",data[@"speackers"],data[@"watchers"]];
 
     NSString *imageName = _watched? @"btn_project_added":@"btn_project_add";
     [_rightBtn setImage:[UIImage imageNamed:imageName] forState:UIControlStateNormal];
 
+    NSArray *userlist = data[@"user_list"];
     if (!_avatalist) {
         _avatalist = [NSMutableArray array];
 
@@ -140,7 +141,9 @@ - (void)updateWithTopic:(NSDictionary *)data {
             }
 
             [self addSubview:iconView];
-            [iconView sd_setImageWithURL:[NSURL URLWithString:user[@"avatar"]]];
+//            [iconView sd_setImageWithURL:[user[@"avatar"] urlWithCodePath]];
+            [iconView sd_setImageWithURL:[user[@"avatar"] urlImageWithCodePathResizeToView:iconView] placeholderImage:[UIImage imageNamed:@"icon_user_monkey"]];
+            
             [_avatalist addObject:iconView];
         }
     }
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ DerivedData`
`17`	`17`	`*.ipa`
`18`	`18`	`*.xcuserstate`
`19`	`19`
	`20`	`+Coding_iOS/Views/.DS_Store`
`20`	`21`	`# CocoaPods`
`21`	`22`	`#`
`22`	`23`	`# We recommend against adding the Pods directory to your .gitignore. However`
`@@ -25,4 +26,4 @@ DerivedData`
`25`	`26`	`#`
`26`	`27`	`Pods/`
`27`	`28`	`.idea/`
`28`		`-*.xcbkptlist`
	`29`	`+*.xcbkptlist`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,6 @@ - (void)refreshheader {`
`65`	`65`	`if (data) {`
`66`	`66`	`[self.tableHeader updateWithTopic:data];`
`67`	`67`	`}`
`68`		`-`
`69`	`68`	`}];`
`70`	`69`	`}`
`71`	`70`