0.0.8

liushiyu
1 parent 4fabf352
Showing 18 changed files with 200 additions and 132 deletions
CNLiveCommuntyModule.podspec
CNLiveCommuntyModule/Classes/Core/CNLiveCommunitHeader.h
CNLiveCommuntyModule/Classes/Model/CNLiveCommuntyHomeModel.m
CNLiveCommuntyModule/Classes/View/CNLiveCommuntSignUpView.h
CNLiveCommuntyModule/Classes/View/CNLiveCommuntSignUpView.m
CNLiveCommuntyModule/Classes/View/CNLiveCommuntSubView.m
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntEvaluaViewController.m
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntInformViewController.m
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntListViewController.m
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntSignUpViewController.m
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntyOrderViewController.m
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntyResultViewController.m
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntyUserEditViewController.m
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntyUserListViewController.h
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntyUserListViewController.m
CNLiveCommuntyModule/Classes/ViewModel/CNLiveCommuntViewModel.m
Example/CNLiveCommuntyModule/CNLIVEAppDelegate.m
Example/CNLiveCommuntyModule/CNLIVEViewController.m
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLiveCommuntyModule'
-  s.version          = '0.0.7'
+  s.version          = '0.0.8'
   s.summary          = 'A short description of CNLiveCommuntyModule.'
 # This description is used to generate tags and improve search results.
@@ -59,4 +59,6 @@
 static NSString *const kCNLiveCommuntyNBhdInfoIdentifier = @"kCNLiveCommuntyNBhdInfoIdentifier";
+
+#define isDemo [[[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleIdentifier"] isEqualToString:@"org.cocoapods.demo.CNLiveCommuntyModule-Example"]
 #endif /* CNLiveCommunitHeader_h */
