0.0.9

liushiyu
1 parent 73d7e51d
Showing 20 changed files with 292 additions and 100 deletions
CNLiveCommuntyModule.podspec
CNLiveCommuntyModule/Classes/Core/CNLiveCommunitHeader.h
CNLiveCommuntyModule/Classes/Model/CNLiveCommuntyHomeModel.h
CNLiveCommuntyModule/Classes/Model/CNLiveCommuntyHomeModel.m
CNLiveCommuntyModule/Classes/View/CNLiveCommuntSignUpView.h
CNLiveCommuntyModule/Classes/View/CNLiveCommuntSignUpView.m
CNLiveCommuntyModule/Classes/View/CNLiveCommuntSubView.m
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntInformViewController.m
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntListViewController.m
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntSignUpViewController.m
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntViewController.m
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntyOrderViewController.m
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntyUserEditViewController.m
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntyUserListViewController.m
CNLiveCommuntyModule/Classes/ViewModel/CNLiveCommuntViewModel.m
Example/CNLiveCommuntyModule.xcodeproj/project.pbxproj
Example/CNLiveCommuntyModule/CNLIVEAppDelegate.m
Example/CNLiveCommuntyModule/CNLIVETabberViewController.h
Example/CNLiveCommuntyModule/CNLIVETabberViewController.m
Example/CNLiveCommuntyModule/CNLiveCommuntyModule-Info.plist
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLiveCommuntyModule'
-  s.version          = '0.0.8'
+  s.version          = '0.0.9'
   s.summary          = 'A short description of CNLiveCommuntyModule.'
 # This description is used to generate tags and improve search results.
@@ -59,6 +59,7 @@
 static NSString *const kCNLiveCommuntyNBhdInfoIdentifier = @"kCNLiveCommuntyNBhdInfoIdentifier";
+static NSString *const kCNLiveCommuntySaveChangeUserInfoNotification = @"kCNLiveCommuntySaveChangeUserInfoNotification";
 #define isDemo [[[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleIdentifier"] isEqualToString:@"org.cocoapods.demo.CNLiveCommuntyModule-Example"]
 #endif /* CNLiveCommunitHeader_h */
@@ -148,8 +148,6 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, copy) NSString *userId;
 @property (nonatomic, copy) NSString *repairId;
 @property (nonatomic, copy) NSString *payType;
-@property (nonatomic, strong) NSNumber *intentEndTime;
-@property (nonatomic, copy) NSString *intentEndTimeString;
 @property (nonatomic, copy) NSString *status;
 @property (nonatomic, copy) NSString *repairProject;
 @property (nonatomic, copy) NSString *idStr;
@@ -162,6 +160,8 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, copy) NSString *mobile;
 @property (nonatomic, strong) NSNumber *intentBeginTime;
 @property (nonatomic, copy) NSString *intentBeginTimeString;
+@property (nonatomic, strong) NSNumber *intentEndTime;
+@property (nonatomic, copy) NSString *intentEndTimeString;
 @property (nonatomic, strong) NSNumber *cancleTime;
 @property (nonatomic, copy) NSString *cancleTimeString;
 @property (nonatomic, strong) NSNumber *createTime;
