0.1.9

liushiyu
1 parent b47dfc76
Showing 5 changed files with 65 additions and 39 deletions
CNLiveCommuntyModule.podspec
CNLiveCommuntyModule/Classes/View/CNLiveCommuntSubView.m
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntInformViewController.m
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntyOrderViewController.m
Example/CNLiveCommuntyModule/CNLIVEViewController.m
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLiveCommuntyModule'
-  s.version          = '0.1.8'
+  s.version          = '0.1.9'
   s.summary          = 'A short description of CNLiveCommuntyModule.'
 # This description is used to generate tags and improve search results.
@@ -525,10 +525,10 @@
     [_statueButton setTitle:repairModel.statusString forState:UIControlStateNormal];
     [_statueButton setTitleColor:![repairModel.status isEqualToString:@"3"]?UIColorHex(#FD862E):UIColorHex(#797979) forState:UIControlStateNormal];
-    for (int i = 0; i < self.repairModel.imgs.count; i++) {
-        NSString * imageUrl = self.repairModel.imgs[i];
+    for (int i = 0; i < 3; i++) {
+        NSString * imageUrl = self.repairModel.imgs.count > i ? self.repairModel.imgs[i] : @"";
         UIImageView * imageView = self.tempArray[i];
-        imageView.hidden = NO;
+        imageView.hidden = [imageUrl isEqualToString:@""] ? YES : NO;
         [imageView sd_setImageWithURL:[NSURL URLWithString:imageUrl] placeholderImage:[UIImage imageWithColor:UIColorHex(#f9f9f9)]];
     }
 }
@@ -215,19 +215,38 @@
             [paramDict setObject:tempContent forKey:name];
         }
     }
-    if ([[paramDict allValues] containsObject:@""]) {
-        NSInteger index = [[paramDict allValues] indexOfObject:@""];
-        NSString * key = [[paramDict allKeys] objectAtIndex:index];
-        if (![key isEqualToString:@"remark"]) {
-            if ([key isEqualToString:@"userName"]) [QMUITips showWithText:@"联系人不能为空"];
-            if ([key isEqualToString:@"address"]) [QMUITips showWithText:@"联系地址不能为空"];
-            if ([key isEqualToString:@"phone"]) [QMUITips showWithText:@"联系电话不能为空"];
-            if ([key isEqualToString:@"repairProject"]) [QMUITips showWithText:@"报修项目不能为空"];
-            if ([key isEqualToString:@"beginTime"]) [QMUITips showWithText:@"请选择上门时间"];
-            if ([key isEqualToString:@"endTime"]) [QMUITips showWithText:@"请选择上门时间"];
-            return;
-        }
+
+    NSString * userName = [paramDict stringValueForKey:@"userName" default:@""];
+    if (![userName isNotBlank]) {
+        [QMUITips showWithText:@"联系人不能为空"];
+        return;
+    }
+    NSString * address = [paramDict stringValueForKey:@"address" default:@""];
+    if (![address isNotBlank]) {
+        [QMUITips showWithText:@"联系地址不能为空"];
+        return;
+    }
+    NSString * phone = [paramDict stringValueForKey:@"phone" default:@""];
+    if (![phone isNotBlank]) {
+        [QMUITips showWithText:@"联系电话不能为空"];
+        return;
     }
+    NSString * repairProject = [paramDict stringValueForKey:@"repairProject" default:@""];
+    if (![repairProject isNotBlank]) {
+        [QMUITips showWithText:@"报修项目不能为空"];
+        return;
+    }
+    NSString * beginTime = [paramDict stringValueForKey:@"beginTime" default:@""];
+    if (![beginTime isNotBlank]) {
+        [QMUITips showWithText:@"请选择上门时间"];
+        return;
+    }
+    NSString * endTime = [paramDict stringValueForKey:@"endTime" default:@""];
+    if (![endTime isNotBlank]) {
+        [QMUITips showWithText:@"请选择上门时间"];
+        return;
+    }
+    
     NSArray * array = @[[paramDict stringValueForKey:@"userName" default:@""],[paramDict stringValueForKey:@"address" default:@""],[paramDict stringValueForKey:@"phone" default:@""]];
     [CNLiveRespCacheManager cachePathWithObject:array FileName:[NSString stringWithFormat:@"CNLiveCommunityRepirContentKey_%@",[CNUserInfoManager manager].userInfoModel.uid]];
     __weak typeof(self) weakSelf = self;
@@ -516,14 +535,14 @@
 }
 - (void)pushTZImagePickerController:(NSInteger)index
 {
-    CNImagePickerController *imagePickerVc = [[CNImagePickerController alloc] initWithMaxImagesCount:3 columnNumber:3 delegate:self pushPhotoPickerVc:YES];
+    TZImagePickerController *imagePickerVc = [[TZImagePickerController alloc] initWithMaxImagesCount:3 columnNumber:3 delegate:self pushPhotoPickerVc:YES];
     imagePickerVc.modalPresentationStyle = UIModalPresentationFullScreen;
-    [imagePickerVc configTZImagePicker];//配置
+//    [imagePickerVc configTZImagePicker];//配置
     imagePickerVc.isSelectOriginalPhoto = NO;//是否选择原图
     // 1.设置目前已经选中的图片数组
     imagePickerVc.selectedAssets = self.assetArray;
-    imagePickerVc.maxEditVideoTime = 60;//编辑长度
-    imagePickerVc.maxVideoDuration = 120;//编辑视频最大长度
+//    imagePickerVc.maxEditVideoTime = 0;//编辑长度
+//    imagePickerVc.maxVideoDuration = 0;//编辑视频最大长度
     // 3. Set allow picking video & photo & originalPhoto or not
     // 3. 设置是否可以选择视频/图片/原图
     imagePickerVc.allowPickingMultipleVideo = NO;
@@ -53,13 +53,18 @@
     [super viewDidAppear:animated];
     if (self.showType == CNLiveCommuntyOrderShowTypeChatYetOrder
         || self.showType == CNLiveCommuntyOrderShowTypeChatReadyOrder
-        || self.showType == CNLiveCommuntyOrderShowTypeChatCompletOrder) {
+        || self.showType == CNLiveCommuntyOrderShowTypeChatCompletOrder
+        || self.createMdoel) {
         NSMutableArray * tempArray = [[NSMutableArray alloc] initWithArray:self.navigationController.viewControllers];
         for (UIViewController * vc in self.navigationController.viewControllers) {
             if ([vc isKindOfClass:CNLiveCommuntInformViewController.class]) {
                 [tempArray removeObject:vc];
                 break;
             }
+            if ([vc isKindOfClass:CNLiveCommuntInformViewController.class]) {
+                [tempArray removeObject:vc];
+                break;
+            }
         }
         self.navigationController.viewControllers = tempArray;
     }
@@ -238,6 +243,8 @@
     self.tableView.dataSource = self;
     self.tableView.emptyDataSetSource = self;
     self.tableView.emptyDataSetDelegate = self;
+    self.tableView.shouldIgnoreScrollingAdjustment = YES;
+    self.tableView.shouldRestoreScrollViewContentOffset = YES;
     self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
     self.tableView.tableFooterView = [[UIView alloc] init];
     self.tableView.backgroundColor = UIColorHex(#f9f9f9);
@@ -300,7 +307,7 @@
 {
     if (self.createMdoel) {
         if (self.showType == CNLiveCommuntyOrderShowTypeListYetOrder) return 2;
-        if (self.showType == CNLiveCommuntyOrderShowTypeListReadyOrder) return 2;
+        if (self.showType == CNLiveCommuntyOrderShowTypeListReadyOrder) return 3;
         if (self.showType == CNLiveCommuntyOrderShowTypeListCompletOrder) return 3;
         if (self.showType == CNLiveCommuntyOrderShowTypeListFailureOrder) return 2;
         if (self.showType == CNLiveCommuntyOrderShowTypeChatYetOrder) return 1;
@@ -317,7 +324,6 @@
             if (section == 0) return self.createMdoel.infoArray.count;
         }
         if (self.showType == CNLiveCommuntyOrderShowTypeListYetOrder
-            || self.showType == CNLiveCommuntyOrderShowTypeListReadyOrder
             || self.showType == CNLiveCommuntyOrderShowTypeListFailureOrder) {
             if (section == 0) return self.createMdoel.infoArray.count;
             if (section == 1) return self.createMdoel.processArray.count;
@@ -326,7 +332,8 @@
             if (section == 0) return self.createMdoel.infoArray.count;
             if (section == 1) return 1;
         }
-        if (self.showType == CNLiveCommuntyOrderShowTypeListCompletOrder) {
+        if (self.showType == CNLiveCommuntyOrderShowTypeListCompletOrder
+            || self.showType == CNLiveCommuntyOrderShowTypeListReadyOrder) {
             if (section == 0) return self.createMdoel.infoArray.count;
             if (section == 1) return 1;
             if (section == 2) return self.createMdoel.processArray.count;
@@ -341,7 +348,6 @@
         return [CNLiveCommuntSignUpOrderViewCell setTableView:tableView Dict:self.createMdoel.infoArray[indexPath.row]];
     }
     if (self.showType == CNLiveCommuntyOrderShowTypeListYetOrder
-        || self.showType == CNLiveCommuntyOrderShowTypeListReadyOrder
         || self.showType == CNLiveCommuntyOrderShowTypeListFailureOrder) {
         if (indexPath.section == 0) return [CNLiveCommuntSignUpOrderViewCell setTableView:tableView Dict:self.createMdoel.infoArray[indexPath.row]];
         if (indexPath.section == 1) return [CNLiveCommuntSignUpDetailViewCell setTableView:tableView isTop:indexPath.row == 0 isBottom:indexPath.row == (self.createMdoel.processArray.count - 1) Dict:self.createMdoel.processArray[indexPath.row]];
@@ -353,7 +359,8 @@
             [weakSelf reloadDataWithDataSource];
         }];
     }
-    if (self.showType == CNLiveCommuntyOrderShowTypeListCompletOrder) {
+    if (self.showType == CNLiveCommuntyOrderShowTypeListCompletOrder
+        || self.showType == CNLiveCommuntyOrderShowTypeListReadyOrder) {
         if (indexPath.section == 0) return [CNLiveCommuntSignUpOrderViewCell setTableView:tableView Dict:self.createMdoel.infoArray[indexPath.row]];
         if (indexPath.section == 1) return [CNLiveCommuntSignUpContactViewCell setTableView:tableView CreateModel:self.createMdoel];
         if (indexPath.section == 2) return [CNLiveCommuntSignUpDetailViewCell setTableView:tableView isTop:indexPath.row == 0 isBottom:indexPath.row == (self.createMdoel.processArray.count - 1) Dict:self.createMdoel.processArray[indexPath.row]];
@@ -369,14 +376,13 @@
         return height > 30 ? height : 30;
     }
     if (self.showType == CNLiveCommuntyOrderShowTypeListYetOrder
-        || self.showType == CNLiveCommuntyOrderShowTypeListReadyOrder
         || self.showType == CNLiveCommuntyOrderShowTypeListFailureOrder) {
         if (indexPath.section == 0) {
             NSDictionary * subDict = self.createMdoel.infoArray[indexPath.row];
             CGFloat height = [[subDict stringValueForKey:@"value" default:@""] calculateSizeWithUIWidth:kScreenWidth - 125 font:[UIFont systemFontOfSize:15.0]].height;
             return height > 30 ? height : 30;
         }
-        if (indexPath.section == 1) return 70;
+        if (indexPath.section == 2) return 70;
     }
     if (self.showType == CNLiveCommuntyOrderShowTypeChatReadyOrder) {
         if (indexPath.section == 0) {
@@ -386,7 +392,8 @@
         }
         if (indexPath.section == 1) return 130;
     }
-    if (self.showType == CNLiveCommuntyOrderShowTypeListCompletOrder) {
+    if (self.showType == CNLiveCommuntyOrderShowTypeListCompletOrder
+        || self.showType == CNLiveCommuntyOrderShowTypeListReadyOrder) {
         if (indexPath.section == 0) {
             NSDictionary * subDict = self.createMdoel.infoArray[indexPath.row];
             CGFloat height = [[subDict stringValueForKey:@"value" default:@""] calculateSizeWithUIWidth:kScreenWidth - 125 font:[UIFont systemFontOfSize:15.0]].height;
@@ -399,11 +406,11 @@
 }
 -(CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section
 {
-    return section == 0 || ((self.showType == CNLiveCommuntyOrderShowTypeListReadyOrder || self.showType == CNLiveCommuntyOrderShowTypeListYetOrder || self.showType == CNLiveCommuntyOrderShowTypeListFailureOrder) && section == 1) || (self.showType == CNLiveCommuntyOrderShowTypeListCompletOrder && section == 2) ? 50 : 0;
+    return section == 0 || ((self.showType == CNLiveCommuntyOrderShowTypeListYetOrder || self.showType == CNLiveCommuntyOrderShowTypeListFailureOrder) && section == 1) || ((self.showType == CNLiveCommuntyOrderShowTypeListCompletOrder || self.showType == CNLiveCommuntyOrderShowTypeListReadyOrder) && section == 2) ? 50 : 0;
 }
 -(UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section
 {
-    if (section == 0 || ((self.showType == CNLiveCommuntyOrderShowTypeListReadyOrder || self.showType == CNLiveCommuntyOrderShowTypeListYetOrder || self.showType == CNLiveCommuntyOrderShowTypeListFailureOrder) && section == 1) || (self.showType == CNLiveCommuntyOrderShowTypeListCompletOrder && section == 2)) {
+    if (section == 0 || ((self.showType == CNLiveCommuntyOrderShowTypeListYetOrder || self.showType == CNLiveCommuntyOrderShowTypeListFailureOrder) && section == 1) || ((self.showType == CNLiveCommuntyOrderShowTypeListCompletOrder || self.showType == CNLiveCommuntyOrderShowTypeListReadyOrder) && section == 2)) {
         UIView * view = [[UIView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, 50)];
         view.backgroundColor = [UIColor clearColor];
@@ -439,12 +446,12 @@
 -(CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section
 {
     CGFloat height = section == 0 && self.createMdoel.imgs.count > 0 ? (kScreenWidth - 60)/3 + 20 : 10;
-    return section == 0 || ((self.showType == CNLiveCommuntyOrderShowTypeListReadyOrder || self.showType == CNLiveCommuntyOrderShowTypeListYetOrder || self.showType == CNLiveCommuntyOrderShowTypeListFailureOrder) && section == 1) || (self.showType == CNLiveCommuntyOrderShowTypeListCompletOrder && section == 2) ? height : 0;
+    return section == 0 || ((self.showType == CNLiveCommuntyOrderShowTypeListYetOrder || self.showType == CNLiveCommuntyOrderShowTypeListFailureOrder) && section == 1) || ((self.showType == CNLiveCommuntyOrderShowTypeListCompletOrder || self.showType == CNLiveCommuntyOrderShowTypeListReadyOrder) && section == 2) ? height : 0;
 }
 -(UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section
 {
     CGFloat height = section == 0 && self.createMdoel.imgs.count > 0 ? (kScreenWidth - 60)/3 + 20 : 10;
-    if (section == 0 || ((self.showType == CNLiveCommuntyOrderShowTypeListReadyOrder || self.showType == CNLiveCommuntyOrderShowTypeListYetOrder || self.showType == CNLiveCommuntyOrderShowTypeListFailureOrder) && section == 1) || (self.showType == CNLiveCommuntyOrderShowTypeListCompletOrder && section == 2)) {
+    if (section == 0 || ((self.showType == CNLiveCommuntyOrderShowTypeListYetOrder || self.showType == CNLiveCommuntyOrderShowTypeListFailureOrder) && section == 1) || ((self.showType == CNLiveCommuntyOrderShowTypeListCompletOrder || self.showType == CNLiveCommuntyOrderShowTypeListReadyOrder) && section == 2)) {
         UIView * view = [[UIView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, height)];
         view.backgroundColor = [UIColor clearColor];
@@ -144,15 +144,15 @@
         [self.navigationController pushViewController:signUpView animated:YES];
     }
     if (indexPath.row == 6) {
-//        NSString * cmnt_id = [[NSUserDefaults standardUserDefaults] objectForKey:@"cmnt_id"];
-//        if ([cmnt_id isNotBlank]) {
-//            CNLiveCommuntyOrderViewController * orderVC = [[CNLiveCommuntyOrderViewController alloc] initWithMaintenId:cmnt_id];
-//            [self.navigationController pushViewController:orderVC animated:YES];
-//        }else{
+        NSString * cmnt_id = [[NSUserDefaults standardUserDefaults] objectForKey:@"cmnt_id"];
+        if ([cmnt_id isNotBlank]) {
+            CNLiveCommuntyOrderViewController * orderVC = [[CNLiveCommuntyOrderViewController alloc] initWithMaintenId:cmnt_id];
+            [self.navigationController pushViewController:orderVC animated:YES];
+        }else{
             CNLiveCommuntyOrderViewController * orderVC = [[CNLiveCommuntyOrderViewController alloc] initWithMaintenId:@"cm2022032420637"];
             [self.navigationController pushViewController:orderVC animated:YES];
-//        }
+        }
     }
     if (indexPath.row == 7) {