@@ -212,6 +212,7 @@ MJCodingImplementation
 {
     self.infoArray = [[NSMutableArray alloc] init];
     self.processArray = [[NSMutableArray alloc] initWithArray:@[@"",@"",@"",@""]];
+    __block NSString * status = [NSString stringWithFormat:@"%@",[keyValues objectForKey:@"status"]];
     [keyValues enumerateKeysAndObjectsUsingBlock:^(id  _Nonnull key, id  _Nonnull obj, BOOL * _Nonnull stop) {
         key = [NSString stringWithFormat:@"%@",key];
         obj = [NSString stringWithFormat:@"%@",obj];
@@ -249,7 +250,7 @@ MJCodingImplementation
             [tempDict addString:[dateFormatter stringFromDate:detaildate] forKey:@"value"];
             [self.infoArray addObject:tempDict];
         }
-        if (![obj isEqualToString:@"<null>"] && [obj isNotBlank] && [key isEqualToString:@"createTime"]) {
+        if (![obj isEqualToString:@"<null>"] && [obj isNotBlank] && [key isEqualToString:@"createTime"] && [status isEqualToString:@"0"]) {
             NSDate *detaildate = [NSDate dateWithTimeIntervalSince1970:([obj doubleValue]/1000)];
             NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
             [dateFormatter setDateFormat:@"yyyy-MM-dd HH:mm:ss"];
@@ -257,7 +258,7 @@ MJCodingImplementation
             [tempDict addString:[dateFormatter stringFromDate:detaildate] forKey:@"value"];
             [self.processArray replaceObjectAtIndex:0 withObject:tempDict];
         }
-        if (![obj isEqualToString:@"<null>"] && [obj isNotBlank] && [key isEqualToString:@"repairTime"]) {
+        if (![obj isEqualToString:@"<null>"] && [obj isNotBlank] && [key isEqualToString:@"repairTime"] && [status isEqualToString:@"1"]) {
             NSDate *detaildate = [NSDate dateWithTimeIntervalSince1970:([obj doubleValue]/1000)];
             NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
             [dateFormatter setDateFormat:@"yyyy-MM-dd HH:mm:ss"];
@@ -265,7 +266,7 @@ MJCodingImplementation
             [tempDict addString:[dateFormatter stringFromDate:detaildate] forKey:@"value"];
             [self.processArray replaceObjectAtIndex:1 withObject:tempDict];
         }
-        if (![obj isEqualToString:@"<null>"] && [obj isNotBlank] && [key isEqualToString:@"payTime"]) {
+        if (![obj isEqualToString:@"<null>"] && [obj isNotBlank] && [key isEqualToString:@"payTime"] && [status isEqualToString:@"3"]) {
             NSDate *detaildate = [NSDate dateWithTimeIntervalSince1970:([obj doubleValue]/1000)];
             NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
             [dateFormatter setDateFormat:@"yyyy-MM-dd HH:mm:ss"];
@@ -273,7 +274,7 @@ MJCodingImplementation
             [tempDict addString:[dateFormatter stringFromDate:detaildate] forKey:@"value"];
             [self.processArray replaceObjectAtIndex:2 withObject:tempDict];
         }
-        if (![obj isEqualToString:@"<null>"] && [obj isNotBlank] && [key isEqualToString:@"cancleTime"]) {
+        if (![obj isEqualToString:@"<null>"] && [obj isNotBlank] && [key isEqualToString:@"cancleTime"] && [status isEqualToString:@"2"]) {
             NSDate *detaildate = [NSDate dateWithTimeIntervalSince1970:([obj doubleValue]/1000)];
             NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
             [dateFormatter setDateFormat:@"yyyy-MM-dd HH:mm:ss"];
@@ -285,7 +286,7 @@ MJCodingImplementation
     [self.processArray removeObject:@""];
     for (NSDictionary * subDict in self.processArray) {
         NSString * key = [subDict stringValueForKey:@"key" default:@""];
-        if ([key isEqualToString:@"用户提交报修订单"]) self.showType = 0;
+        if ([key isEqualToString:@"用户提交报修订单"] ) self.showType = 0;
         if ([key isEqualToString:@"维修人员已接单"]) self.showType = 1;
         if ([key isEqualToString:@"完成维修并支付"]) self.showType = 2;
         if ([key isEqualToString:@"用户取消报修订单"]) self.showType = 3;
@@ -485,34 +486,37 @@ MJCodingImplementation
     }];
     NSMutableArray * tempArray01 = [[NSMutableArray alloc] init];
-    NSArray * voList = [keyValues arrayForKey:@"signupVoList"];
+    NSMutableArray * voList = [[NSMutableArray alloc] initWithArray:[keyValues arrayForKey:@"signupVoList"]];
     for (NSDictionary * dict in voList) {
-        
+        NSMutableArray * tempA = [[NSMutableArray alloc] init];
         NSMutableDictionary * tempDict01 = [[NSMutableDictionary alloc] init];
         NSString * age = [NSString stringWithFormat:@"%@",dict[@"age"]];
         [tempDict01 addString:@"年      龄" forKey:@"key"];
         [tempDict01 addString:age forKey:@"value"];
-        [tempArray01 addObject:tempDict01];
+        [tempA addObject:tempDict01];
         NSMutableDictionary * tempDict02 = [[NSMutableDictionary alloc] init];
         NSString * name = [NSString stringWithFormat:@"%@",dict[@"name"]];
         [tempDict02 addString:@"姓      名" forKey:@"key"];
         [tempDict02 addString:name forKey:@"value"];
-        [tempArray01 addObject:tempDict02];
+        [tempA addObject:tempDict02];
         NSMutableDictionary * tempDict03 = [[NSMutableDictionary alloc] init];
         NSString * gender = [NSString stringWithFormat:@"%@",[dict[@"gender"] boolValue]?@"男":@"女"];
         [tempDict03 addString:@"性      别" forKey:@"key"];
         [tempDict03 addString:gender forKey:@"value"];
-        [tempArray01 addObject:tempDict03];
+        [tempA addObject:tempDict03];
         NSMutableDictionary * tempDict04 = [[NSMutableDictionary alloc] init];
         NSString * mobile = [NSString stringWithFormat:@"%@",dict[@"mobile"]];
         [tempDict04 addString:@"联系方式" forKey:@"key"];
         [tempDict04 addString:mobile forKey:@"value"];
-        [tempArray01 addObject:tempDict04];
+        [tempA addObject:tempDict04];
+        
+        [tempArray01 addObject:tempA];
     }
-    [self.dataArray addObject:tempArray01];
+
+    [self.dataArray addObjectsFromArray:tempArray01];
     [self.dataArray addObject:tempArray];
 }
 - (id)mj_newValueFromOldValue:(id)oldValue property:(MJProperty *)property
@@ -59,7 +59,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, assign) BOOL isAddUser;
-+(CNLiveCommuntSignUpUserViewCell *)setTableView:(UITableView *)tableView isAddUser:(BOOL)isAddUser UserDict:(NSDictionary *)userDict;
++(CNLiveCommuntSignUpUserViewCell *)setTableView:(UITableView *)tableView selectArray:(NSArray *)selectArray isAddUser:(BOOL)isAddUser UserDict:(NSDictionary *)userDict;
 @end
@@ -170,12 +170,13 @@
 @implementation CNLiveCommuntSignUpUserViewCell
-+(CNLiveCommuntSignUpUserViewCell *)setTableView:(UITableView *)tableView isAddUser:(BOOL)isAddUser UserDict:(nonnull NSDictionary *)userDict
++(CNLiveCommuntSignUpUserViewCell *)setTableView:(UITableView *)tableView selectArray:(NSArray *)selectArray isAddUser:(BOOL)isAddUser UserDict:(nonnull NSDictionary *)userDict
 {
     CNLiveCommuntSignUpUserViewCell * cell = [tableView dequeueReusableCellWithIdentifier:@"CNLiveCommuntSignUpViewCell"];
     if (!cell) {
         cell = [[CNLiveCommuntSignUpUserViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:@"CNLiveCommuntSignUpViewCell"];
     }
+    cell.selectArray = selectArray;
     cell.userDict = userDict;
     cell.isAddUser = isAddUser;
     return cell;
@@ -200,7 +201,6 @@
 -(void)setSelectArray:(NSArray *)selectArray
 {
     _selectArray = selectArray;
-    
 }
 -(void)setUserDict:(NSDictionary *)userDict
 {
@@ -208,6 +208,11 @@
     _nameLabel.text = [userDict stringValueForKey:@"name" default:@""];
     _sexAgeLabel.text = [NSString stringWithFormat:@"%@  %@岁",[[userDict stringValueForKey:@"gender" default:@""] isEqualToString:@"0"]?@"女":@"男",[userDict stringValueForKey:@"age" default:@""]];
     _phoneLabel.text = [NSString stringWithFormat:@"联系电话:%@",[userDict stringValueForKey:@"mobile" default:@""]];
+    BOOL isHave = NO;
+    for (NSDictionary * userSubDict in self.selectArray) {
+        if ([userDict isEqual:userSubDict]) isHave = YES;
+    }
+    if (isHave) self.delectBtn.selected = YES;
 }
 -(void)setIsAddUser:(BOOL)isAddUser
 {
@@ -255,20 +260,6 @@
         make.left.mas_equalTo(weakSelf.mainView).offset(10);
         make.size.mas_equalTo(20);
     }];
-    [self.nameLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.top.mas_equalTo(weakSelf.mainView).offset(5);
-        make.left.mas_equalTo(weakSelf.delectBtn.mas_right).offset(10);
-    }];
-    [self.lineLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.centerY.mas_equalTo(weakSelf.nameLabel);
-        make.left.mas_equalTo(weakSelf.nameLabel.mas_right).offset(5);
-        make.height.mas_equalTo(15);
-        make.width.mas_equalTo(0.5);
-    }];
-    [self.sexAgeLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.centerY.mas_equalTo(weakSelf.nameLabel);
-        make.left.mas_equalTo(weakSelf.lineLabel.mas_right).offset(5);
-    }];
     [self.phoneLabel mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.mas_equalTo(weakSelf.delectBtn.mas_right).offset(10);
         make.top.mas_equalTo(weakSelf.nameLabel.mas_bottom).offset(5);
@@ -278,6 +269,21 @@
         make.right.mas_equalTo(weakSelf.mainView.mas_right).offset(-10);
         make.size.mas_equalTo(20);
     }];
+    [self.sexAgeLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.centerY.mas_equalTo(weakSelf.nameLabel);
+        make.right.mas_equalTo(weakSelf.editButton.mas_left).offset(-5);
+    }];
+    [self.lineLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.centerY.mas_equalTo(weakSelf.nameLabel);
+        make.right.mas_equalTo(weakSelf.sexAgeLabel.mas_left).offset(-5);
+        make.height.mas_equalTo(15);
+        make.width.mas_equalTo(0.5);
+    }];
+    [self.nameLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.top.mas_equalTo(weakSelf.mainView).offset(5);
+        make.left.mas_equalTo(weakSelf.delectBtn.mas_right).offset(10);
+        make.right.mas_equalTo(weakSelf.lineLabel.mas_left).offset(-5);
+    }];
 }
 #pragma mark =
 -(UIView *)mainView