@@ -239,15 +239,19 @@ MJCodingImplementation
         }
         if (![obj isKindOfClass:NSNull.class] && [obj isNotBlank] && [key isEqualToString:@"remark"]) {//问题描述
             [tempDict addString:@"问题描述" forKey:@"key"];
-            [tempDict addString:obj forKey:@"value"];
+            [tempDict addString:[obj isEqualToString:@"<null>"]?@"":obj forKey:@"value"];
             [self.infoArray addObject:tempDict];
         }
         if (![obj isKindOfClass:NSNull.class] && [obj isNotBlank] && [key isEqualToString:@"intentBeginTime"]) {//联系地址
             NSDate *detaildate = [NSDate dateWithTimeIntervalSince1970:([obj doubleValue]/1000)];
             NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
             [dateFormatter setDateFormat:@"yyyy-MM-dd HH:mm"];
+            NSString * startIntentString = [dateFormatter stringFromDate:detaildate];
+            NSDateFormatter *endFormatter = [[NSDateFormatter alloc] init];
+            [endFormatter setDateFormat:@"HH"];
+            NSString * endIntentString = [endFormatter stringFromDate:detaildate];
             [tempDict addString:@"预约时间" forKey:@"key"];
-            [tempDict addString:[dateFormatter stringFromDate:detaildate] forKey:@"value"];
+            [tempDict addString:[NSString stringWithFormat:@"%@~%ld:00",startIntentString,[endIntentString integerValue]+2] forKey:@"value"];
             [self.infoArray addObject:tempDict];
         }
         if (![obj isEqualToString:@"<null>"] && [obj isNotBlank] && [key isEqualToString:@"createTime"] && [status isEqualToString:@"0"]) {
@@ -295,39 +299,40 @@ MJCodingImplementation
 }
 - (id)mj_newValueFromOldValue:(id)oldValue property:(MJProperty *)property
 {
-    oldValue = [NSString stringWithFormat:@"%@",oldValue];
+    BOOL isNULL = [oldValue isKindOfClass:NSNull.class] || oldValue == nil;
+    oldValue = [NSString stringWithFormat:@"%@",isNULL?@"":oldValue];
-    if (![oldValue isKindOfClass:NSNull.class] && [property.name isEqualToString:@"createTime"]) {
+    if ([oldValue isNotBlank] && [property.name isEqualToString:@"createTime"]) {
         NSDate *detaildate = [NSDate dateWithTimeIntervalSince1970:([oldValue doubleValue]/1000)];
         NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
         [dateFormatter setDateFormat:@"yyyy-MM-dd HH:mm"];
         self.createTimeString = [dateFormatter stringFromDate:detaildate];
     }
-    if (![oldValue isEqualToString:@"<null>"] && ![oldValue isKindOfClass:NSNull.class] && [property.name isEqualToString:@"repairTime"]) {
+    if ([oldValue isNotBlank] && [property.name isEqualToString:@"repairTime"]) {
         NSDate *detaildate = [NSDate dateWithTimeIntervalSince1970:([oldValue doubleValue]/1000)];
         NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
         [dateFormatter setDateFormat:@"yyyy-MM-dd HH:mm"];
         self.repairTimeString = [dateFormatter stringFromDate:detaildate];
     }
-    if (![oldValue isEqualToString:@"<null>"] && ![oldValue isKindOfClass:NSNull.class] && [property.name isEqualToString:@"payTime"]) {
+    if ([oldValue isNotBlank]  && [property.name isEqualToString:@"payTime"]) {
         NSDate *detaildate = [NSDate dateWithTimeIntervalSince1970:([oldValue doubleValue]/1000)];
         NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
         [dateFormatter setDateFormat:@"yyyy-MM-dd HH:mm"];
         self.payTimeString = [dateFormatter stringFromDate:detaildate];
     }
-    if (![oldValue isEqualToString:@"<null>"] && ![oldValue isKindOfClass:NSNull.class] && [property.name isEqualToString:@"intentEndTime"]) {
+    if ([oldValue isNotBlank] && [property.name isEqualToString:@"intentEndTime"]) {
         NSDate *detaildate = [NSDate dateWithTimeIntervalSince1970:([oldValue doubleValue]/1000)];
         NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
         [dateFormatter setDateFormat:@"yyyy-MM-dd HH:mm"];
         self.intentEndTimeString = [dateFormatter stringFromDate:detaildate];
     }
-    if (![oldValue isKindOfClass:NSNull.class] && [property.name isEqualToString:@"intentBeginTime"]) {
+    if ([oldValue isNotBlank] && [property.name isEqualToString:@"intentBeginTime"]) {
         NSDate *detaildate = [NSDate dateWithTimeIntervalSince1970:([oldValue doubleValue]/1000)];
         NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
         [dateFormatter setDateFormat:@"yyyy-MM-dd HH:mm"];
         self.intentBeginTimeString = [dateFormatter stringFromDate:detaildate];
     }
-    if (![oldValue isEqualToString:@"<null>"] && ![oldValue isKindOfClass:NSNull.class] && [property.name isEqualToString:@"cancleTime"]) {
+    if ([oldValue isNotBlank] && [property.name isEqualToString:@"cancleTime"]) {
         NSDate *detaildate = [NSDate dateWithTimeIntervalSince1970:([oldValue doubleValue]/1000)];
         NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
         [dateFormatter setDateFormat:@"yyyy-MM-dd HH:mm"];
@@ -348,33 +353,34 @@ MJCodingImplementation
 }
 - (id)mj_newValueFromOldValue:(id)oldValue property:(MJProperty *)property
 {
-    oldValue = [NSString stringWithFormat:@"%@",oldValue];
+    BOOL isNULL = [oldValue isKindOfClass:NSNull.class] || oldValue == nil;
+    oldValue = [NSString stringWithFormat:@"%@",isNULL?@"":oldValue];
-    if (![oldValue isKindOfClass:NSNull.class] && [property.name isEqualToString:@"createTime"]) {
+    if ([oldValue isNotBlank] && [property.name isEqualToString:@"createTime"]) {
         NSDate *detaildate = [NSDate dateWithTimeIntervalSince1970:([oldValue doubleValue]/1000)];
         NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
         [dateFormatter setDateFormat:@"yyyy-MM-dd HH:mm"];
         self.createTimeString = [dateFormatter stringFromDate:detaildate];
     }
-    if (![oldValue isEqualToString:@"<null>"] && ![oldValue isKindOfClass:NSNull.class] && [property.name isEqualToString:@"endTime"]) {
+    if ([oldValue isNotBlank] && [property.name isEqualToString:@"endTime"]) {
         NSDate *detaildate = [NSDate dateWithTimeIntervalSince1970:([oldValue doubleValue]/1000)];
         NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
         [dateFormatter setDateFormat:@"yyyy-MM-dd HH:mm"];
         self.endTimeString = [dateFormatter stringFromDate:detaildate];
     }
-    if (![oldValue isEqualToString:@"<null>"] && ![oldValue isKindOfClass:NSNull.class] && [property.name isEqualToString:@"startTime"]) {
+    if ([oldValue isNotBlank] && [property.name isEqualToString:@"startTime"]) {
         NSDate *detaildate = [NSDate dateWithTimeIntervalSince1970:([oldValue doubleValue]/1000)];
         NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
         [dateFormatter setDateFormat:@"yyyy-MM-dd HH:mm"];
         self.startTimeString = [dateFormatter stringFromDate:detaildate];
     }
-    if (![oldValue isEqualToString:@"<null>"] && ![oldValue isKindOfClass:NSNull.class] && [property.name isEqualToString:@"updateTime"]) {
+    if ([oldValue isNotBlank] && [property.name isEqualToString:@"updateTime"]) {
         NSDate *detaildate = [NSDate dateWithTimeIntervalSince1970:([oldValue doubleValue]/1000)];
         NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
         [dateFormatter setDateFormat:@"yyyy-MM-dd HH:mm"];
         self.updateTimeString = [dateFormatter stringFromDate:detaildate];
     }
-    if (![oldValue isKindOfClass:NSNull.class] && [property.name isEqualToString:@"signupEndTime"]) {
+    if ([oldValue isNotBlank]  && [property.name isEqualToString:@"signupEndTime"]) {
         NSDate *detaildate = [NSDate dateWithTimeIntervalSince1970:([oldValue doubleValue]/1000)];
         NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
         [dateFormatter setDateFormat:@"yyyy-MM-dd HH:mm"];
@@ -398,7 +404,9 @@ MJCodingImplementation
 - (id)mj_newValueFromOldValue:(id)oldValue property:(MJProperty *)property
 {
-    oldValue = [NSString stringWithFormat:@"%@",oldValue];
+    BOOL isNULL = [oldValue isKindOfClass:NSNull.class] || oldValue == nil;
+    oldValue = [NSString stringWithFormat:@"%@",isNULL?@"":oldValue];
+    
     if ([oldValue isNotBlank] && [property.name isEqualToString:@"createTime"]) {
         NSDate *detaildate = [NSDate dateWithTimeIntervalSince1970:([oldValue doubleValue]/1000)];
         NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
@@ -48,6 +48,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, strong) UIButton * delectBtn;
 @property (nonatomic, strong) UILabel * nameLabel;
 @property (nonatomic, strong) UILabel * lineLabel;
+@property (nonatomic, strong) UILabel * bottemLineLabel;
 @property (nonatomic, strong) UILabel * sexAgeLabel;
 @property (nonatomic, strong) UILabel * phoneLabel;
 @property (nonatomic, strong) UIButton * editButton;
@@ -195,6 +195,7 @@
         [self.mainView addSubview:self.phoneLabel];
         [self.mainView addSubview:self.delectBtn];
         [self.mainView addSubview:self.editButton];
+        [self.mainView addSubview:self.bottemLineLabel];
     }
     return self;
 }
@@ -276,7 +277,7 @@
     [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.height.mas_equalTo(10);
         make.width.mas_equalTo(0.5);
     }];
     [self.nameLabel mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -284,6 +285,12 @@
         make.left.mas_equalTo(weakSelf.delectBtn.mas_right).offset(10);
         make.right.mas_equalTo(weakSelf.lineLabel.mas_left).offset(-5);
     }];
+    [self.bottemLineLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.mas_equalTo(weakSelf.mainView.mas_left).offset(5);
+        make.right.mas_equalTo(weakSelf.mainView.mas_right).offset(-5);
+        make.bottom.mas_equalTo(weakSelf.mainView.mas_bottom).offset(-1);
+        make.height.mas_equalTo(1);
+    }];
 }
 #pragma mark =
 -(UIView *)mainView
@@ -311,10 +318,18 @@
     if (!_lineLabel) {
         _lineLabel = [[UILabel alloc] init];
         _lineLabel.backgroundColor = UIColorHex(#C8C8C8);
-        _lineLabel.hidden = YES;
+        _lineLabel.hidden = NO;
     }
     return _lineLabel;
 }
+-(UILabel *)bottemLineLabel
+{
+    if (!_bottemLineLabel) {
+        _bottemLineLabel = [[UILabel alloc] init];
+        _bottemLineLabel.backgroundColor = UIColorHex(#F1F2F6);
+    }
+    return _bottemLineLabel;
+}
 -(UILabel *)sexAgeLabel
 {
     if (!_sexAgeLabel) {
@@ -334,8 +349,8 @@
         _phoneLabel.textColor = UIColorHex(#8A8A8A);
         _phoneLabel.lineBreakMode = NSLineBreakByTruncatingTail;
         _phoneLabel.numberOfLines = 1;
-        _phoneLabel.font = [UIFont systemFontOfSize:11];
-        _phoneLabel.font = [UIFont boldSystemFontOfSize:11];
+        _phoneLabel.font = [UIFont systemFontOfSize:13];
+        _phoneLabel.font = [UIFont boldSystemFontOfSize:13];
     }
     return _phoneLabel;
 }
@@ -639,12 +654,13 @@
         [QMUITips showError:@"数字输入错误" inView:[CNLiveCommuntTools cCommunt_currentViewController].view hideAfterDelay:2];
         return;
     }
-    
+    self.amoutField.text = [NSString stringWithFormat:@"%.2f",[self.amoutField.text floatValue]];
     if ([self.amoutField.text floatValue] >= 999999.99) {
         if (![self.amoutField.text isEqualToString:@"1000000.0"]
             && ![self.amoutField.text isEqualToString:@"1000000"]
             && ![self.amoutField.text isEqualToString:@"1000000.00"]) {
             [QMUITips showWithText:@"最高限额1000000元" inView:[CNLiveCommuntTools cCommunt_currentViewController].view hideAfterDelay:2];
+            self.amoutField.text = @"1000000.00";
             return;
         }
     }
@@ -655,7 +671,7 @@
     __weak typeof(self) weakSelf = self;
     if ([self.createModel.totalFee isNotBlank]
         && [self.createModel.totalFee integerValue] > 0) {
-        NSString * p = [NSString stringWithFormat:@"%.0f",([self.amoutField.text floatValue]*100)];
+        NSString * p = [NSString stringWithFormat:@"%ld",([self.amoutField.text integerValue]*100)];
         [CNLiveCommuntViewModel requestWithCommuntyTotalFeeOrderMentOrderId:self.createModel.idStr totalFee:p CompleterBlock:^(NSString * _Nonnull payUrl) {
             NSString * p = [NSString stringWithFormat:@"%.2f",[self.amoutField.text floatValue]];
             weakSelf.modalView = [CNLiveCommuntSignUpView showQrTipSuccessViewWithPrice:p PayUrl:payUrl CompleterBlock:^{
@@ -663,10 +679,11 @@
                 [[NSNotificationCenter defaultCenter] removeObserver:weakSelf name:@"kIMAMSG_ScanPaySuccessNotification" object:nil];
             }];
             [[NSNotificationCenter defaultCenter] addObserver:weakSelf selector:@selector(hiddenModalViewNotification:) name:@"kIMAMSG_ScanPaySuccessNotification" object:nil];
+            if (weakSelf.reloadBlock) weakSelf.reloadBlock();
         }];
     }else{
         [CNLiveCommuntSignUpView showAlertViewWithMessage:@"请仔细核对金额，确认后将不可修改" CompleterBlock:^{
-            NSString * p = [NSString stringWithFormat:@"%.0f",([weakSelf.amoutField.text floatValue]*100)];
+            NSString * p = [NSString stringWithFormat:@"%ld",([weakSelf.amoutField.text integerValue]*100)];
             weakSelf.amoutField.enabled = NO;
             weakSelf.amoutField.textColor = UIColorHex(#c8c8c8);
             [CNLiveCommuntViewModel requestWithCommuntyTotalFeeOrderMentOrderId:weakSelf.createModel.idStr totalFee:p CompleterBlock:^(NSString * _Nonnull payUrl) {
@@ -676,6 +693,7 @@
                     [[NSNotificationCenter defaultCenter] removeObserver:weakSelf name:@"kIMAMSG_ScanPaySuccessNotification" object:nil];
                 }];
                 [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(hiddenModalViewNotification:) name:@"kIMAMSG_ScanPaySuccessNotification" object:nil];
+                if (weakSelf.reloadBlock) weakSelf.reloadBlock();
             }];
         }];
     }
@@ -690,7 +708,7 @@
         [QMUITips showError:@"数字输入错误" inView:[CNLiveCommuntTools cCommunt_currentViewController].view hideAfterDelay:2];
         return;
     }
-    
+    self.amoutField.text = [NSString stringWithFormat:@"%.2f",[self.amoutField.text floatValue]];
     if ([self.amoutField.text floatValue] >= 999999.99) {
         if (![self.amoutField.text isEqualToString:@"1000000.0"]
             && ![self.amoutField.text isEqualToString:@"1000000"]
@@ -705,7 +723,7 @@
     }
     __weak typeof(self) weakSelf = self;
     [CNLiveCommuntSignUpView showAlertViewWithMessage:@"请仔细核对金额，确认后将不可修改" CompleterBlock:^{
-        NSString * p = [NSString stringWithFormat:@"%.0f",([weakSelf.amoutField.text floatValue]*100)];
+        NSString * p = [NSString stringWithFormat:@"%ld",([self.amoutField.text integerValue]*100)];
         weakSelf.amoutField.enabled = NO;
         weakSelf.amoutField.textColor = UIColorHex(#c8c8c8);
         [CNLiveCommuntViewModel requestWithCommuntyTotalFeeOrderMentOrderId:weakSelf.createModel.idStr totalFee:p CompleterBlock:^(NSString * _Nonnull payUrl) {
@@ -729,9 +747,9 @@
 - (BOOL)textFieldShouldEndEditing:(UITextField *)textField
 {
     if ([textField.text isNotBlank] && textField.text.length > 10) {
-        [QMUITips showWithText:@"最长10位！超出部分会在输入完成时自动删除" inView:[CNLiveCommuntTools cCommunt_currentViewController].view hideAfterDelay:2];
+        [QMUITips showWithText:@"最高限额1000000.00元" inView:[CNLiveCommuntTools cCommunt_currentViewController].view hideAfterDelay:2];
         //如果是表情的话 这里容易截断显示
-        textField.text = [textField.text substringToIndex:10];
+        textField.text = @"1000000.00";
     }
     return YES;
 }
@@ -778,7 +796,6 @@
         _amoutField.font = [UIFont systemFontOfSize:14.0f];
         _amoutField.textColor = UIColorHex(#333333);
         _amoutField.clearButtonMode = UITextFieldViewModeWhileEditing;
-        _amoutField.clearsOnBeginEditing = YES;
         _amoutField.keyboardType = UIKeyboardTypeDefault;
         _amoutField.textAlignment = NSTextAlignmentLeft;
         _amoutField.keyboardType = UIKeyboardTypeDecimalPad;
@@ -337,7 +337,6 @@
     [self.priceLabel mas_makeConstraints:^(MASConstraintMaker *make) {
         make.bottom.mas_equalTo(weakSelf.mainView.mas_bottom).offset(-10);
         make.left.mas_equalTo(weakSelf.imgView.mas_right).offset(10);
-        make.right.mas_equalTo(weakSelf.evalButton.mas_right).offset(-10);
     }];
 }
 #pragma mark -
@@ -630,10 +629,15 @@
 -(void)setSubDict:(NSDictionary *)subDict
 {
     _subDict = subDict;
-    NSMutableAttributedString * nameString = [[NSMutableAttributedString alloc] initWithString:[NSString stringWithFormat:@"*%@",[subDict stringValueForKey:@"name" default:@""]]];
-    [nameString addAttribute:NSForegroundColorAttributeName value:UIColorHex(#CD0302) range:[nameString.string rangeOfString:@"*"]];
-    [nameString addAttribute:NSForegroundColorAttributeName value:UIColorHex(#333333) range:[nameString.string rangeOfString:[subDict stringValueForKey:@"name" default:@""]]];
-    self.nameLabel.attributedText = nameString;
+    NSString * name = [subDict stringValueForKey:@"name" default:@""];
+    if (![name isEqualToString:@"问题描述"]) {
+        NSMutableAttributedString * nameString = [[NSMutableAttributedString alloc] initWithString:[NSString stringWithFormat:@"*%@",[subDict stringValueForKey:@"name" default:@""]]];
+        [nameString addAttribute:NSForegroundColorAttributeName value:UIColorHex(#CD0302) range:[nameString.string rangeOfString:@"*"]];
+        [nameString addAttribute:NSForegroundColorAttributeName value:UIColorHex(#333333) range:[nameString.string rangeOfString:[subDict stringValueForKey:@"name" default:@""]]];
+        self.nameLabel.attributedText = nameString;
+    }else{
+        self.nameLabel.text = name;
+    }
     self.contentField.keyboardType = [self.nameLabel.text isEqualToString:@"*联系电话"]?UIKeyboardTypeNumberPad:UIKeyboardTypeDefault;
     self.contentField.keyboardType = [self.nameLabel.text isEqualToString:@"*年龄"]?UIKeyboardTypeNumberPad:UIKeyboardTypeDefault;
     self.contentField.keyboardType = [self.nameLabel.text isEqualToString:@"*联系方式"]?UIKeyboardTypeNumberPad:UIKeyboardTypeDefault;
@@ -855,12 +859,12 @@
     if (!_contentField) {
         _contentField = [[UITextField alloc] init];
         _contentField.backgroundColor = [UIColor whiteColor];
-        _contentField.font = [UIFont systemFontOfSize:14.0f];
+        _contentField.font = [UIFont systemFontOfSize:16.0f];
         _contentField.textColor = UIColorHex(#333333);
         _contentField.clearButtonMode = UITextFieldViewModeWhileEditing;
         _contentField.textAlignment = NSTextAlignmentRight;
         _contentField.adjustsFontSizeToFitWidth = YES;
-        _contentField.minimumFontSize = 12;
+        _contentField.minimumFontSize = 13;
         _contentField.returnKeyType = UIReturnKeyNext;
         _contentField.hidden = YES;
         _contentField.delegate = self;
@@ -877,7 +881,7 @@
         _descTextView.placeholderColor = UIColorHex(#C8C8C8);
         _descTextView.placeholder = @"您遇到什么问题，请留言";
         _descTextView.textColor = UIColorHex(#333333);
-        _descTextView.font = [UIFont systemFontOfSize:14.0f];
+        _descTextView.font = [UIFont systemFontOfSize:16.0f];
         _descTextView.returnKeyType = UIReturnKeyDone;
         _descTextView.maximumTextLength = 100;
         _descTextView.textContainerInset = UIEdgeInsetsMake(2.5, 2.5, 2.5, 2.5);
@@ -103,8 +103,8 @@
             @{@"name":@"联系人",@"placeholder":@"请输入姓名",@"isClick":@NO,@"isTextField":@YES,@"isTextView":@NO,@"isImage":@NO,@"isChick":@NO},
             @{@"name":@"联系地址",@"placeholder":@"请输入联系地址",@"isClick":@NO,@"isTextField":@YES,@"isTextView":@NO,@"isImage":@NO,@"isChick":@NO},
             @{@"name":@"联系电话",@"placeholder":@"请输入联系电话",@"isClick":@NO,@"isTextField":@YES,@"isTextView":@NO,@"isImage":@NO,@"isChick":@NO},
-            @{@"name":@"报修项目",@"placeholder":@"请输入报修项目",@"isClick":@YES,@"isTextField":@NO,@"isTextView":@NO,@"isImage":@NO,@"isChick":@NO},
-            @{@"name":@"上门时间",@"placeholder":@"请输入上门时间",@"isClick":@YES,@"isTextField":@NO,@"isTextView":@NO,@"isImage":@NO,@"isChick":@NO},
+            @{@"name":@"报修项目",@"placeholder":@"请选择报修项目",@"isClick":@YES,@"isTextField":@NO,@"isTextView":@NO,@"isImage":@NO,@"isChick":@NO},
+            @{@"name":@"上门时间",@"placeholder":@"请选择上门时间",@"isClick":@YES,@"isTextField":@NO,@"isTextView":@NO,@"isImage":@NO,@"isChick":@NO},
             @{@"name":@"问题描述",@"placeholder":@"您遇到什么问题，请留言",@"isClick":@NO,@"isTextField":@NO,@"isTextView":@YES,@"isImage":@NO,@"isChick":@NO},
 //            @{@"name":@"",@"placeholder":@"",@"isClick":@NO,@"isTextField":@NO,@"isTextView":@NO,@"isImage":@YES,@"isChick":@NO},
         ]];
@@ -191,8 +191,8 @@
             NSString * startString = [[timeString componentsSeparatedByString:@" "].lastObject componentsSeparatedByString:@"~"].firstObject;
             NSString * endString = [[timeString componentsSeparatedByString:@" "].lastObject componentsSeparatedByString:@"~"].lastObject;
             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];
+                NSString * temp_start_time = [NSString stringWithFormat:@"%@ %@:00",dayString,startString];
+                NSString * temp_end_time = [NSString stringWithFormat:@"%@ %@: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{
@@ -205,14 +205,15 @@
     if ([[paramDict allValues] containsObject:@""]) {
         NSInteger index = [[paramDict allValues] indexOfObject:@""];
         NSString * key = [[paramDict allKeys] objectAtIndex:index];
-        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:@"请选择上门时间"];
-        if ([key isEqualToString:@"remark"]) [QMUITips showWithText:@"问题描述不能为空"];
-        return;
+        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;
+        }
     }
     __weak typeof(self) weakSelf = self;
     [CNLiveCommuntViewModel requestWithCommuntyHomeMaintenPushWithParamDict:paramDict nbhdId:self.nbhdId CompleterBlock:^(CNLiveCommuntyActivityMaintainsCreateModel * _Nonnull createModel) {
@@ -12,6 +12,7 @@
 @property (nonatomic, assign) CNLiveCommuntListShowType showType;
 @property (nonatomic, strong) CNLiveRefreshFooter * footerView;
 @property (nonatomic, strong) NSMutableArray * dataArray;
+@property (nonatomic, strong) NSIndexPath * selectIndexPath;
 @property (nonatomic, copy) NSString * nbhdId;
 @property (nonatomic, assign) NSInteger index;
 @property (nonatomic, assign) NSInteger page;
@@ -44,6 +45,7 @@
 -(void)viewDidAppear:(BOOL)animated
 {
     [super viewDidAppear:animated];
+    self.page = 1;
     [self loadDataSourceWithPage:1 nbhdId:self.nbhdId index:self.index CompleterBlock:NULL];
 }
 - (void)viewDidLoad {
@@ -79,6 +81,11 @@
         [weakSelf.tableView.mj_footer endRefreshing];
         if (isLastPage) [weakSelf.tableView.mj_footer endRefreshingWithNoMoreData];
         if (page == 1 && weakSelf.dataArray.count == 0 && weakSelf.tableView.mj_footer) weakSelf.tableView.mj_footer = nil;
+        if (weakSelf.selectIndexPath) {
+            BOOL isEnough = weakSelf.dataArray.count <= weakSelf.selectIndexPath.row;
+            if (!isEnough) weakSelf.selectIndexPath = [NSIndexPath indexPathForRow:0 inSection:0];
+            [weakSelf.tableView scrollToRowAtIndexPath:weakSelf.selectIndexPath atScrollPosition:isEnough?UITableViewScrollPositionNone:UITableViewScrollPositionTop animated:NO];
+        }
     }];
 }
@@ -104,6 +111,10 @@
     [super layoutTableView];
 }
+-(void)dealloc
+{
+    self.selectIndexPath = nil;
+}
 #pragma mark - DZNEmptyDataSetSource Methods
 - (NSAttributedString *)titleForEmptyDataSet:(UIScrollView *)scrollView
 {
@@ -208,6 +219,7 @@
 -(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
 {
     if (self.showType == CNLiveCommuntListShowTypeRepair) {
+        self.selectIndexPath = indexPath;
         CNLiveCommuntyActivityRepairListModel * repairModel = self.dataArray[indexPath.row];
         if (self.index == 3) {
             CNLiveCommuntyOrderViewController * orderView = [[CNLiveCommuntyOrderViewController alloc] initWithShowType:CNLiveCommuntyOrderShowTypeListCompletOrder MaintenId:repairModel.idStr];
@@ -221,10 +233,12 @@
         }
     }
     if (self.showType == CNLiveCommuntListShowTypeRecord) {
+        self.selectIndexPath = indexPath;
         CNLiveCommuntyActivityRecordListModel * repairModel = self.dataArray[indexPath.row];
         [[CNLiveCommuntyModule shareInstance].protocol pushWebViewWithMainProjectWithActivityId:repairModel.handworkId];
     }
     if (self.showType == CNLiveCommuntListShowTypeHome) {
+        self.selectIndexPath = indexPath;
         CNLiveCommuntyActivityHomeListModel * listModel = self.dataArray[indexPath.row];
         [[CNLiveCommuntyModule shareInstance].protocol pushWebViewWithMainProjectWithActivityId:listModel.idStr];
     }
@@ -27,7 +27,18 @@
     }
     return self;
 }
-
+//-(void)viewDidAppear:(BOOL)animated
+//{
+//    [super viewDidAppear:animated];
+//    __weak typeof(self) weakSelf = self;
+//    [CNLiveCommuntViewModel requestWithCommuntySaveInfoUsersMentUserDict:@{} isSave:NO isNew:NO CompleterBlock:^(NSArray * _Nonnull userArray, BOOL isSave) {
+//        for (NSDictionary * userDict in userArray) {
+////            [weakSelf.userArray addObjectsFromArray:userArray];
+////            [weakSelf.tableView reloadData];
+////            [weakSelf setupWithBottemView:weakSelf.userArray.count];
+//        }
+//    }];
+//}
 - (void)viewDidLoad {
     [super viewDidLoad];
     // Do any additional setup after loading the view.
@@ -45,8 +56,23 @@
             [[weakSelf displayViewController] dsPopViewControllerAnimated:YES];
         }
     }];
+    
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(handleChangeAction:) name:kCNLiveCommuntySaveChangeUserInfoNotification object:nil];
 }
+-(void)handleChangeAction:(NSNotification *)note
+{
+    NSDictionary * paramDict = (NSDictionary *)note.object;
+    NSString * idStr = [paramDict stringValueForKey:@"id" default:@""];
+    for (NSDictionary * subDict in self.userArray) {
+        NSString * idStr_temp = [subDict stringValueForKey:@"id" default:@""];
+        if ([idStr_temp isEqualToString:idStr]) {
+            [self.userArray replaceObjectAtIndex:[self.userArray indexOfObject:subDict] withObject:paramDict];
+            [self.tableView reloadData];
+            return;
+        }
+    }
+}
 -(void)addTopNavigationWithView
 {
     if ([self.detailModel.mobile isNotBlank]) {
@@ -74,14 +100,17 @@
 -(void)addUserAction:(UIButton *)button
 {
     __weak typeof(self) weakSelf = self;
-    CNLiveCommuntyUserListViewController * userVC = [[CNLiveCommuntyUserListViewController alloc] initWithStyle:UITableViewStyleGrouped selectArray:self.userArray CompleterBlock:^(NSArray * _Nonnull userArray) {
-//        [weakSelf.userArray removeAllObjects];
-//        [weakSelf.userArray addObjectsFromArray:userArray];
+    NSMutableArray * tempArray = [[NSMutableArray alloc] initWithArray:self.userArray];
+    CNLiveCommuntyUserListViewController * userVC = [[CNLiveCommuntyUserListViewController alloc] initWithStyle:UITableViewStyleGrouped selectArray:tempArray CompleterBlock:^(NSArray * _Nonnull userArray) {
+        [weakSelf.userArray removeAllObjects];
+        [weakSelf.userArray addObjectsFromArray:userArray];
+        weakSelf.userArray = [[[weakSelf.userArray reverseObjectEnumerator] allObjects] mutableCopy];
         [weakSelf.tableView reloadData];
         [weakSelf setupWithBottemView:weakSelf.userArray.count];
     }];
     [self.navigationController pushViewController:userVC animated:YES];
 }
+
 - (void)initTableView
 {
     [super initTableView];
@@ -95,6 +124,7 @@
 }
 -(void)dealloc
 {
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:kCNLiveCommuntySaveChangeUserInfoNotification object:nil];
     [[NSNotificationCenter defaultCenter] removeObserver:self name:@"kIMAMSG_CommunityPaySuccessNotification" object:nil];
 }
 -(void)layoutTableView
@@ -236,6 +266,7 @@
     if (indexPath.section == 0) {
         CNLiveCommuntSignUpUserViewCell * userView = [CNLiveCommuntSignUpUserViewCell setTableView:tableView selectArray:@[] isAddUser:NO UserDict:self.userArray[indexPath.row]];
         userView.delegate = self;
+        userView.bottemLineLabel.hidden = (indexPath.row == self.userArray.count - 1);
         return userView;
     }else{
         __weak typeof(self) weakSelf = self;
@@ -42,7 +42,7 @@
     // Do any additional setup after loading the view.
     self.selectColor = [UIColor colorWithHexString:@"0xCD0302"];
     self.normalColor = [UIColor colorWithHexString:@"0x979797"];
-    
+    self.hidesBottomBarWhenPushed = YES;
     self.tabBar.backgroundColor = UIColorHex(#f9f9f9);
     __weak typeof(self) weakSelf = self;
@@ -79,6 +79,7 @@
             if (createModel) {
                 weakSelf.createMdoel = createModel;
                 if (weakSelf.isChat) weakSelf.showType = weakSelf.createMdoel.showType;
+                if ([weakSelf.createMdoel.repairId isNotBlank] && ![weakSelf.createMdoel.repairId isEqualToString:[CNUserInfoManager manager].userInfoModel.uid]) weakSelf.showType = CNLiveCommuntyOrderShowTypeChatYetOrder;
                 [weakSelf setupWithBottemView];
                 [weakSelf setupWithNaviView];
                 [weakSelf.tableView reloadData];
@@ -89,8 +90,7 @@
 -(void)setupWithNaviView
 {
     if (self.showType == CNLiveCommuntyOrderShowTypeListYetOrder
-        || self.showType == CNLiveCommuntyOrderShowTypeChatReadyOrder
-        || [self.createMdoel.userId isEqualToString:[CNUserInfoManager manager].userInfoModel.uid]) {
+        || self.showType == CNLiveCommuntyOrderShowTypeChatReadyOrder) {
         NSString * name = @"";
         UIColor * titleColor = [UIColor whiteColor];
         if (self.showType == CNLiveCommuntyOrderShowTypeListYetOrder
@@ -98,11 +98,21 @@
             name = @"咨询电话";
             titleColor = UIColorHex(#0091FF);
         }
-        if (self.showType == CNLiveCommuntyOrderShowTypeChatReadyOrder
+        if (self.showType == CNLiveCommuntyOrderShowTypeListYetOrder
             && [self.createMdoel.userId isEqualToString:[CNUserInfoManager manager].userInfoModel.uid]) {
             name = @"取消订单";
             titleColor = UIColorHex(#F5A623FF);
         }
+        if (self.showType == CNLiveCommuntyOrderShowTypeChatReadyOrder
+            && [self.createMdoel.repairId isEqualToString:[CNUserInfoManager manager].userInfoModel.uid]) {
+            name = @"取消订单";
+            titleColor = UIColorHex(#F5A623FF);
+        }
+        if (self.showType == CNLiveCommuntyOrderShowTypeChatReadyOrder
+            && ![self.createMdoel.repairId isEqualToString:[CNUserInfoManager manager].userInfoModel.uid]) {
+            return;
+        }
+        if ([self.createMdoel.totalFee isNotBlank] && [self.createMdoel.totalFee integerValue] > 0) return;
         UIButton * submiteBtn = [UIButton buttonWithType:UIButtonTypeCustom];
         submiteBtn.frame = CGRectMake(0, 0, 50, 14);
         [submiteBtn setTitle:name forState:UIControlStateNormal];
@@ -157,9 +167,17 @@
                 make.height.mas_equalTo(36);
             }];
         }
+        if ([self.createMdoel.repairId isNotBlank] && ![self.createMdoel.repairId isEqualToString:[CNUserInfoManager manager].userInfoModel.uid]) {
+            payString = @"已接单";
+            self.payButton.backgroundColor = UIColorHex(#D7D7D7);
+            self.payButton.userInteractionEnabled = NO;
+        }else{
+            self.payButton.userInteractionEnabled = YES;
+        }
         [self.payButton setTitle:payString forState:UIControlStateNormal];
         [self.payButton setTitle:payString forState:UIControlStateHighlighted];
+        
         if (self.showType == CNLiveCommuntyOrderShowTypeChatReadyOrder && [self.createMdoel.totalFee isNotBlank] && [self.createMdoel.totalFee integerValue] > 0) {
             self.payButton.hidden = self.showType == CNLiveCommuntyOrderShowTypeChatCompletOrder;
             self.bottemView.hidden = self.showType == CNLiveCommuntyOrderShowTypeChatCompletOrder;
@@ -96,7 +96,15 @@
     NSMutableDictionary * paramDict = [[NSMutableDictionary alloc] initWithDictionary:self.userDict];
     for (int i = 0; i < self.dataSource.count; i ++) {
         CNLiveCommuntSubInputTableView * userCell = [self.tableView cellForRowAtIndexPath:[NSIndexPath indexPathForRow:i inSection:0]];
-        if (i == 0) [paramDict addString:[userCell.contentField.text isNotBlank]?userCell.contentField.text:@"" forKey:@"name"];
+        if (i == 0) {
+            NSString * name = [userCell.contentField.text isNotBlank]?userCell.contentField.text:@"";
+            if ([name isNotBlank]) {
+                [paramDict addString:name forKey:@"name"];
+            }else{
+                [QMUITips showWithText:@"联系人不能为空"];
+                return;
+            }
+        }
         if (i == 1) [paramDict addString:[userCell.sex isEqualToString:@"女"]?@"0":@"1" forKey:@"gender"];
         if (i == 2) {
             NSString * age = [userCell.contentField.text isNotBlank]?userCell.contentField.text:@"";
@@ -128,6 +136,7 @@
     __weak typeof(self) weakSelf = self;
     [CNLiveCommuntViewModel requestWithCommuntySaveInfoUsersMentUserDict:paramDict isSave:YES isNew:self.userDict.allKeys.count == 0 CompleterBlock:^(NSArray * _Nonnull userArray, BOOL isSave) {
+        [[NSNotificationCenter defaultCenter] postNotificationName:kCNLiveCommuntySaveChangeUserInfoNotification object:paramDict];
         [weakSelf.navigationController popViewControllerAnimated:YES];
     }];
 }
@@ -24,7 +24,6 @@
     [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];
     }];
 }
@@ -55,6 +54,7 @@
     [submiteBtn addTarget:self action:@selector(rightBarButtonAction:) forControlEvents:UIControlEventTouchUpInside];
     self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithCustomView:submiteBtn];
 }
+
 -(void)rightBarButtonAction:(UIButton *)button
 {
     CNLiveCommuntyUserEditViewController * editVC = [[CNLiveCommuntyUserEditViewController alloc] initWithUser:@{}];
@@ -186,6 +186,7 @@
 -(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
 {
     CNLiveCommuntSignUpUserViewCell * userView = [CNLiveCommuntSignUpUserViewCell setTableView:tableView selectArray:self.selectArray isAddUser:YES UserDict:self.userArray[indexPath.row]];
+    userView.bottemLineLabel.hidden = (indexPath.row == self.userArray.count - 1);
     userView.delegate = self;
     return userView;
 }
@@ -254,10 +254,10 @@
         NSMutableArray * tArray = [[NSMutableArray alloc] init];
         NSInteger start = i == 0 ? (components_h.hour-(components_h.hour%2)) : 0;
         for (int i = 0; i < 12; i++) {
-            [tArray addObject:[NSString stringWithFormat:@"%02ld~%02ld",start,start+2]];
+            [tArray addObject:[NSString stringWithFormat:@"%02ld:00~%02ld:00",start,start+2]];
             start += 2;
         }
-        if (i == 0) [tArray removeObjectsInRange:NSMakeRange([tArray indexOfObject:@"22~24"]+1, tArray.count - [tArray indexOfObject:@"22~24"] - 1)];
+        if (i == 0) [tArray removeObjectsInRange:NSMakeRange([tArray indexOfObject:@"22:00~24:00"]+1, tArray.count - [tArray indexOfObject:@"22:00~24:00"] - 1)];
         NSTimeInterval secondsPerDay = i * 24*60*60;
         NSDate *curDate = [NSDate dateWithTimeInterval:secondsPerDay sinceDate:[NSDate date]];
@@ -377,7 +377,7 @@
     [CNLiveNetworking setupShowDataResult:NO];
     [CNLiveNetworking setupShowResult:YES];
     [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodPOST URLString:CNCCommuntPayMentTotalFeeOrderContentURL Param:paramDict CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
-        [QMUITips hideAllTipsInView:[CNLiveCommuntTools cCommunt_currentViewController].view.viewController.view];
+        [QMUITips hideAllTipsInView:[CNLiveCommuntTools cCommunt_currentViewController].view];
         [CNLiveCommuntViewModel communty_chooseRequestWithResponseObject:responseObject Error:error isData:YES CompleterBlock:^(id responseObject) {
             if (responseObject) {
                 NSString * timestamp = [CNLiveCommuntViewModel getNowTimestamp];
@@ -437,11 +437,37 @@
 /// @param completerBlock 返回结果
 +(void)requestWithCommuntySaveInfoUsersMentUserDict:(NSDictionary *)userDict isSave:(BOOL)isSave isNew:(BOOL)isNew CompleterBlock:(void(^)(NSArray * userArray, BOOL isSave))completerBlock
 {
-    NSString * cacheKey = [NSString stringWithFormat:@"%@/kCNLiveCommuntySaveInfoUsersMentKey04",[CNUserInfoManager manager].userInfoModel.uid];
+    NSString * cacheKey = [NSString stringWithFormat:@"%@/kCNLiveCommuntySaveInfoUsersMentKey06",[CNUserInfoManager manager].userInfoModel.uid];
     if (isSave) {
         if ([userDict allKeys].count > 0 && [userDict allValues].count > 0) {
             NSString * save_string = [NSString stringWithFormat:@"%@",[CNLiveRespCacheManager objectCacheWithFileName:cacheKey]];
             NSMutableArray * tempArray = [[NSMutableArray alloc] initWithArray:[save_string mj_JSONObject]];
+            if (![userDict containsObjectForKey:@"id"] && isNew) {
+                NSString *timeSp = [NSString stringWithFormat:@"%ld",(long)[[NSDate date] timeIntervalSince1970]];
+                NSMutableDictionary * tempDict = [[NSMutableDictionary alloc] initWithDictionary:userDict];
+                [tempDict addString:timeSp forKey:@"id"];
+                [tempArray addObject:tempDict];
+                NSString * user_info = [tempArray mj_JSONString];
+                [CNLiveRespCacheManager cachePathWithObject:user_info FileName:cacheKey];
+                if (completerBlock) completerBlock(@[],isSave);
+            }else{
+                NSString * idStr = [userDict stringValueForKey:@"id" default:@""];
+                NSMutableArray * tempArray01 = [[NSMutableArray alloc] initWithArray:tempArray];
+                for (NSDictionary * subDict in tempArray) {
+                    NSString * idStr_temp = [subDict stringValueForKey:@"id" default:@""];
+                    if ([idStr isEqualToString:idStr_temp]) {
+                        [tempArray01 replaceObjectAtIndex:[tempArray indexOfObject:subDict] withObject:userDict];
+                        break;
+                    }
+                }
+                tempArray = tempArray01;
+                NSString * user_info = [tempArray mj_JSONString];
+                [CNLiveRespCacheManager cachePathWithObject:user_info FileName:cacheKey];
+                if (completerBlock) completerBlock(@[],isSave);
+            }
+
+            
+            /*
             if (!isNew) {
                 BOOL isReplace = YES;
                 NSString * i_nameString = [userDict stringValueForKey:@"name" default:@""];
@@ -472,9 +498,8 @@
                 }
                 if (!isEqual_dict) [tempArray addObject:userDict];
             }
-            NSString * user_info = [tempArray mj_JSONString];
-            [CNLiveRespCacheManager cachePathWithObject:user_info FileName:cacheKey];
-            if (completerBlock) completerBlock(@[],isSave);
+             */
+
         }
     }else{
         NSString * save_string = [NSString stringWithFormat:@"%@",[CNLiveRespCacheManager objectCacheWithFileName:cacheKey]];
@@ -25,6 +25,7 @@
 		71719F9F1E33DC2100824A3D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 71719F9D1E33DC2100824A3D /* LaunchScreen.storyboard */; };
 		791464F727C4843600D58C68 /* CNLIVEMainViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 791464F427C4843600D58C68 /* CNLIVEMainViewController.m */; };
 		791464F827C4843600D58C68 /* CNLiveCommunitModuleImpl.m in Sources */ = {isa = PBXBuildFile; fileRef = 791464F627C4843600D58C68 /* CNLiveCommunitModuleImpl.m */; };
+		7947273527D0693B002BE846 /* CNLIVETabberViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7947273427D0693B002BE846 /* CNLIVETabberViewController.m */; };
 		873B8AEB1B1F5CCA007FD442 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 873B8AEA1B1F5CCA007FD442 /* Main.storyboard */; };
 /* End PBXBuildFile section */
@@ -67,6 +68,8 @@
 		791464F427C4843600D58C68 /* CNLIVEMainViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CNLIVEMainViewController.m; sourceTree = "<group>"; };
 		791464F527C4843600D58C68 /* CNLiveCommunitModuleImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CNLiveCommunitModuleImpl.h; sourceTree = "<group>"; };
 		791464F627C4843600D58C68 /* CNLiveCommunitModuleImpl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CNLiveCommunitModuleImpl.m; sourceTree = "<group>"; };
+		7947273327D0693B002BE846 /* CNLIVETabberViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CNLIVETabberViewController.h; sourceTree = "<group>"; };
+		7947273427D0693B002BE846 /* CNLIVETabberViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CNLIVETabberViewController.m; sourceTree = "<group>"; };
 		79EA711F7A32917A3445172F /* Pods_CNLiveCommuntyModule_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_CNLiveCommuntyModule_Tests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		873B8AEA1B1F5CCA007FD442 /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = Main.storyboard; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
 		A3F1027952916F49DBC7AEB2 /* Pods-CNLiveCommuntyModule_Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-CNLiveCommuntyModule_Tests.release.xcconfig"; path = "Target Support Files/Pods-CNLiveCommuntyModule_Tests/Pods-CNLiveCommuntyModule_Tests.release.xcconfig"; sourceTree = "<group>"; };
@@ -154,6 +157,8 @@
 				873B8AEA1B1F5CCA007FD442 /* Main.storyboard */,
 				6003F5A5195388D20070C39A /* CNLIVEViewController.h */,
 				6003F5A6195388D20070C39A /* CNLIVEViewController.m */,
+				7947273327D0693B002BE846 /* CNLIVETabberViewController.h */,
+				7947273427D0693B002BE846 /* CNLIVETabberViewController.m */,
 				71719F9D1E33DC2100824A3D /* LaunchScreen.storyboard */,
 				6003F5A8195388D20070C39A /* Images.xcassets */,
 				791464F527C4843600D58C68 /* CNLiveCommunitModuleImpl.h */,
@@ -479,6 +484,7 @@
 				6003F59E195388D20070C39A /* CNLIVEAppDelegate.m in Sources */,
 				6003F5A7195388D20070C39A /* CNLIVEViewController.m in Sources */,
 				791464F727C4843600D58C68 /* CNLIVEMainViewController.m in Sources */,
+				7947273527D0693B002BE846 /* CNLIVETabberViewController.m in Sources */,
 				6003F59A195388D20070C39A /* main.m in Sources */,
 				791464F827C4843600D58C68 /* CNLiveCommunitModuleImpl.m in Sources */,
 			);
@@ -14,6 +14,7 @@
 #import "CNLIVEViewController.h"
 #import <IQKeyboardManager/IQKeyboardManager.h>
 #import "CNLiveCommuntViewController.h"
+#import "CNLIVETabberViewController.h"
 @implementation CNLIVEAppDelegate
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
@@ -23,13 +24,13 @@
     [IQKeyboardManager sharedManager].enable = YES;
     [IQKeyboardManager sharedManager].enableAutoToolbar = YES;
-    [CNUserInfoManager manager].userInfoModel.uid = @"10458139";//@"145680";//@"395098";//@"10545988";//@"353001";//@"353417";//@"10511059";//@"10537318";//@"10499533";//@"11973842"
+    [CNUserInfoManager manager].userInfoModel.uid = @"10458139";//@"145680";//@"395098";//@"10545988";//@"353001";//@"353417";//@"10511059";//@"10537318";//@"10499533";//@"11973842";//@"1342671"
 //    [[NSUserDefaults standardUserDefaults] setObject:@"38" forKey:@"kCNLiveCommuntyNBhdIdIdentifier"];
 //    [[NSUserDefaults standardUserDefaults] synchronize];
     [self setParamNet];
-    UINavigationController *navCtrl = [[QMUINavigationController alloc] initWithRootViewController:[[CNLIVEViewController alloc] init]];
+    UINavigationController *navCtrl = [[UINavigationController alloc] initWithRootViewController:[[CNLIVETabberViewController alloc] init]];
     self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
     self.window.rootViewController = navCtrl;
+//
+//  CNLIVETabberViewController.h
+//  CNLiveCommuntyModule_Example
+//
+//  Created by open on 2022/3/3.
+//  Copyright © 2022 woshiliushiyu. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface CNLIVETabberViewController : UITabBarController
+
+@end
+
+NS_ASSUME_NONNULL_END
+//
+//  CNLIVETabberViewController.m
+//  CNLiveCommuntyModule_Example
+//
+//  Created by open on 2022/3/3.
+//  Copyright © 2022 woshiliushiyu. All rights reserved.
+//
+
+#import "CNLIVETabberViewController.h"
+#import "CNLIVEViewController.h"
+@interface CNLIVETabberViewController ()
+
+@end
+
+@implementation CNLIVETabberViewController
+
+- (void)viewWillAppear:(BOOL)animated{
+    [super viewWillAppear:animated];
+    [self.navigationController.navigationBar setHidden:YES];
+}
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    // Do any additional setup after loading the view.
+    [self addChildVC:[[CNLIVEViewController alloc] init] withTitle:@"第一个"];
+    [self addChildVC:[[CNLIVEViewController alloc] init] withTitle:@"第二个"];
+    [self addChildVC:[[CNLIVEViewController alloc] init] withTitle:@"第三个"];
+}
+-(void)addChildVC:(UIViewController *)VC withTitle:(NSString *)title{
+
+    VC.title = title;
+    UINavigationController *mainVC = [[UINavigationController alloc]initWithRootViewController:VC];
+    
+    [self addChildViewController:mainVC];
+
+}
+
+@end
@@ -5,7 +5,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleDisplayName</key>
-	<string>${PRODUCT_NAME}</string>
+	<string>社区</string>
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIdentifier</key>
@@ -24,6 +24,35 @@
 	<string>1.0</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
+	<key>NSBluetoothAlwaysUsageDescription</key>
+	<string>需要允许开启蓝牙才能对音箱使用配对及配网功能</string>
+	<key>NSBluetoothPeripheralUsageDescription</key>
+	<string>需要允许开启蓝牙才能对音箱使用配对及配网功能</string>
+	<key>NSCalendarsUsageDescription</key>
+	<string>需要允许访问日历才能使用服务号功能</string>
+	<key>NSCameraUsageDescription</key>
+	<string>需要允许开启相机才能在发布生活圈或聊天时使用录制视频和拍照功能</string>
+	<key>NSContactsUsageDescription</key>
+	<string>需要允许访问通讯录才能获取手机联系人中的网家家用户</string>
+	<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
+	<string>需要允许使用您的位置信息才能在发布生活圈、发布目击者、聊天发送位置、线上徒步赛事等功能获取您所在的城市</string>
+	<key>NSLocationAlwaysUsageDescription</key>
+	<string>需要允许使用您的位置信息才能在发布生活圈、发布目击者、聊天发送位置、线上徒步赛事等功能获取您所在的城市</string>
+	<key>NSLocationWhenInUseUsageDescription</key>
+	<string>需要允许使用您的位置信息才能在发布生活圈、发布目击者、聊天发送位置、线上徒步赛事等功能获取您所在的城市</string>
+	<key>NSMicrophoneUsageDescription</key>
+	<string>需要允许开启麦克风才能使用录制视频和语音等服务</string>
+	<key>NSMotionUsageDescription</key>
+	<string>需要允许访问运动与健身才能在亲情群健康步数、走路活动或者参加线上跑步赛事时记录您的步数信息</string>
+	<key>NSPhotoLibraryAddUsageDescription</key>
+	<string>需要允许打开相册才能访问相册照片和保存照片</string>
+	<key>NSPhotoLibraryUsageDescription</key>
+	<string>需要允许打开相册才能访问相册照片和保存照片</string>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>
@@ -32,35 +61,6 @@
 	<array>
 		<string>armv7</string>
 	</array>
-    <key>NSAppTransportSecurity</key>
-    <dict>
-        <key>NSAllowsArbitraryLoads</key>
-        <true/>
-    </dict>
-    <key>NSBluetoothAlwaysUsageDescription</key>
-    <string>需要允许开启蓝牙才能对音箱使用配对及配网功能</string>
-    <key>NSBluetoothPeripheralUsageDescription</key>
-    <string>需要允许开启蓝牙才能对音箱使用配对及配网功能</string>
-    <key>NSCalendarsUsageDescription</key>
-    <string>需要允许访问日历才能使用服务号功能</string>
-    <key>NSCameraUsageDescription</key>
-    <string>需要允许开启相机才能在发布生活圈或聊天时使用录制视频和拍照功能</string>
-    <key>NSContactsUsageDescription</key>
-    <string>需要允许访问通讯录才能获取手机联系人中的网家家用户</string>
-    <key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
-    <string>需要允许使用您的位置信息才能在发布生活圈、发布目击者、聊天发送位置、线上徒步赛事等功能获取您所在的城市</string>
-    <key>NSLocationAlwaysUsageDescription</key>
-    <string>需要允许使用您的位置信息才能在发布生活圈、发布目击者、聊天发送位置、线上徒步赛事等功能获取您所在的城市</string>
-    <key>NSLocationWhenInUseUsageDescription</key>
-    <string>需要允许使用您的位置信息才能在发布生活圈、发布目击者、聊天发送位置、线上徒步赛事等功能获取您所在的城市</string>
-    <key>NSMicrophoneUsageDescription</key>
-    <string>需要允许开启麦克风才能使用录制视频和语音等服务</string>
-    <key>NSMotionUsageDescription</key>
-    <string>需要允许访问运动与健身才能在亲情群健康步数、走路活动或者参加线上跑步赛事时记录您的步数信息</string>
-    <key>NSPhotoLibraryAddUsageDescription</key>
-    <string>需要允许打开相册才能访问相册照片和保存照片</string>
-    <key>NSPhotoLibraryUsageDescription</key>
-    <string>需要允许打开相册才能访问相册照片和保存照片</string>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>