Commit eb7a87cd14a21deca2dc89e17a0efab5374d4b55

Authored by yanglingyu
1 parent 8d03d2c8

0.1.7

CNLiveCMineModule.podspec
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 8
9 Pod::Spec.new do |s| 9 Pod::Spec.new do |s|
10 s.name = 'CNLiveCMineModule' 10 s.name = 'CNLiveCMineModule'
11 - s.version = '0.1.5' 11 + s.version = '0.1.6'
12 s.summary = '网家家C端个人中心' 12 s.summary = '网家家C端个人中心'
13 13
14 # This description is used to generate tags and improve search results. 14 # This description is used to generate tags and improve search results.
CNLiveCMineModule/Classes/CNPrivacy/Controller/CNNotSeeViewController.m
@@ -247,12 +247,12 @@ static const NSInteger SectionHeight = 50; @@ -247,12 +247,12 @@ static const NSInteger SectionHeight = 50;
247 #pragma mark - CNSelectContactDelegate 247 #pragma mark - CNSelectContactDelegate
248 //选择联系人完成代理,返回 248 //选择联系人完成代理,返回
249 - (void)selectContactCompleted:(NSMutableArray *)selectedFriends{ 249 - (void)selectContactCompleted:(NSMutableArray *)selectedFriends{
250 - for (id user in selectedFriends) {  
251 - NSLog(@"nickName = %@",[user objectForKey:@"nickName"]); 250 + for (IMAUser * user in selectedFriends) {
  251 + NSLog(@"nickName = %@",user.nickName);
252 CNNotSeeModel *model = [[CNNotSeeModel alloc]init]; 252 CNNotSeeModel *model = [[CNNotSeeModel alloc]init];
253 - model.userId = [user objectForKey:@"userId"];  
254 - model.nickName = [user objectForKey:@"nickName"];  
255 - model.image = [user objectForKey:@"icon"]; 253 + model.userId = user.userId;
  254 + model.nickName = user.nickName;
  255 + model.image = user.icon;
256 model.isEdit = _isEdit?@"1":@"0"; 256 model.isEdit = _isEdit?@"1":@"0";
257 model.type = CNNotSeeModelTypeDefault; 257 model.type = CNNotSeeModelTypeDefault;
258 //大于2说明存在+-按钮 258 //大于2说明存在+-按钮
CNLiveCMineModule/Classes/CNPrivacy/Controller/CNSelectContactViewController.m
@@ -122,7 +122,7 @@ @@ -122,7 +122,7 @@
122 if (self.searchResultArr.count == 0) { 122 if (self.searchResultArr.count == 0) {
123 return cell; 123 return cell;
124 } 124 }
125 - id user = (id)self.searchResultArr[indexPath.row]; 125 + IMAUser * user = (id)self.searchResultArr[indexPath.row];
126 if (_existedFriends.count > 0) { 126 if (_existedFriends.count > 0) {
127 // 如果在_existedFriends中,不可点击 127 // 如果在_existedFriends中,不可点击
128 BOOL cont = [_existedFriends containsObject:user]; 128 BOOL cont = [_existedFriends containsObject:user];
@@ -133,7 +133,7 @@ @@ -133,7 +133,7 @@
133 } 133 }
134 else { 134 else {
135 id arr = self.rowArr[indexPath.section]; 135 id arr = self.rowArr[indexPath.section];
136 - id user = (id)[arr objectAtIndex:indexPath.row]; 136 + IMAUser * user = (id)[arr objectAtIndex:indexPath.row];
137 if (_existedFriends.count > 0) { 137 if (_existedFriends.count > 0) {
138 // 如果在_existedFriends中,不可点击 138 // 如果在_existedFriends中,不可点击
139 BOOL cont = [_existedFriends containsObject:user]; 139 BOOL cont = [_existedFriends containsObject:user];
@@ -310,11 +310,11 @@ @@ -310,11 +310,11 @@
310 310
311 // 将好友选中状态恢复 311 // 将好友选中状态恢复
312 - (void)recoverUnchecked { 312 - (void)recoverUnchecked {
313 - for (id user in _existedFriends) {  
314 - [user setBool:NO forKey:@"isSelected"]; 313 + for (IMAUser * user in _existedFriends) {
  314 + user.isSelected = NO;
315 } 315 }
316 - for (id user in _selectedFriends) {  
317 - [user setBool:NO forKey:@"isSelected"]; 316 + for (IMAUser * user in _selectedFriends) {
  317 + user.isSelected = NO;
318 } 318 }
319 319
320 } 320 }