@@ -257,7 +257,7 @@
         NSString * buttonName = @"";
         UIColor * color = UIColorHex(#0091FF);
         if ([recoredModel.amount integerValue] == 0) {
-            buttonName = @"用户取消";
+            buttonName = @"已取消报名";
             color = UIColorHex(#FD862E);
         }else{
             buttonName = @"退款成功";
@@ -190,26 +190,32 @@
 }
 -(void)submiteAction:(UIButton *)button
 {
-    __weak typeof(self) weakSelf = self;
-    [self.view endEditing:YES];
-    if (self.imageArray.count == 0) {
-        [CNLiveCommuntViewModel requestWithCommuntyCommentsInfoWithContentId:self.recordModel.idStr handworkId:self.recordModel.handworkId comment:self.evaluaView.text imgs:@"" isAnonymity:self.isAnonymity CompleterBlock:^{
-            [QMUITips showSucceed:@"评论成功" inView:weakSelf.view hideAfterDelay:1.5];
-            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-                [weakSelf.navigationController popViewControllerAnimated:YES];
-            });
-        }];
-    }else{
+    self.evaluaView.text = [self.evaluaView.text stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
+    if ([self.evaluaView.text isNotBlank]) {
         __weak typeof(self) weakSelf = self;
-        [self uploadImageWithCompleterBlock:^(NSString *imageUrl) {
-            [CNLiveCommuntViewModel requestWithCommuntyCommentsInfoWithContentId:weakSelf.recordModel.idStr handworkId:weakSelf.recordModel.handworkId comment:weakSelf.evaluaView.text imgs:imageUrl isAnonymity:weakSelf.isAnonymity CompleterBlock:^{
+        [self.view endEditing:YES];
+        if (self.imageArray.count == 0) {
+            [CNLiveCommuntViewModel requestWithCommuntyCommentsInfoWithContentId:self.recordModel.idStr handworkId:self.recordModel.handworkId comment:self.evaluaView.text imgs:@"" isAnonymity:self.isAnonymity CompleterBlock:^{
                 [QMUITips showSucceed:@"评论成功" inView:weakSelf.view hideAfterDelay:1.5];
                 dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
                     [weakSelf.navigationController popViewControllerAnimated:YES];
                 });
             }];
-        }];
+        }else{
+            __weak typeof(self) weakSelf = self;
+            [self uploadImageWithCompleterBlock:^(NSString *imageUrl) {
+                [CNLiveCommuntViewModel requestWithCommuntyCommentsInfoWithContentId:weakSelf.recordModel.idStr handworkId:weakSelf.recordModel.handworkId comment:weakSelf.evaluaView.text imgs:imageUrl isAnonymity:weakSelf.isAnonymity CompleterBlock:^{
+                    [QMUITips showSucceed:@"评论成功" inView:weakSelf.view hideAfterDelay:1.5];
+                    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                        [weakSelf.navigationController popViewControllerAnimated:YES];
+                    });
+                }];
+            }];
+        }
+    }else{
+        [QMUITips showError:@"评论内容不能空" inView:self.view hideAfterDelay:1.5];
     }
+    
 }
 -(void)selectMothodAction:(UIButton *)button
 {
@@ -302,14 +308,14 @@
                         PHFetchResult *result = [PHAsset fetchAssetsWithLocalIdentifiers:imageIds options:nil];
                         [result enumerateObjectsUsingBlock:^(PHAsset * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
                             dispatch_async_on_main_queue(^{
-                                [weakSelf.imageArray removeObject:weakSelf.cameraArray.firstObject];
-                                [weakSelf.assetsArray removeObject:weakSelf.assetsCameraArray.firstObject];
-                                [weakSelf.assetsCameraArray removeAllObjects];
-                                [weakSelf.cameraArray removeAllObjects];
-                                [weakSelf.assetsCameraArray addObject:obj];
-                                [weakSelf.cameraArray addObject:image];
-                                [weakSelf.imageArray addObjectsFromArray:weakSelf.cameraArray];
-                                [weakSelf.assetsArray addObjectsFromArray:weakSelf.assetsCameraArray];
+//                                [weakSelf.imageArray removeObject:weakSelf.cameraArray.firstObject];
+//                                [weakSelf.assetsArray removeObject:weakSelf.assetsCameraArray.firstObject];
+//                                [weakSelf.assetsCameraArray removeAllObjects];
+//                                [weakSelf.cameraArray removeAllObjects];
+//                                [weakSelf.assetsCameraArray addObject:obj];
+//                                [weakSelf.cameraArray addObject:image];
+                                [weakSelf.imageArray addObjectsFromArray:@[image]];//weakSelf.cameraArray];
+                                [weakSelf.assetsArray addObjectsFromArray:@[obj]];//weakSelf.assetsCameraArray];
                                 [weakSelf setReloadFinishPickingPhotos];
                             });
                         }];
@@ -59,10 +59,11 @@
     self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithCustomView:rightBtn];
     weakself
