iOS Team / CNLiveCommuntyModule · Commits

Commit b47dfc768b56abd3b909acced4aaa9da78efbeb6

Authored by liushiyu
1 parent 4e7c7691

0.1.8

Inline Side-by-side
Showing 5 changed files with 18 additions and 12 deletions
CNLiveCommuntyModule.podspec
  View file @b47dfc7
@@ -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 = 'CNLiveCommuntyModule' 10 s.name = 'CNLiveCommuntyModule'
11 - s.version = '0.1.7' 11 + s.version = '0.1.8'
12 s.summary = 'A short description of CNLiveCommuntyModule.' 12 s.summary = 'A short description of CNLiveCommuntyModule.'
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.
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntInformViewController.m
  View file @b47dfc7
@@ -325,8 +325,14 @@ @@ -325,8 +325,14 @@
325 CNLiveCommuntSubInputTableView * inpView = [CNLiveCommuntSubInputTableView setTableView:tableView SubDict:self.dataSource[indexPath.row] indexs:indexPath.row UserInfo:@{} ReloadBlock:^(NSDictionary * _Nonnull paramDict, NSString * _Nonnull contentString) { 325 CNLiveCommuntSubInputTableView * inpView = [CNLiveCommuntSubInputTableView setTableView:tableView SubDict:self.dataSource[indexPath.row] indexs:indexPath.row UserInfo:@{} ReloadBlock:^(NSDictionary * _Nonnull paramDict, NSString * _Nonnull contentString) {
326 NSMutableDictionary * tempDict = [paramDict mutableCopy]; 326 NSMutableDictionary * tempDict = [paramDict mutableCopy];
327 [tempDict setObject:contentString forKey:@"content"]; 327 [tempDict setObject:contentString forKey:@"content"];
328 - NSInteger index = [weakSelf.dataSource indexOfObject:paramDict];  
329 - [weakSelf.dataSource replaceObjectAtIndex:index withObject:tempDict]; 328 +
  329 + if ([[paramDict stringValueForKey:@"name" default:@""] isEqualToString:@"联系地址"] || [[paramDict stringValueForKey:@"name" default:@""] isEqualToString:@"联系人"] || [[paramDict stringValueForKey:@"name" default:@""] isEqualToString:@"联系电话"] || [[paramDict stringValueForKey:@"name" default:@""] isEqualToString:@"问题描述"]) {
  330 + NSInteger index = 0;
  331 + if ([[paramDict stringValueForKey:@"name" default:@""] isEqualToString:@"联系地址"]) index = 1;
  332 + if ([[paramDict stringValueForKey:@"name" default:@""] isEqualToString:@"联系电话"]) index = 2;
  333 + if ([[paramDict stringValueForKey:@"name" default:@""] isEqualToString:@"问题描述"]) index = 5;
  334 + [weakSelf.dataSource replaceObjectAtIndex:index withObject:tempDict];
  335 + }
330 }]; 336 }];
331 inpView.delegate = self; 337 inpView.delegate = self;
332 inpView.imageArray = self.imageArray; 338 inpView.imageArray = self.imageArray;
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntyOrderViewController.m
  View file @b47dfc7
@@ -304,7 +304,7 @@ @@ -304,7 +304,7 @@
304 if (self.showType == CNLiveCommuntyOrderShowTypeListCompletOrder) return 3; 304 if (self.showType == CNLiveCommuntyOrderShowTypeListCompletOrder) return 3;
305 if (self.showType == CNLiveCommuntyOrderShowTypeListFailureOrder) return 2; 305 if (self.showType == CNLiveCommuntyOrderShowTypeListFailureOrder) return 2;
306 if (self.showType == CNLiveCommuntyOrderShowTypeChatYetOrder) return 1; 306 if (self.showType == CNLiveCommuntyOrderShowTypeChatYetOrder) return 1;
307 - if (self.showType == CNLiveCommuntyOrderShowTypeChatReadyOrder) return [self.createMdoel.repairId isNotBlank] && ![self.createMdoel.repairId isEqualToString:[CNUserInfoManager manager].userInfoModel.uid]?1:2; 307 + if (self.showType == CNLiveCommuntyOrderShowTypeChatReadyOrder) return [self.createMdoel.repairId isNotBlank] && [self.createMdoel.repairId isEqualToString:[CNUserInfoManager manager].userInfoModel.uid]?2:1;
308 if (self.showType == CNLiveCommuntyOrderShowTypeChatCompletOrder) return 1; 308 if (self.showType == CNLiveCommuntyOrderShowTypeChatCompletOrder) return 1;
309 } 309 }
310 return 0; 310 return 0;
CNLiveCommuntyModule/Classes/ViewModel/CNLiveCommuntViewModel.m
  View file @b47dfc7