-    [QMUITips showLoadingInView:self.view];
+
     self.dataArray = [[NSMutableArray alloc] init];
     NSString * nb_info =  (NSString *)[[NSUserDefaults standardUserDefaults] objectForKey:[NSString stringWithFormat:@"%@%@",kCNLiveCommuntyNBhdInfoIdentifier,[CNUserInfoManager manager].userInfoModel.uid]];
     if ([nb_info isNotBlank]) {
+        [QMUITips showLoadingInView:self.view];
         CNLiveCommuntyHomeListModel * listModel = [CNLiveCommuntyHomeListModel mj_objectWithKeyValues:nb_info];
         [CNLiveCommuntViewModel requestWithCommuntyHomeMaintenForNBHdId:listModel.propertyId CompleterBlock:^(NSArray * _Nonnull dataArray) {
             [QMUITips hideAllTipsInView:weakSelf.view];
@@ -179,7 +180,7 @@
             if ([phone isNotBlank] && phone.length == 11) {
                 [paramDict addString:phone forKey:@"phone"];
             }else{
-                [QMUITips showWithText:@"联系电话填写错误"];
+                [QMUITips showWithText:phone.length == 0 ? @"联系电话不能为空" : @"联系电话填写错误"];
                 return;
             }
         }
@@ -189,10 +190,15 @@
             NSString * dayString = [timeString componentsSeparatedByString:@" "].firstObject;
             NSString * startString = [[timeString componentsSeparatedByString:@" "].lastObject componentsSeparatedByString:@"~"].firstObject;
             NSString * endString = [[timeString componentsSeparatedByString:@" "].lastObject componentsSeparatedByString:@"~"].lastObject;
-            NSString * temp_start_time = [NSString stringWithFormat:@"%@ %@:00:00",dayString,startString];
-            NSString * temp_end_time = [NSString stringWithFormat:@"%@ %@:00:00",dayString,endString];
-            [paramDict addString:[temp_start_time isNotBlank]?temp_start_time:@"" forKey:@"beginTime"];
-            [paramDict addString:[temp_end_time isNotBlank]?temp_end_time:@"" forKey:@"endTime"];
+            if ([startString isNotBlank] && [endString isNotBlank]) {
+                NSString * temp_start_time = [NSString stringWithFormat:@"%@ %@:00:00",dayString,startString];
+                NSString * temp_end_time = [NSString stringWithFormat:@"%@ %@:00:00",dayString,endString];
+                [paramDict addString:[temp_start_time isNotBlank]?temp_start_time:@"" forKey:@"beginTime"];
+                [paramDict addString:[temp_end_time isNotBlank]?temp_end_time:@"" forKey:@"endTime"];
+            }else{
+                [paramDict addString:@"" forKey:@"beginTime"];
+                [paramDict addString:@"" forKey:@"endTime"];
+            }
         }
         if (i == 5) [paramDict addString:[userCell.descTextView.text isNotBlank]?userCell.descTextView.text:@"" forKey:@"remark"];
     }
@@ -203,8 +209,8 @@
         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:@"上门时间不能为空"];
+        if ([key isEqualToString:@"beginTime"]) [QMUITips showWithText:@"请选择上门时间"];
+        if ([key isEqualToString:@"endTime"]) [QMUITips showWithText:@"请选择上门时间"];
         if ([key isEqualToString:@"remark"]) [QMUITips showWithText:@"问题描述不能为空"];
         return;
     }
@@ -123,12 +123,24 @@
 }
 - (NSAttributedString *)buttonTitleForEmptyDataSet:(UIScrollView *)scrollView forState:(UIControlState)state
 {
-    if (self.showType == CNLiveCommuntListShowTypeRepair) {
-    return [[NSAttributedString alloc] initWithString:@"我要报修" attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:16],NSForegroundColorAttributeName:UIColorHex(#CD0302)}];
+    NSString * nb_info =  (NSString *)[[NSUserDefaults standardUserDefaults] objectForKey:[NSString stringWithFormat:@"kCNLiveCommuntyNBhdInfoIdentifier%@",[CNUserInfoManager manager].userInfoModel.uid]];
+    NSString * idStr = [[nb_info mj_JSONObject] stringValueForKey:@"id" default:@""];
+    if (self.showType == CNLiveCommuntListShowTypeRepair  && [idStr isNotBlank]) {
+        return [[NSAttributedString alloc] initWithString:@"我要报修" attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:16],NSForegroundColorAttributeName:UIColorHex(#CD0302)}];
     }else{
         return nil;
     }
 }
+- (void)emptyDataSet:(UIScrollView *)scrollView didTapButton:(UIButton *)button
+{
+    NSString * nb_info =  (NSString *)[[NSUserDefaults standardUserDefaults] objectForKey:[NSString stringWithFormat:@"kCNLiveCommuntyNBhdInfoIdentifier%@",[CNUserInfoManager manager].userInfoModel.uid]];
+    NSString * idStr = [[nb_info mj_JSONObject] stringValueForKey:@"id" default:@""];
+    if (self.showType == CNLiveCommuntListShowTypeRepair && [idStr isNotBlank]) {
+        NSLog(@"点击界面了");
+        CNLiveCommuntInformViewController * informView = [[CNLiveCommuntInformViewController alloc] initWithNBhdId:idStr];
+        [self.navigationController pushViewController:informView animated:YES];
+    }
+}
 - (CGFloat)verticalOffsetForEmptyDataSet:(UIScrollView *)scrollView
 {
     return 0;
@@ -74,9 +74,9 @@
 -(void)addUserAction:(UIButton *)button
 {
     __weak typeof(self) weakSelf = self;
-    CNLiveCommuntyUserListViewController * userVC = [[CNLiveCommuntyUserListViewController alloc] initWithStyle:UITableViewStyleGrouped CompleterBlock:^(NSArray * _Nonnull userArray) {
-        [weakSelf.userArray removeAllObjects];
-        [weakSelf.userArray addObjectsFromArray:userArray];
+    CNLiveCommuntyUserListViewController * userVC = [[CNLiveCommuntyUserListViewController alloc] initWithStyle:UITableViewStyleGrouped selectArray:self.userArray CompleterBlock:^(NSArray * _Nonnull userArray) {
+//        [weakSelf.userArray removeAllObjects];
+//        [weakSelf.userArray addObjectsFromArray:userArray];
         [weakSelf.tableView reloadData];
         [weakSelf setupWithBottemView:weakSelf.userArray.count];
     }];
@@ -121,16 +121,7 @@
     [str addAttribute:NSForegroundColorAttributeName value:UIColorHex(#DF0D23) range:[str.string rangeOfString:@"¥"]];
     [str addAttribute:NSFontAttributeName value:[UIFont systemFontOfSize:9] range:[str.string rangeOfString:@"¥"]];
-    UILabel * priceLabel = [[UILabel alloc] init];
-    priceLabel.textColor = UIColorHex(#DF0D23);
-    priceLabel.font = [UIFont boldSystemFontOfSize:16];
-    priceLabel.attributedText = str;
-    priceLabel.hidden = unitPrice == 0.00;
-    [bottemView addSubview:priceLabel];
-    [priceLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.top.mas_equalTo(bottemView.mas_top).offset(7);
-        make.left.mas_equalTo(bottemView).offset(10);
-    }];
+
     UIButton * payButton = [UIButton buttonWithType:UIButtonTypeCustom];
     [payButton setTitle:unitPrice == 0.00?@"立即报名":@"立即支付" forState:UIControlStateNormal];
@@ -146,7 +137,7 @@
     [payButton addTarget:self action:@selector(payResultAction) forControlEvents:UIControlEventTouchUpInside];
     [bottemView addSubview:payButton];
     [payButton mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.centerY.mas_equalTo(bottemView);
+        make.top.mas_equalTo(bottemView.mas_top).offset(7);
         make.right.mas_equalTo(bottemView.mas_right).offset(-10);
         make.height.mas_equalTo(36);
         if (unitPrice == 0.00) {
@@ -155,6 +146,17 @@
             make.width.mas_equalTo(180);
         }
    }];
+    
+    UILabel * priceLabel = [[UILabel alloc] init];
+    priceLabel.textColor = UIColorHex(#DF0D23);
+    priceLabel.font = [UIFont boldSystemFontOfSize:16];
+    priceLabel.attributedText = str;
+    priceLabel.hidden = unitPrice == 0.00;
+    [bottemView addSubview:priceLabel];
+    [priceLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.centerY.mas_equalTo(payButton);
+        make.left.mas_equalTo(bottemView).offset(10);
+    }];
 }
 -(void)payResultAction
 {
@@ -166,7 +168,7 @@
             CNLiveCommuntyResultViewController * resultVC = [[CNLiveCommuntyResultViewController alloc] initWithSignUpModel:signUpModel activityId:handworkId];
             [weakSelf.navigationController pushViewController:resultVC animated:YES];
         }else{
-            [[CNLiveCommuntyModule shareInstance].protocol pushMainProjectWithPayManagerWithOrderId:signUpModel.order.idStr price:[NSString stringWithFormat:@"%.2f",(weakSelf.userArray.count * [weakSelf.detailModel.unitPrice floatValue])] body:weakSelf.detailModel.name];
+            [[CNLiveCommuntyModule shareInstance].protocol pushMainProjectWithPayManagerWithOrderId:[signUpModel.order.idStr isNotBlank]?signUpModel.order.idStr:@"" price:[NSString stringWithFormat:@"%.2f",(weakSelf.userArray.count * [weakSelf.detailModel.unitPrice floatValue])] body:[weakSelf.detailModel.name isNotBlank]?weakSelf.detailModel.name:@"网家家社区活动"];
             [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(payResultSuccessNNotification:) name:@"kIMAMSG_CommunityPaySuccessNotification" object:nil];
         }
     }];
@@ -232,7 +234,7 @@
 -(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
 {
     if (indexPath.section == 0) {
-        CNLiveCommuntSignUpUserViewCell * userView = [CNLiveCommuntSignUpUserViewCell setTableView:tableView isAddUser:NO UserDict:self.userArray[indexPath.row]];
+        CNLiveCommuntSignUpUserViewCell * userView = [CNLiveCommuntSignUpUserViewCell setTableView:tableView selectArray:@[] isAddUser:NO UserDict:self.userArray[indexPath.row]];
         userView.delegate = self;
         return userView;
     }else{
@@ -51,14 +51,16 @@
 -(void)viewDidAppear:(BOOL)animated
 {
     [super viewDidAppear:animated];
-    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 (self.showType == CNLiveCommuntyOrderShowTypeChatYetOrder || self.showType == CNLiveCommuntyOrderShowTypeChatReadyOrder || self.showType == CNLiveCommuntyOrderShowTypeChatCompletOrder) {
+        NSMutableArray * tempArray = [[NSMutableArray alloc] initWithArray:self.navigationController.viewControllers];
+        for (UIViewController * vc in self.navigationController.viewControllers) {
+            if ([vc isKindOfClass:CNLiveCommuntInformViewController.class]) {
+                [tempArray removeObject:vc];
+                break;
+            }
         }
+        self.navigationController.viewControllers = tempArray;
     }
-    self.navigationController.viewControllers = tempArray;
 }
 - (void)viewDidLoad {
@@ -261,6 +263,14 @@
 {
     return [CNLiveCommuntTools cCommunt_setImageWithName:@"c_community_content_empty"];
 }
+- (NSAttributedString *)buttonTitleForEmptyDataSet:(UIScrollView *)scrollView forState:(UIControlState)state
+{
+    return [[NSAttributedString alloc] initWithString:@"重试" attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:14],NSForegroundColorAttributeName:UIColorHex(#CD0302)}];
+}
+- (void)emptyDataSet:(UIScrollView *)scrollView didTapButton:(UIButton *)button
+{
+    [self reloadDataWithDataSource];
+}
 - (UIColor *)backgroundColorForEmptyDataSet:(UIScrollView *)scrollView
 {
     return [UIColor whiteColor];
@@ -56,7 +56,7 @@
     [super viewDidLoad];
     // Do any additional setup after loading the view.
     self.view.backgroundColor = [UIColor whiteColor];
-    self.title  = self.isSuccess?@"支付成功":@"支付失败";
+    self.title  = self.isSuccess?@"报名成功":@"报名失败";
     [self.view addSubview:self.statusButton];
     [self.view addSubview:self.nameLabel];
@@ -91,8 +91,8 @@
 {
     if (!_statusButton) {
         _statusButton = [[QMUIButton alloc] init];
-        [_statusButton setTitle:self.isSuccess?@"支付成功":@"支付失败" forState:UIControlStateNormal];
-        [_statusButton setTitle:self.isSuccess?@"支付成功":@"支付失败" forState:UIControlStateHighlighted];
+        [_statusButton setTitle:self.isSuccess?@"报名成功":([self.msg isNotBlank]?@"报名失败":@"支付失败") forState:UIControlStateNormal];
+        [_statusButton setTitle:self.isSuccess?@"报名成功":([self.msg isNotBlank]?@"报名失败":@"支付失败") forState:UIControlStateHighlighted];
         [_statusButton setImage:[CNLiveCommuntTools cCommunt_setImageWithName:self.isSuccess?@"c_communty_result_success":@"c_communty_result_failer"] forState:UIControlStateNormal];
         [_statusButton setImage:[CNLiveCommuntTools cCommunt_setImageWithName:self.isSuccess?@"c_communty_result_success":@"c_communty_result_failer"] forState:UIControlStateHighlighted];
         [_statusButton setTitleColor:UIColorBlack forState:UIControlStateNormal];
@@ -125,6 +125,7 @@
         if ([key isEqualToString:@"mobile"]) [QMUITips showWithText:@"联系方式不能为空"];
         return;
     }
+    
     __weak typeof(self) weakSelf = self;
     [CNLiveCommuntViewModel requestWithCommuntySaveInfoUsersMentUserDict:paramDict isSave:YES isNew:self.userDict.allKeys.count == 0 CompleterBlock:^(NSArray * _Nonnull userArray, BOOL isSave) {
         [weakSelf.navigationController popViewControllerAnimated:YES];
@@ -13,7 +13,7 @@ NS_ASSUME_NONNULL_BEGIN
 /// 初始化报名界面
 /// @param completerBlock 返回
-- (instancetype)initWithStyle:(UITableViewStyle)style CompleterBlock:(void(^)(NSArray * userArray))completerBlock;
+- (instancetype)initWithStyle:(UITableViewStyle)style selectArray:(NSMutableArray *)selectArray CompleterBlock:(void(^)(NSArray * userArray))completerBlock;
 @end
@@ -10,6 +10,8 @@
 @interface CNLiveCommuntyUserListViewController ()<CNLiveCommuntSignUpUserViewDelegate,DZNEmptyDataSetSource,DZNEmptyDataSetDelegate>
 @property (nonatomic, strong) NSMutableArray *userArray;
 @property (nonatomic, strong) NSMutableArray *selectArray;
+@property (nonatomic, strong) UIButton * payButton;
+@property (nonatomic, strong) UIView * bottemView;
 @property (nonatomic, copy) void(^completerBlock)(NSArray * userArray);
 @end
@@ -22,13 +24,16 @@
     [CNLiveCommuntViewModel requestWithCommuntySaveInfoUsersMentUserDict:@{} isSave:NO isNew:NO CompleterBlock:^(NSArray * _Nonnull userArray, BOOL isSave) {
         weakSelf.userArray = [[NSMutableArray alloc] initWithArray:userArray];
         [weakSelf.tableView reloadData];
+        
+        [weakSelf setupWithBottemView:weakSelf.selectArray.count > 0];
     }];
 }
-- (instancetype)initWithStyle:(UITableViewStyle)style CompleterBlock:(void(^)(NSArray * userArray))completerBlock
+- (instancetype)initWithStyle:(UITableViewStyle)style selectArray:(NSMutableArray *)selectArray CompleterBlock:(void(^)(NSArray * userArray))completerBlock
 {
     self = [super initWithStyle:style];
     if (self) {
+        _selectArray = selectArray;
         _completerBlock = completerBlock;
     }
     return self;
@@ -39,8 +44,7 @@
     // Do any additional setup after loading the view.
     self.view.backgroundColor = UIColorHex(#F9F9F9);
     self.title = @"添加参与人";
-    
-    self.selectArray = [[NSMutableArray alloc] init];
+
     UIButton * submiteBtn = [UIButton buttonWithType:UIButtonTypeCustom];
     submiteBtn.frame = CGRectMake(0, 0, 50, 14);
@@ -58,35 +62,42 @@
 }
 -(void)setupWithBottemView:(BOOL)isShow
 {
-    __weak typeof(self) weakSelf = self;
-    UIView * bottemView = [[UIView alloc] init];
-    bottemView.hidden = !isShow;
-    bottemView.backgroundColor = [UIColor whiteColor];
-    [self.view addSubview:bottemView];
-    [bottemView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.right.bottom.mas_equalTo(weakSelf.view);
-        make.height.mas_equalTo(50+kVerticalBottomSafeHeight);
-    }];
-    
-    UIButton * payButton = [UIButton buttonWithType:UIButtonTypeCustom];
-    [payButton setTitle:@"确定" forState:UIControlStateNormal];
-    [payButton setTitle:@"确定" forState:UIControlStateHighlighted];
-    [payButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
-    [payButton setTitleColor:[UIColor whiteColor] forState:UIControlStateHighlighted];
-    payButton.backgroundColor = UIColorHex(#CD0302);
-    payButton.layer.masksToBounds = YES;
-    payButton.layer.cornerRadius = 18;
-    payButton.hidden = !isShow;
-    payButton.titleLabel.font = [UIFont systemFontOfSize:16];
-    payButton.titleLabel.font = [UIFont boldSystemFontOfSize:16];
-    [payButton addTarget:self action:@selector(doneAction:) forControlEvents:UIControlEventTouchUpInside];
-    [bottemView addSubview:payButton];
-    [payButton mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.top.mas_equalTo(bottemView.mas_top).offset(7);
-        make.right.mas_equalTo(bottemView.mas_right).offset(-10);
-        make.height.mas_equalTo(36);
-        make.width.mas_equalTo(kScreenWidth - 30);
-    }];
+    if (!self.bottemView && !self.payButton) {
+        __weak typeof(self) weakSelf = self;
+        UIView * bottemView = [[UIView alloc] init];
+        bottemView.backgroundColor = [UIColor whiteColor];
+        [self.view addSubview:bottemView];
+        bottemView.hidden = !isShow;
+        self.bottemView = bottemView;
+        [bottemView mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.left.right.bottom.mas_equalTo(weakSelf.view);
+            make.height.mas_equalTo(50+kVerticalBottomSafeHeight);
+        }];
+        
+        UIButton * payButton = [UIButton buttonWithType:UIButtonTypeCustom];
+        [payButton setTitle:@"确定" forState:UIControlStateNormal];
+        [payButton setTitle:@"确定" forState:UIControlStateHighlighted];
+        [payButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
+        [payButton setTitleColor:[UIColor whiteColor] forState:UIControlStateHighlighted];
+        payButton.backgroundColor = UIColorHex(#CD0302);
+        payButton.layer.masksToBounds = YES;
+        payButton.layer.cornerRadius = 18;
+        payButton.hidden = !isShow;
+        payButton.titleLabel.font = [UIFont systemFontOfSize:16];
+        payButton.titleLabel.font = [UIFont boldSystemFontOfSize:16];
+        [payButton addTarget:self action:@selector(doneAction:) forControlEvents:UIControlEventTouchUpInside];
+        [bottemView addSubview:payButton];
+        self.payButton = payButton;
+        [payButton mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.top.mas_equalTo(bottemView.mas_top).offset(7);
+            make.right.mas_equalTo(bottemView.mas_right).offset(-10);
+            make.height.mas_equalTo(36);
+            make.width.mas_equalTo(kScreenWidth - 30);
+        }];
+    }else{
+        self.bottemView.hidden = !isShow;
+        self.payButton.hidden = !isShow;
+    }
 }
 -(void)doneAction:(UIButton *)button
 {
@@ -133,6 +144,7 @@
         if ([self.selectArray containsObject:subDict]) [self.selectArray removeObject:subDict];
     }
     [self setupWithBottemView:self.selectArray.count > 0];
+
 }
 #pragma mark - DZNEmptyDataSetSource Methods
 - (NSAttributedString *)titleForEmptyDataSet:(UIScrollView *)scrollView
@@ -173,7 +185,7 @@
 }
 -(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
 {
-    CNLiveCommuntSignUpUserViewCell * userView = [CNLiveCommuntSignUpUserViewCell setTableView:tableView isAddUser:YES UserDict:self.userArray[indexPath.row]];
+    CNLiveCommuntSignUpUserViewCell * userView = [CNLiveCommuntSignUpUserViewCell setTableView:tableView selectArray:self.selectArray isAddUser:YES UserDict:self.userArray[indexPath.row]];
     userView.delegate = self;
     return userView;
 }
@@ -138,7 +138,7 @@
                     NSMutableArray * tempArray = [CNLiveCommuntyActivityHomeListModel mj_objectArrayWithKeyValuesArray:[responseObject arrayForKey:@"list"]];
                     if (completerBlock) completerBlock(tempArray,[responseObject boolValueForKey:@"isLastPage" default:YES]);
                 }else{
-                    if (completerBlock) completerBlock(@[],YES);
+//                    if (completerBlock) completerBlock(@[],YES);
                 }
             }];
         }];
@@ -161,7 +161,7 @@
                     NSMutableArray * tempArray = [CNLiveCommuntyActivityRecordListModel mj_objectArrayWithKeyValuesArray:[responseObject arrayForKey:@"list"]];
                     if (completerBlock) completerBlock(tempArray,[responseObject boolValueForKey:@"isLastPage" default:YES]);
                 }else{
-                    if (completerBlock) completerBlock(@[],YES);
+//                    if (completerBlock) completerBlock(@[],YES);
                 }
             }];
         }];
@@ -183,7 +183,7 @@
                     NSMutableArray * tempArray = [CNLiveCommuntyActivityRepairListModel mj_objectArrayWithKeyValuesArray:[responseObject arrayForKey:@"list"]];
                     if (completerBlock) completerBlock(tempArray,[responseObject boolValueForKey:@"isLastPage" default:YES]);
                 }else{
-                    if (completerBlock) completerBlock(@[],YES);
+//                    if (completerBlock) completerBlock(@[],YES);
                 }
             }];
         }];