@@ -290,7 +290,7 @@ @@ -290,7 +290,7 @@
290 CNLiveCommuntyActivityMaintainsCreateModel * createModel = [CNLiveCommuntyActivityMaintainsCreateModel mj_objectWithKeyValues:responseObject]; 290 CNLiveCommuntyActivityMaintainsCreateModel * createModel = [CNLiveCommuntyActivityMaintainsCreateModel mj_objectWithKeyValues:responseObject];
291 createModel.imgs = [createModel.img componentsSeparatedByString:@","].mutableCopy; 291 createModel.imgs = [createModel.img componentsSeparatedByString:@","].mutableCopy;
292 [createModel.imgs removeObject:@""]; 292 [createModel.imgs removeObject:@""];
293 - if (createModel.showType == 1 && [createModel.repairId isNotBlank] && ![createModel.userId isEqualToString:createModel.repairId]) createModel.showType = 0; 293 + if (createModel.showType == 1 && [createModel.repairId isNotBlank] && ![[CNUserInfoManager manager].userInfoModel.uid isEqualToString:createModel.repairId]) createModel.showType = 0;
294 if (isChat && createModel.showType == 0) createModel.showType = 4; 294 if (isChat && createModel.showType == 0) createModel.showType = 4;
295 if (isChat && createModel.showType == 1) createModel.showType = 5; 295 if (isChat && createModel.showType == 1) createModel.showType = 5;
296 if (isChat && createModel.showType == 3) createModel.showType = 6; 296 if (isChat && createModel.showType == 3) createModel.showType = 6;
Example/CNLiveCommuntyModule/CNLIVEViewController.m
  View file @b47dfc7
@@ -144,15 +144,15 @@ @@ -144,15 +144,15 @@
144 [self.navigationController pushViewController:signUpView animated:YES]; 144 [self.navigationController pushViewController:signUpView animated:YES];
145 } 145 }
146 if (indexPath.row == 6) { 146 if (indexPath.row == 6) {
147 - NSString * cmnt_id = [[NSUserDefaults standardUserDefaults] objectForKey:@"cmnt_id"];  
148 - if ([cmnt_id isNotBlank]) {  
149 - CNLiveCommuntyOrderViewController * orderVC = [[CNLiveCommuntyOrderViewController alloc] initWithMaintenId:cmnt_id];  
150 - [self.navigationController pushViewController:orderVC animated:YES];  
151 - }else{ 147 +// NSString * cmnt_id = [[NSUserDefaults standardUserDefaults] objectForKey:@"cmnt_id"];
  148 +// if ([cmnt_id isNotBlank]) {
  149 +// CNLiveCommuntyOrderViewController * orderVC = [[CNLiveCommuntyOrderViewController alloc] initWithMaintenId:cmnt_id];
  150 +// [self.navigationController pushViewController:orderVC animated:YES];
  151 +// }else{
152 152
153 - CNLiveCommuntyOrderViewController * orderVC = [[CNLiveCommuntyOrderViewController alloc] initWithMaintenId:@"cmnt2022032232427862564"]; 153 + CNLiveCommuntyOrderViewController * orderVC = [[CNLiveCommuntyOrderViewController alloc] initWithMaintenId:@"cm2022032420637"];
154 [self.navigationController pushViewController:orderVC animated:YES]; 154 [self.navigationController pushViewController:orderVC animated:YES];
155 - } 155 +// }
156 156
157 } 157 }
158 if (indexPath.row == 7) { 158 if (indexPath.row == 7) {