@@ -424,7 +424,7 @@
                 CNLiveCommuntyActivitySignUpModel * signUpModel = [CNLiveCommuntyActivitySignUpModel mj_objectWithKeyValues:responseObject];
                 if (completerBlock) completerBlock(signUpModel);
             }else{
-                if (completerBlock) completerBlock(nil);
+//                if (completerBlock) completerBlock(nil);
             }
         }];
     }];
@@ -464,7 +464,13 @@
                 }
                 if (isReplace) [tempArray addObject:userDict];
             }else{
-                [tempArray addObject:userDict];
+                BOOL isEqual_dict = NO;
+                for (NSDictionary * userSubDict in tempArray) {
+                    NSMutableDictionary * d_01 = [[NSMutableDictionary alloc] initWithDictionary:userSubDict];
+                    NSMutableDictionary * d_02 = [[NSMutableDictionary alloc] initWithDictionary:userDict];
+                    isEqual_dict = [d_01 isEqual:d_02];
+                }
+                if (!isEqual_dict) [tempArray addObject:userDict];
             }
             NSString * user_info = [tempArray mj_JSONString];
             [CNLiveRespCacheManager cachePathWithObject:user_info FileName:cacheKey];
@@ -23,7 +23,7 @@
     [IQKeyboardManager sharedManager].enable = YES;
     [IQKeyboardManager sharedManager].enableAutoToolbar = YES;
-    [CNUserInfoManager manager].userInfoModel.uid = @"395098";//@"145680";//@"10545988";//@"353001";//@"353417";//@"10511059";//@"10458139";//@"10537318";//@"10499533";//@"11973842"
+    [CNUserInfoManager manager].userInfoModel.uid = @"10458139";//@"145680";//@"395098";//@"10545988";//@"353001";//@"353417";//@"10511059";//@"10537318";//@"10499533";//@"11973842"
 //    [[NSUserDefaults standardUserDefaults] setObject:@"38" forKey:@"kCNLiveCommuntyNBhdIdIdentifier"];
 //    [[NSUserDefaults standardUserDefaults] synchronize];
@@ -42,7 +42,7 @@
 {
     if (!_dataArray) {
         _dataArray = [[NSMutableArray alloc] initWithArray:@[
-            @"有底部导航栏的界面",@"活动记录",@"报修记录",@"填写记录",@"活动评价",@"报名",@"订单详情-未接单",@"订单详情-已接单",@"145680",@"暂时点击无效",@"选择小区",@"主界面跳转"
+            @"有底部导航栏的界面",@"活动记录",@"报修记录",@"填写记录",@"活动评价",@"报名",@"订单详情-未接单",@"查看详情界面",[CNUserInfoManager manager].userInfoModel.uid,@"暂时点击无效",@"选择小区",@"主界面跳转"
         ]];
     }
     return _dataArray;
@@ -130,8 +130,9 @@
     }
     if (indexPath.row == 3) {
-        NSString * nbhdId =  (NSString *)[[NSUserDefaults standardUserDefaults] objectForKey:@"kCNLiveCommuntyNBhdIdIdentifier"];
-        CNLiveCommuntInformViewController * informView = [[CNLiveCommuntInformViewController alloc] initWithNBhdId:nbhdId];
+        NSString * nb_info =  (NSString *)[[NSUserDefaults standardUserDefaults] objectForKey:[NSString stringWithFormat:@"kCNLiveCommuntyNBhdInfoIdentifier%@",[CNUserInfoManager manager].userInfoModel.uid]];
+        NSDictionary * dict = [nb_info mj_JSONObject];
+        CNLiveCommuntInformViewController * informView = [[CNLiveCommuntInformViewController alloc] initWithNBhdId:[dict stringValueForKey:@"id" default:@""]];
         [self.navigationController pushViewController:informView animated:YES];
     }
     if (indexPath.row == 4) {
@@ -159,8 +160,8 @@
 //        [self.navigationController pushViewController:orderVC animated:YES];
 //    }
     if (indexPath.row == 8) {
-        [CNUserInfoManager manager].userInfoModel.uid = self.isChange ? @"11973842" : @"145680";
-        [self.dataArray replaceObjectAtIndex:8 withObject:self.isChange ? @"11973842" : @"145680"];
+        [CNUserInfoManager manager].userInfoModel.uid = self.isChange ? @"11973842" : [CNUserInfoManager manager].userInfoModel.uid;
+        [self.dataArray replaceObjectAtIndex:8 withObject:self.isChange ? @"11973842" :[CNUserInfoManager manager].userInfoModel.uid];
         self.isChange = !self.isChange;
         NSMutableDictionary * mDict = [[NSMutableDictionary alloc] init];
         [mDict setValue:[CNUserInfoManager manager].userInfoModel.uid forKey:@"loginSid"];