添加图片预览

liushiyu
1 parent 78024900
Showing 16 changed files with 340 additions and 110 deletions
CNLiveCommuntyModule.podspec
CNLiveCommuntyModule/Classes/Core/CNLiveCommunitHeader.h
CNLiveCommuntyModule/Classes/Model/CNLiveCommuntyHomeModel.h
CNLiveCommuntyModule/Classes/View/CNLiveCommuntSubView.h
CNLiveCommuntyModule/Classes/View/CNLiveCommuntSubView.m
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntEvaluaViewController.m
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntInformViewController.m
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntListViewController.m
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntViewController.m
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntyOrderViewController.m
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntyUserEditViewController.m
CNLiveCommuntyModule/Classes/ViewModel/CNLiveCommuntViewModel.m
Example/CNLiveCommuntyModule.xcodeproj/project.pbxproj
Example/CNLiveCommuntyModule/CNLIVEAppDelegate.m
Example/CNLiveCommuntyModule/CNLIVEViewController.m
Example/CNLiveCommuntyModule/main.m
@@ -75,6 +75,8 @@ TODO: Add long description of the pod here.
     s.dependency 'DSBaseModule'
     # 自定义 UI
     s.dependency 'CNLiveCustomUI'
+    # 图片视频预览器
+    s.dependency 'CNLivePhotoBrowser'
 #    #输入控制器
     s.dependency 'CNLiveNewTripartiteManagement/IQKeyboardManager'
 end
@@ -16,6 +16,7 @@
 #import <JXPagingView/JXPagerView.h>
 #import <Masonry/Masonry.h>
 #import <YYText/YYText.h>
+#import <CNLivePhotoBrowser/CNLivePhotoBrowser.h>
 #import <CNLiveUploadManager/CNLiveUploadManager.h>
 #import <CNLiveBusinessTools/CNLiveBusinessTools.h>
 #import <CNLiveBusinessTools/CNLiveRespCacheManager.h>
@@ -158,6 +158,8 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, copy) NSString *remark;
 @property (nonatomic, copy) NSString *name;
 @property (nonatomic, copy) NSString *mobile;
+@property (nonatomic, copy) NSString *img;
+@property (nonatomic, strong) NSMutableArray *imgs;
 @property (nonatomic, strong) NSNumber *intentBeginTime;
 @property (nonatomic, copy) NSString *intentBeginTimeString;
 @property (nonatomic, strong) NSNumber *intentEndTime;
@@ -69,12 +69,18 @@ NS_ASSUME_NONNULL_BEGIN
 /// @param index 点击的位置
 -(void)setCommuntSubInputTableViewWithSelectForIndex:(NSInteger)index;
+/// 点击预览图片视频
+/// @param index 点击的位置
+-(void)setCommuntSubInputTableViewWithPreviewForIndex:(NSInteger)index ImageViews:(NSArray *)imageViews;
+
 /// 点击删除图片视频
 /// @param image 点击的位置
 -(void)setCommuntSubInputTableViewWithDelectForImage:(UIImage *)image;
 @end
+
+typedef void(^ReloadInputViewWithBlock)(NSDictionary * paramDict,NSString * contentString);
 @interface CNLiveCommuntSubInputTableView : UITableViewCell<QMUITextViewDelegate,UITextFieldDelegate>
 @property (nonatomic, weak) id<CNLiveCommuntSubInputTableViewDelegate> delegate;
@@ -93,6 +99,8 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, strong) UIButton * delectBtn02;
 @property (nonatomic, strong) UIButton * delectBtn03;
+@property (nonatomic, copy) ReloadInputViewWithBlock reloadBlock;
+
 @property (nonatomic, strong) CNLiveCommuntCheckView * checkView_m;
 @property (nonatomic, strong) CNLiveCommuntCheckView * checkView_w;
@@ -103,7 +111,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, assign) NSInteger index;
 @property (nonatomic, copy) NSString * sex;//男  女
-+(CNLiveCommuntSubInputTableView *)setTableView:(UITableView *)tableView SubDict:(NSDictionary *)subDict indexs:(NSInteger)indexs UserInfo:(NSDictionary *)userInfo;
++(CNLiveCommuntSubInputTableView *)setTableView:(UITableView *)tableView SubDict:(NSDictionary *)subDict indexs:(NSInteger)indexs UserInfo:(NSDictionary *)userInfo ReloadBlock:(ReloadInputViewWithBlock)reloadBlock;
 @end
@@ -575,14 +575,15 @@
 @implementation CNLiveCommuntSubInputTableView
-+(CNLiveCommuntSubInputTableView *)setTableView:(UITableView *)tableView SubDict:(NSDictionary *)subDict indexs:(NSInteger)indexs UserInfo:(nonnull NSDictionary *)userInfo
++(CNLiveCommuntSubInputTableView *)setTableView:(UITableView *)tableView SubDict:(NSDictionary *)subDict indexs:(NSInteger)indexs UserInfo:(nonnull NSDictionary *)userInfo ReloadBlock:(nonnull ReloadInputViewWithBlock)reloadBlock
 {
-    CNLiveCommuntSubInputTableView * inputView = [tableView dequeueReusableCellWithIdentifier:[NSString stringWithFormat:@"CNLiveCommuntSubInputTableView_%ld",(long)indexs]];
+    CNLiveCommuntSubInputTableView * inputView = [tableView dequeueReusableCellWithIdentifier:@"CNLiveCommuntSubInputTableView"];//[NSString stringWithFormat:@"CNLiveCommuntSubInputTableView_%ld",(long)indexs]];
     if (!inputView) {
-        inputView = [[CNLiveCommuntSubInputTableView alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:[NSString stringWithFormat:@"CNLiveCommuntSubInputTableView_%ld",(long)indexs]];
+        inputView = [[CNLiveCommuntSubInputTableView alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:@"CNLiveCommuntSubInputTableView"];//[NSString stringWithFormat:@"CNLiveCommuntSubInputTableView_%ld",(long)indexs]];
     }
     inputView.subDict = subDict;
     if ([userInfo allValues].count > 0) inputView.userInfo = userInfo;
+    inputView.reloadBlock = reloadBlock;
     return inputView;
 }
 -(instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier
@@ -627,6 +628,7 @@
     self.checkView_m.selectCenterView.hidden = [[userInfo stringValueForKey:@"gender" default:@""] isEqualToString:@"0"];
     self.checkView_w.selectCenterView.hidden = [[userInfo stringValueForKey:@"gender" default:@""] isEqualToString:@"1"];
 }
+
 -(void)setSubDict:(NSDictionary *)subDict
 {
     _subDict = subDict;
@@ -643,11 +645,17 @@
     self.contentField.keyboardType = [self.nameLabel.text isEqualToString:@"*年龄"]?UIKeyboardTypeNumberPad:UIKeyboardTypeDefault;
     self.contentField.keyboardType = [self.nameLabel.text isEqualToString:@"*联系方式"]?UIKeyboardTypeNumberPad:UIKeyboardTypeDefault;
     self.contentField.placeholder = [subDict stringValueForKey:@"placeholder" default:@""];
+    self.contentField.text = [subDict stringValueForKey:@"content" default:@""];
     self.contentField.hidden = ![subDict boolValueForKey:@"isTextField" default:YES];
     self.descTextView.placeholder = [subDict stringValueForKey:@"placeholder" default:@""];
     self.descTextView.hidden = ![subDict boolValueForKey:@"isTextView" default:YES];
+    self.descTextView.text = [subDict stringValueForKey:@"content" default:@""];
     self.moreButton.hidden = ![subDict boolValueForKey:@"isClick" default:YES];
     if ([subDict boolValueForKey:@"isClick" default:YES]) [self.moreButton setTitle:[subDict stringValueForKey:@"placeholder" default:@""] forState:UIControlStateNormal];
+    if ([[subDict stringValueForKey:@"content" default:@""] isNotBlank] && [subDict boolValueForKey:@"isClick" default:YES]) {
+        self.moreButton.hidden = ![[subDict stringValueForKey:@"content" default:@""] isNotBlank];
+        [self.moreButton setTitle:[subDict stringValueForKey:@"content" default:@""] forState:UIControlStateNormal];
+    }
     self.lineLabel.hidden = [subDict boolValueForKey:@"isImage" default:YES];
     self.lineLabel.hidden = [subDict boolValueForKey:@"isTextView" default:YES];
@@ -785,6 +793,7 @@
         [QMUITips showWithText:@"联系地址限制50个以内,超出将进行截取" inView:([UIApplication sharedApplication].delegate).window hideAfterDelay:1.5];
         textField.text = [textField.text substringAtRange:NSMakeRange(0, 50)];
     }
+    if (self.reloadBlock) self.reloadBlock(self.subDict,textField.text);
     return YES;
 }
 #pragma mark = QMUITextViewDelegate =
@@ -801,6 +810,11 @@
     [QMUITips showWithText:[NSString stringWithFormat:@"问题描述限制%@字以内", @(textView.maximumTextLength)] inView:([UIApplication sharedApplication].delegate).window hideAfterDelay:1.5];
 }
+- (BOOL)textViewShouldEndEditing:(UITextView *)textView
+{
+    if (self.reloadBlock) self.reloadBlock(self.subDict,textView.text);
+    return YES;
+}
 - (BOOL)textViewShouldReturn:(QMUITextView *)textView
 {
     [textView resignFirstResponder];
@@ -826,9 +840,17 @@
 }
 -(void)selectWithImageViewForIndex:(NSInteger)index
 {
-    if (self.imageArray.count >= index + 1) return;
-    if ([self.delegate respondsToSelector:@selector(setCommuntSubInputTableViewWithSelectForIndex:)]) {
-        [self.delegate setCommuntSubInputTableViewWithSelectForIndex:index];
+    if (self.imageArray.count >= index + 1) {
+        if ([self.delegate respondsToSelector:@selector(setCommuntSubInputTableViewWithPreviewForIndex: ImageViews:)]) {
+            NSArray * imageViews = @[self.imageView01];
+            if (self.imageArray.count == 2) imageViews = @[self.imageView01,self.imageView02];
+            if (self.imageArray.count == 3) imageViews = @[self.imageView01,self.imageView02,self.imageView03];
+            [self.delegate setCommuntSubInputTableViewWithPreviewForIndex:index ImageViews:imageViews];
+        }
+    } else {
+        if ([self.delegate respondsToSelector:@selector(setCommuntSubInputTableViewWithSelectForIndex:)]) {
+            [self.delegate setCommuntSubInputTableViewWithSelectForIndex:index];
+        }
     }
 }
 -(void)checkMAction:(UIButton *)button
@@ -235,35 +235,43 @@
 }
 -(void)selectWithImageViewForIndex:(NSInteger)index
 {
-    if (self.imageArray.count >= index + 1) return;
-    __weak typeof(self) weakSelf = self;
-    [self.view endEditing:YES];
-    [self.view createAlertViewTitleArray:@[@"拍摄",@"从手机相册选择"] subTitleArr:@[@"",@""] textColor:UIColorMake(40, 40, 40) subTitleColor:UIColorMake(152, 152, 152) font:UIFontMake(15) subFont:UIFontMake(12) actionBlock:^(UIButton *button, NSInteger didRow) {
-        switch (didRow) {
-            case 0:
-            {
-                if (IOS14_SDK_ALLOWED) {
-                    [weakSelf requestCNLiveALAssetsLibraryAuthorizationWithCompletion:^(BOOL isAuth) {
-                        if (isAuth) {
-                            dispatch_async_on_main_queue(^{
-                                [weakSelf takeToXFPhoto:index];
-                            });
-                        }
-                    }];
-                }else{
-                    [weakSelf takeToXFPhoto:index];
+    if (self.imageArray.count >= index + 1)
+    {
+        NSArray * imageViews = @[self.imageView01];
+        if (self.imageArray.count == 2) imageViews = @[self.imageView01,self.imageView02];
+        if (self.imageArray.count == 3) imageViews = @[self.imageView01,self.imageView02,self.imageView03];
+        [CNLivePhotoBrowser photoBrowserForDefultWithSourceViews:imageViews MediaURLArray:self.imageArray CurrentIndex:index ShowType:CNLivePhotoBrowserShowTypeImage Sheet:nil CompleterBlock:NULL];
+        
+    }else{
+        __weak typeof(self) weakSelf = self;
+        [self.view endEditing:YES];
+        [self.view createAlertViewTitleArray:@[@"拍摄",@"从手机相册选择"] subTitleArr:@[@"",@""] textColor:UIColorMake(40, 40, 40) subTitleColor:UIColorMake(152, 152, 152) font:UIFontMake(15) subFont:UIFontMake(12) actionBlock:^(UIButton *button, NSInteger didRow) {
+            switch (didRow) {
+                case 0:
+                {
+                    if (IOS14_SDK_ALLOWED) {
+                        [weakSelf requestCNLiveALAssetsLibraryAuthorizationWithCompletion:^(BOOL isAuth) {
+                            if (isAuth) {
+                                dispatch_async_on_main_queue(^{
+                                    [weakSelf takeToXFPhoto:index];
+                                });
+                            }
+                        }];
+                    }else{
+                        [weakSelf takeToXFPhoto:index];
+                    }
                 }
+                    break;
+                case 1:
+                {
+                    [self pushTZImagePickerController:index];
+                }
+                    break;
+                default:
+                    break;
             }
-                break;
-            case 1:
-            {
-                [self pushTZImagePickerController:index];
-            }
-                break;
-            default:
-                break;
-        }
-    }];
+        }];
+    }
 }
 -(void)requestCNLiveALAssetsLibraryAuthorizationWithCompletion:(void(^)(BOOL isAuth))requestAssetsLibraryAuthCompletion
 {
@@ -13,6 +13,8 @@
 @property (nonatomic, strong) NSMutableArray * imageArray;
 @property (nonatomic, strong) NSMutableArray * assetArray;
+@property (nonatomic, strong) MBProgressHUD * progressHud;
+
 @property (nonatomic, strong) NSMutableArray * cameraArray;
 @property (nonatomic, strong) NSMutableArray * cameraAssetArray;
 @property (nonatomic, strong) NSMutableArray * photoArray;
@@ -23,6 +25,7 @@
 @property (nonatomic, strong) CNLiveCommuntSubAlertTableView * typeView;
 @property (nonatomic, strong) CNLiveCommuntSubAlertTableView * dateView;
 @property (nonatomic, copy) NSString *project;
+@property (nonatomic, copy) NSString *projectString;
 @property (nonatomic, copy) NSString *timeString;
 @property (nonatomic, copy) NSString *nbhdId;
 @end
@@ -106,7 +109,7 @@
             @{@"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},
+            @{@"name":@"",@"placeholder":@"",@"isClick":@NO,@"isTextField":@NO,@"isTextView":@NO,@"isImage":@YES,@"isChick":@NO},
         ]];
     }
     return _dataSource;
@@ -170,22 +173,13 @@
 }
 -(void)submitRequestAction:(UIButton *)button
 {
+    NSArray * names = @[@"userName",@"address",@"phone",@"repairProject",@"time",@"remark",@""];
     NSMutableDictionary * paramDict = [[NSMutableDictionary alloc] init];
-    for (int i = 0; i < 6; i ++) {
-        CNLiveCommuntSubInputTableView * userCell = [self.tableView cellForRowAtIndexPath:[NSIndexPath indexPathForRow:i inSection:0]];
-        if (i == 0) [paramDict addString:[userCell.contentField.text isNotBlank]?userCell.contentField.text:@"" forKey:@"userName"];
-        if (i == 1) [paramDict addString:[userCell.contentField.text isNotBlank]?userCell.contentField.text:@"" forKey:@"address"];
-        if (i == 2) {
-            NSString * phone = [userCell.contentField.text isNotBlank]?userCell.contentField.text:@"";
-            if ([phone isNotBlank] && phone.length == 11) {
-                [paramDict addString:phone forKey:@"phone"];
-            }else{
-                [QMUITips showWithText:phone.length == 0 ? @"联系电话不能为空" : @"联系电话填写错误"];
-                return;
-            }
-        }
-        if (i == 3) [paramDict addString:[self.project isNotBlank]?self.project:@"" forKey:@"repairProject"];
-        if (i == 4) {
+    for (int i = 0; i < self.dataSource.count; i++) {
+        NSString * tempContent = [self.dataSource[i] stringValueForKey:@"content" default:@""];
+        NSString * name = names[i];
+        if ([name isEqualToString:@""]) break;
+        if ([name isEqualToString:@"time"]) {
             NSString * timeString = [self.timeString isNotBlank]?self.timeString:@"";
             NSString * dayString = [timeString componentsSeparatedByString:@" "].firstObject;
             NSString * startString = [[timeString componentsSeparatedByString:@" "].lastObject componentsSeparatedByString:@"~"].firstObject;
@@ -199,9 +193,59 @@
                 [paramDict addString:@"" forKey:@"beginTime"];
                 [paramDict addString:@"" forKey:@"endTime"];
             }
+        }else if ([name isEqualToString:@"repairProject"]) {
+            [paramDict addString:[self.project isNotBlank]?self.project:@"" forKey:@"repairProject"];
+        }else if ([name isEqualToString:@"phone"]) {
+            if ([tempContent isNotBlank] && tempContent.length == 11) {
+                [paramDict addString:tempContent forKey:@"phone"];
+            }else{
+                [QMUITips showWithText:tempContent.length == 0 ? @"联系电话不能为空" : @"联系电话填写错误"];
+                return;
+            }
+        }else{
+            [paramDict setObject:tempContent forKey:name];
         }
-        if (i == 5) [paramDict addString:[userCell.descTextView.text isNotBlank]?userCell.descTextView.text:@"" forKey:@"remark"];
     }
+//    for (int i = 0; i < 6; i ++) {
+//        CNLiveCommuntSubInputTableView * userCell = [self.tableView dequeueReusableCellWithIdentifier:[NSString stringWithFormat:@"CNLiveCommuntSubInputTableView_%ld",(long)i]];
+//        if (i == 0) {
+//            [paramDict addString:[userCell.contentField.text isNotBlank]?userCell.contentField.text:@"" forKey:@"userName"];
+//        }
+//        if (i == 1) {
+//            [paramDict addString:[userCell.contentField.text isNotBlank]?userCell.contentField.text:@"" forKey:@"address"];
+//        }
+//        if (i == 2) {
+//            NSString * phone = [userCell.contentField.text isNotBlank]?userCell.contentField.text:@"";
+//            if ([phone isNotBlank] && phone.length == 11) {
+//                [paramDict addString:phone forKey:@"phone"];
+//            }else{
+//                [QMUITips showWithText:phone.length == 0 ? @"联系电话不能为空" : @"联系电话填写错误"];
+//                return;
+//            }
+//        }
+//        if (i == 3) {
+//            [paramDict addString:[self.project isNotBlank]?self.project:@"" forKey:@"repairProject"];
+//        }
+//        if (i == 4) {
+//            NSString * timeString = [self.timeString isNotBlank]?self.timeString:@"";
+//            NSString * dayString = [timeString componentsSeparatedByString:@" "].firstObject;
+//            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",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{
+//                [paramDict addString:@"" forKey:@"beginTime"];
+//                [paramDict addString:@"" forKey:@"endTime"];
+//            }
+//        }
+//        if (i == 5) {
+//            [paramDict addString:[userCell.descTextView.text isNotBlank]?userCell.descTextView.text:@"" forKey:@"remark"];
+//        }
+//
+//    }
     if ([[paramDict allValues] containsObject:@""]) {
         NSInteger index = [[paramDict allValues] indexOfObject:@""];
         NSString * key = [[paramDict allKeys] objectAtIndex:index];
@@ -216,17 +260,82 @@
         }
     }
     __weak typeof(self) weakSelf = self;
-    [CNLiveCommuntViewModel requestWithCommuntyHomeMaintenPushWithParamDict:paramDict nbhdId:self.nbhdId CompleterBlock:^(CNLiveCommuntyActivityMaintainsCreateModel * _Nonnull createModel) {
-        if (createModel) {
-            
-            CNLiveCommuntyOrderViewController * vc = [[CNLiveCommuntyOrderViewController alloc] initWithShowType:CNLiveCommuntyOrderShowTypeListYetOrder CreateModel:createModel];
-            [weakSelf.navigationController pushViewController:vc animated:YES];
+    if (self.imageArray.count == 0) {
+        [paramDict addString:@"" forKey:@"img"];
+        [CNLiveCommuntViewModel requestWithCommuntyHomeMaintenPushWithParamDict:paramDict nbhdId:self.nbhdId CompleterBlock:^(CNLiveCommuntyActivityMaintainsCreateModel * _Nonnull createModel) {
+            if (createModel) {
+                
+                CNLiveCommuntyOrderViewController * vc = [[CNLiveCommuntyOrderViewController alloc] initWithShowType:CNLiveCommuntyOrderShowTypeListYetOrder CreateModel:createModel];
+                [weakSelf.navigationController pushViewController:vc animated:YES];
+                        
+    #ifdef DEBUG
+                [[NSUserDefaults standardUserDefaults] setObject:createModel.idStr forKey:@"cmnt_id"];
+                [[NSUserDefaults standardUserDefaults] synchronize];
+    #else
+    #endif
+            }
+        }];
+    }else{
+        [self uploadImageWithCompleterBlock:^(NSString *imageUrl) {
+            [paramDict addString:imageUrl forKey:@"img"];
+            [CNLiveCommuntViewModel requestWithCommuntyHomeMaintenPushWithParamDict:paramDict nbhdId:self.nbhdId CompleterBlock:^(CNLiveCommuntyActivityMaintainsCreateModel * _Nonnull createModel) {
+                if (createModel) {
-#ifdef DEBUG
-            [[NSUserDefaults standardUserDefaults] setObject:createModel.idStr forKey:@"cmnt_id"];
-            [[NSUserDefaults standardUserDefaults] synchronize];
-#else
-#endif
+                    CNLiveCommuntyOrderViewController * vc = [[CNLiveCommuntyOrderViewController alloc] initWithShowType:CNLiveCommuntyOrderShowTypeListYetOrder CreateModel:createModel];
+                    [weakSelf.navigationController pushViewController:vc animated:YES];
+                            
+        #ifdef DEBUG
+                    [[NSUserDefaults standardUserDefaults] setObject:createModel.idStr forKey:@"cmnt_id"];
+                    [[NSUserDefaults standardUserDefaults] synchronize];
+        #else
+        #endif
+                }
+            }];
+        }];
+    }
+}
+-(void)uploadImageWithCompleterBlock:(void(^)(NSString * imageUrl))completerBlock
+{
+    __weak typeof(self) weakSelf = self;
+    NSDictionary *param = @{@"appId":AppId,
+                            @"verb":@"POST",
+                            @"storageType":@"2",
+                            @"bucket":API_BucketName
+    };
+    self.progressHud.hidden = NO;
+    self.progressHud.mode = MBProgressHUDModeIndeterminate;
+    self.progressHud.bezelView.backgroundColor = [UIColor blackColor];
+    [CNLiveUploadManager uploadRequestType:CNLiveUploadTypeQN url:CNUploadAuthForApp dic:param  imageArray:self.imageArray assetArray:self.assetArray isOriginal:NO limitType:AppPhototLimitTypeFriendsCircle progress:^(float progress) {
+        NSLog(@"上传进度测试:%.2f",progress);
+        weakSelf.progressHud.mode = MBProgressHUDModeDeterminate;
+        weakSelf.progressHud.label.text = @"上传图片中...";
+        weakSelf.progressHud.bezelView.color = [UIColor colorWithWhite:0.95f alpha:0.6f];
+        weakSelf.progressHud.detailsLabel.text = [NSString stringWithFormat:@"%.2f %%",(progress * 100)];
+    } success:^(NSMutableArray *fileArray) {
+        NSLog(@"输出结果测试:%@",fileArray);
+        __block NSMutableString *picString = [[NSMutableString alloc] init];
+        [fileArray enumerateObjectsUsingBlock:^(id  _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
+            CNLiveUploadModel *model = fileArray[idx];
+            if ([model.code isEqualToString:@"200"]) {
+                [picString appendString:model.imageUrl];
+                if (fileArray.count != idx + 1) [picString appendString:@","];
+            }else {
+                weakSelf.progressHud.hidden = YES;
+                weakSelf.progressHud = nil;
+                [QMUITips showError:model.info.error.localizedDescription inView:weakSelf.view hideAfterDelay:1.5f];
+            }
+        }];
+        weakSelf.progressHud.hidden = YES;
+        weakSelf.progressHud = nil;
+        if (completerBlock) completerBlock(picString);
+    } failure:^(NSMutableArray *errorArray, NSError *error) {
+        weakSelf.progressHud.hidden = YES;
+        weakSelf.progressHud = nil;
+        NSLog(@"输出结果测试:%@,错误:%@---%ld",errorArray,error,error.code);
+        if (error.code == 0) {
+            [QMUITips showError:@"上传失败" inView:[CNLiveCommuntTools cCommunt_currentViewController].view hideAfterDelay:1.5f];
+        }else {
+            [QMUITips showWithText:error.localizedDescription inView:[CNLiveCommuntTools cCommunt_currentViewController].view hideAfterDelay:1.5];
         }
     }];
 }
@@ -241,7 +350,13 @@
 }
 -(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
 {
-    CNLiveCommuntSubInputTableView * inpView = [CNLiveCommuntSubInputTableView setTableView:tableView SubDict:self.dataSource[indexPath.row] indexs:indexPath.row UserInfo:@{}];
+    __weak typeof(self) weakSelf = self;
+    CNLiveCommuntSubInputTableView * inpView = [CNLiveCommuntSubInputTableView setTableView:tableView SubDict:self.dataSource[indexPath.row] indexs:indexPath.row UserInfo:@{} ReloadBlock:^(NSDictionary * _Nonnull paramDict, NSString * _Nonnull contentString) {
+        NSMutableDictionary * tempDict = [paramDict mutableCopy];
+        [tempDict setObject:contentString forKey:@"content"];
+        NSInteger index = [weakSelf.dataSource indexOfObject:paramDict];
+        [weakSelf.dataSource replaceObjectAtIndex:index withObject:tempDict];
+    }];
     inpView.delegate = self;
     inpView.imageArray = self.imageArray;
     return inpView;
@@ -265,6 +380,10 @@
                 [inpView.moreButton setTitle:content forState:UIControlStateNormal];
                 [inpView.moreButton setTitleColor:UIColorHex(#333333) forState:UIControlStateNormal];
                 weakSelf.project = idStr;
+                weakSelf.projectString = content;
+                NSMutableDictionary * tempDict = [[weakSelf.dataSource objectAtIndex:3] mutableCopy];
+                [tempDict setObject:content forKey:@"content"];
+                [weakSelf.dataSource replaceObjectAtIndex:3 withObject:tempDict];
             }];
         }else{
             NSString * nb_info =  (NSString *)[[NSUserDefaults standardUserDefaults] objectForKey:[NSString stringWithFormat:@"%@%@",kCNLiveCommuntyNBhdInfoIdentifier,[CNUserInfoManager manager].userInfoModel.uid]];
@@ -286,6 +405,9 @@
                 [inpView.moreButton setTitle:content forState:UIControlStateNormal];
                 [inpView.moreButton setTitleColor:UIColorHex(#333333) forState:UIControlStateNormal];
                 weakSelf.timeString = content;
+                NSMutableDictionary * tempDict = [[weakSelf.dataSource objectAtIndex:4] mutableCopy];
+                [tempDict setObject:content forKey:@"content"];
+                [weakSelf.dataSource replaceObjectAtIndex:4 withObject:tempDict];
             }];
         }];
     }
@@ -300,6 +422,10 @@
         [self.tableView reloadData];
     }
 }
+-(void)setCommuntSubInputTableViewWithPreviewForIndex:(NSInteger)index ImageViews:(nonnull NSArray *)imageViews
+{
+    [CNLivePhotoBrowser photoBrowserForDefultWithSourceViews:imageViews MediaURLArray:self.imageArray CurrentIndex:index ShowType:CNLivePhotoBrowserShowTypeImage Sheet:nil CompleterBlock:NULL];
+}
 /// 点击选择图片视频
 /// @param index 点击的位置
 -(void)setCommuntSubInputTableViewWithSelectForIndex:(NSInteger)index
@@ -357,23 +483,22 @@
 {
     __weak typeof(self) weakSelf = self;
     XFCameraController *cameraController = [[XFCameraController alloc] init];
-    cameraController.isCanShootVideo = YES;
-//    cameraController.outPutPath = [CNLiveBusinessTools chatFilePathByUserId:[IMAPlatform sharedInstance].host.userId];
+    cameraController.isCanShootVideo = NO;
     cameraController.modalPresentationStyle = UIModalPresentationFullScreen;
     __weak XFCameraController *weakCameraController = cameraController;
-    cameraController.zxshootCompletionBlock = ^(PHAsset *asset, NSURL *videoUrl, CGFloat videoTimeLength, UIImage *thumbnailImage, NSError *error) {
-        if (!error) {
-            dispatch_async_on_main_queue(^{
-                [weakCameraController dismissViewControllerAnimated:YES completion:^{
-                    [weakSelf.videoArray removeAllObjects];
-                    [weakSelf.videoAssetArray removeAllObjects];
-                    [weakSelf.videoArray addObject:thumbnailImage];
-                    [weakSelf.videoAssetArray addObject:asset];
-                    [weakSelf.tableView reloadData];
-                }];
-            });
-        }
-    };
+//    cameraController.zxshootCompletionBlock = ^(PHAsset *asset, NSURL *videoUrl, CGFloat videoTimeLength, UIImage *thumbnailImage, NSError *error) {
+//        if (!error) {
+//            dispatch_async_on_main_queue(^{
+//                [weakCameraController dismissViewControllerAnimated:YES completion:^{
+//                    [weakSelf.videoArray removeAllObjects];
+//                    [weakSelf.videoAssetArray removeAllObjects];
+//                    [weakSelf.videoArray addObject:thumbnailImage];
+//                    [weakSelf.videoAssetArray addObject:asset];
+//                    [weakSelf.tableView reloadData];
+//                }];
+//            });
+//        }
+//    };
     cameraController.takePhotosCompletionBlock = ^(UIImage *image, NSError *error) {
         if (!error) {
             NSMutableArray *imageIds = [NSMutableArray array];
@@ -389,19 +514,20 @@
                         PHFetchResult *result = [PHAsset fetchAssetsWithLocalIdentifiers:imageIds options:nil];
                         [result enumerateObjectsUsingBlock:^(PHAsset * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
                             dispatch_async_on_main_queue(^{
-                                [weakCameraController dismissViewControllerAnimated:YES completion:^{
-                                    [weakSelf.imageArray removeObject:weakSelf.cameraArray.firstObject];
-                                    [weakSelf.assetArray removeObject:weakSelf.cameraAssetArray.firstObject];
-                                    
-                                    [weakSelf.cameraAssetArray removeAllObjects];
-                                    [weakSelf.cameraArray removeAllObjects];
-                                    [weakSelf.cameraAssetArray addObject:obj];
-                                    [weakSelf.cameraArray addObject:image];
+//                                    [weakSelf.imageArray removeObject:weakSelf.cameraArray.firstObject];
+//                                    [weakSelf.assetArray removeObject:weakSelf.cameraAssetArray.firstObject];
+//
+//                                    [weakSelf.cameraAssetArray removeAllObjects];
+//                                    [weakSelf.cameraArray removeAllObjects];
+//                                    [weakSelf.cameraAssetArray addObject:obj];
+//                                    [weakSelf.cameraArray addObject:image];
+//
+//                                    [weakSelf.imageArray addObject:image];
+//                                    [weakSelf.assetArray addObject:obj];
-                                    [weakSelf.imageArray addObject:image];
-                                    [weakSelf.assetArray addObject:obj];
-                                    [weakSelf.tableView reloadData];
-                                }];
+                                [weakSelf.imageArray addObjectsFromArray:@[image]];
+                                [weakSelf.assetArray addObjectsFromArray:@[obj]];
+                                [weakSelf.tableView reloadData];
                             });
                         }];
                     }
@@ -442,4 +568,13 @@
     [self.tableView reloadData];
 }
+- (MBProgressHUD *)progressHud {
+    if (!_progressHud) {
+        _progressHud= [MBProgressHUD showHUDAddedTo:[UIApplication sharedApplication].keyWindow animated:YES];
+        _progressHud.mode = MBProgressHUDModeDeterminate;
+        _progressHud.animationType = MBProgressHUDAnimationZoomIn;
+        _progressHud.bezelView.backgroundColor = [UIColor blackColor];
+    }
+    return _progressHud;
+}
 @end
@@ -10,7 +10,7 @@
 #import "CNLiveCommuntSignUpViewController.h"
 @interface CNLiveCommuntListViewController ()<DZNEmptyDataSetSource,DZNEmptyDataSetDelegate>
 @property (nonatomic, assign) CNLiveCommuntListShowType showType;
-@property (nonatomic, strong) CNLiveRefreshFooter * footerView;
+@property (nonatomic, strong) MJRefreshAutoNormalFooter * footerView;
 @property (nonatomic, strong) NSMutableArray * dataArray;
 @property (nonatomic, strong) NSIndexPath * selectIndexPath;
 @property (nonatomic, copy) NSString * nbhdId;
@@ -63,7 +63,7 @@
         weakSelf.page = 1;
         [weakSelf loadDataSourceWithPage:1 nbhdId:weakSelf.nbhdId index:weakSelf.index CompleterBlock:NULL];
     }];
-    self.footerView = [CNLiveRefreshFooter footerWithRefreshingBlock:^{
+    self.footerView = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{
         weakSelf.page ++;
         [weakSelf loadDataSourceWithPage:weakSelf.page nbhdId:weakSelf.nbhdId index:weakSelf.index CompleterBlock:NULL];
     }];
@@ -81,11 +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];
-        }
+//        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];
+//        }
     }];
 }
@@ -72,10 +72,17 @@
                                 [weakSelf addChildViewController:vc noralImage:nomal_image selectImage:select_image];
                             }else{
                                 if ([homeModel.type isEqualToString:@"3"]) {//生活服务界面 原生
-                                    CNLiveCommuntServiceViewController * vc = [[CNLiveCommuntServiceViewController alloc] initWithHomeModel:homeModel isRootVC:YES isShowLocation:YES];
-                                    vc.title = homeModel.columnName;
-                                    vc.view.backgroundColor = [UIColor whiteColor];
-                                    [weakSelf addChildViewController:vc noralImage:nomal_image selectImage:select_image];
+                                    if ([homeModel.cmsPageType isEqualToString:@"4"]) {
+                                        CNLiveCommuntActiviViewController * vc = [[CNLiveCommuntActiviViewController alloc] initWithWebUrl:homeModel.cmsPageUrl isRootVC:YES Type:@"1"];
+                                        vc.title = homeModel.columnName;
+                                        vc.view.backgroundColor = [UIColor whiteColor];
+                                        [weakSelf addChildViewController:vc noralImage:nomal_image selectImage:select_image];
+                                    }else{
+                                        CNLiveCommuntServiceViewController * vc = [[CNLiveCommuntServiceViewController alloc] initWithHomeModel:homeModel isRootVC:YES isShowLocation:YES];
+                                        vc.title = homeModel.columnName;
+                                        vc.view.backgroundColor = [UIColor whiteColor];
+                                        [weakSelf addChildViewController:vc noralImage:nomal_image selectImage:select_image];
+                                    }
                                 }
                                 if ([homeModel.type isEqualToString:@"2"]) {
                                     CNLiveCommuntListViewController * vc = [[CNLiveCommuntListViewController alloc] initWithShowType:CNLiveCommuntListShowTypeHome NBhdId:homeModel.idStr];
@@ -107,8 +114,14 @@
                 }];
             }
         }else{
-            [QMUITips hideAllTipsInView:weakSelf.view];
-            [weakSelf.navigationController popViewControllerAnimated:YES];
+            NSString * nb_info =  (NSString *)[[NSUserDefaults standardUserDefaults] objectForKey:[NSString stringWithFormat:@"%@%@",kCNLiveCommuntyNBhdInfoIdentifier,[CNUserInfoManager manager].userInfoModel.uid]];
+            if ([nb_info isNotBlank]) {
+                CNLiveCommuntyHomeListViewController * listView = [[CNLiveCommuntyHomeListViewController alloc] init];
+                [weakSelf.navigationController dsPushViewController:listView animated:YES];
+            }else{
+                [QMUITips hideAllTipsInView:weakSelf.view];
+                [weakSelf.navigationController popViewControllerAnimated:YES];
+            }
         }
     }];
 }
@@ -432,26 +432,49 @@
 }
 -(CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section
 {
-    return section == 0 || ((self.showType == CNLiveCommuntyOrderShowTypeListReadyOrder || self.showType == CNLiveCommuntyOrderShowTypeListYetOrder || self.showType == CNLiveCommuntyOrderShowTypeListFailureOrder) && section == 1) || (self.showType == CNLiveCommuntyOrderShowTypeListCompletOrder && section == 2) ? 10 : 0;
+    CGFloat height = section == 0 && self.createMdoel.imgs.count > 0 ? (kScreenWidth - 60)/3 + 20 : 10;
+    return section == 0 || ((self.showType == CNLiveCommuntyOrderShowTypeListReadyOrder || self.showType == CNLiveCommuntyOrderShowTypeListYetOrder || self.showType == CNLiveCommuntyOrderShowTypeListFailureOrder) && section == 1) || (self.showType == CNLiveCommuntyOrderShowTypeListCompletOrder && section == 2) ? height : 0;
 }
 -(UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section
 {
+    CGFloat height = section == 0 && self.createMdoel.imgs.count > 0 ? (kScreenWidth - 60)/3 + 20 : 10;
     if (section == 0 || ((self.showType == CNLiveCommuntyOrderShowTypeListReadyOrder || self.showType == CNLiveCommuntyOrderShowTypeListYetOrder || self.showType == CNLiveCommuntyOrderShowTypeListFailureOrder) && section == 1) || (self.showType == CNLiveCommuntyOrderShowTypeListCompletOrder && section == 2)) {
-        UIView * view = [[UIView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, 10)];
+        UIView * view = [[UIView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, height)];
         view.backgroundColor = [UIColor clearColor];
-        UIView * radiusView = [[UIView alloc] initWithFrame:CGRectMake(10, 0, kScreenWidth - 20, 10)];
+        UIView * radiusView = [[UIView alloc] initWithFrame:CGRectMake(10, 0, kScreenWidth - 20, height)];
         radiusView.backgroundColor = [UIColor whiteColor];
         radiusView.layer.shadowColor = [UIColor blackColor].CGColor;
         radiusView.layer.shadowOffset = CGSizeMake(0, 0);
         radiusView.layer.shadowOpacity = 0.3;
         radiusView.layer.shadowRadius = 10;
-        UIBezierPath *maskPath = [UIBezierPath bezierPathWithRoundedRect:CGRectMake(0, 0, SCREEN_WIDTH - 20, 10) byRoundingCorners:UIRectCornerBottomLeft | UIRectCornerBottomRight cornerRadii:CGSizeMake(5, 5)];
+        UIBezierPath *maskPath = [UIBezierPath bezierPathWithRoundedRect:CGRectMake(0, 0, SCREEN_WIDTH - 20, height) byRoundingCorners:UIRectCornerBottomLeft | UIRectCornerBottomRight cornerRadii:CGSizeMake(5, 5)];
         CAShapeLayer *maskLayer = [[CAShapeLayer alloc] init];
         maskLayer.path = maskPath.CGPath;
         radiusView.layer.mask = maskLayer;
         [view insertSubview:radiusView belowSubview:view];
-
+        
+        if (section == 0 && self.createMdoel.imgs.count > 0) {
+            CGFloat itemW = (kScreenWidth - 60)/3;
+            __block NSMutableArray * tempArray = [[NSMutableArray alloc] init];
+            for (int i = 0; i < self.createMdoel.imgs.count; i++) {
+                UIImageView * imageView = [[UIImageView alloc] initWithFrame:CGRectMake(20 + (i * (itemW + 10)), 10, itemW, itemW)];
+                imageView.backgroundColor = UIColorHex(#f9f9f9);
+                imageView.tag = 1000 + i;
+                imageView.layer.cornerRadius = 7;
+                imageView.layer.masksToBounds = YES;
+                imageView.contentMode = UIViewContentModeScaleAspectFill;
+                [imageView setUserInteractionEnabled:YES];
+                [imageView sd_setImageWithURL:[NSURL URLWithString:self.createMdoel.imgs[i]] placeholderImage:[UIImage imageWithColor:UIColorHex(#f9f9f9)]];
+                __weak typeof(self) weakSelf = self;
+                [imageView addGestureRecognizer:[[UITapGestureRecognizer alloc] initWithActionBlock:^(UITapGestureRecognizer *  _Nonnull sender) {
+                    UIImageView * imageView = (UIImageView *)sender.view;
+                    [CNLivePhotoBrowser photoBrowserForDefultWithSourceViews:tempArray MediaURLArray:weakSelf.createMdoel.imgs CurrentIndex:imageView.tag - 1000 ShowType:CNLivePhotoBrowserShowTypeImage Sheet:nil CompleterBlock:NULL];
+                }]];
+                [view addSubview:imageView];
+                [tempArray addObject:imageView];
+            }
+        }
         return view;
     }else{
         return nil;
@@ -157,7 +157,9 @@
 }
 -(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
 {
-    CNLiveCommuntSubInputTableView * inpView = [CNLiveCommuntSubInputTableView setTableView:tableView SubDict:self.dataSource[indexPath.row] indexs:indexPath.row UserInfo:self.userDict];
+    CNLiveCommuntSubInputTableView * inpView = [CNLiveCommuntSubInputTableView setTableView:tableView SubDict:self.dataSource[indexPath.row] indexs:indexPath.row UserInfo:self.userDict ReloadBlock:^(NSDictionary * _Nonnull paramDict, NSString * _Nonnull contentString) {
+        
+    }];
     return inpView;
 }
 -(CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
@@ -71,6 +71,8 @@
                         if (tempArray.count > 0) {
                             if (completerBlock) completerBlock(tempArray);
                         }else{
+                            [[NSUserDefaults standardUserDefaults] setObject:@"" forKey:[NSString stringWithFormat:@"%@%@",kCNLiveCommuntyNBhdInfoIdentifier,[CNUserInfoManager manager].userInfoModel.uid]];
+                            [[NSUserDefaults standardUserDefaults] synchronize];
                             if (completerBlock) completerBlock(nil);
                         }
                     }else{
@@ -286,6 +288,8 @@
         [CNLiveCommuntViewModel communty_chooseRequestWithResponseObject:responseObject Error:error isData:YES CompleterBlock:^(id responseObject) {
             if (responseObject) {
                 CNLiveCommuntyActivityMaintainsCreateModel * createModel = [CNLiveCommuntyActivityMaintainsCreateModel mj_objectWithKeyValues:responseObject];
+                createModel.imgs = [createModel.img componentsSeparatedByString:@","].mutableCopy;
+                [createModel.imgs removeObject:@""];
                 if (createModel.showType == 1 && [createModel.repairId isNotBlank] && ![createModel.userId isEqualToString:createModel.repairId]) createModel.showType = 0;
                 if (isChat && createModel.showType == 0) createModel.showType = 4;
                 if (isChat && createModel.showType == 1) createModel.showType = 5;
@@ -366,10 +366,12 @@
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-CNLiveCommuntyModule_Example/Pods-CNLiveCommuntyModule_Example-resources.sh",
 				"${PODS_CONFIGURATION_BUILD_DIR}/CNLiveCommuntyModule/CNLiveCommuntyModule.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/CNLivePhotoBrowser/CNLivePhotoBrowser.bundle",
 			);
 			name = "[CP] Copy Pods Resources";
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveCommuntyModule.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLivePhotoBrowser.bundle",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@@ -401,6 +403,7 @@
 				"${BUILT_PRODUCTS_DIR}/DSBaseModule/DSBaseModule.framework",
 				"${BUILT_PRODUCTS_DIR}/DSGTMBase64/DSGTMBase64.framework",
 				"${BUILT_PRODUCTS_DIR}/DZNEmptyDataSet/DZNEmptyDataSet.framework",
+				"${BUILT_PRODUCTS_DIR}/FMDB/FMDB.framework",
 				"${BUILT_PRODUCTS_DIR}/HappyDNS/HappyDNS.framework",
 				"${BUILT_PRODUCTS_DIR}/IQKeyboardManager/IQKeyboardManager.framework",
 				"${BUILT_PRODUCTS_DIR}/JXCategoryView/JXCategoryView.framework",
@@ -415,6 +418,7 @@
 				"${BUILT_PRODUCTS_DIR}/SDAutoLayout/SDAutoLayout.framework",
 				"${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework",
 				"${BUILT_PRODUCTS_DIR}/SSZipArchive/SSZipArchive.framework",
+				"${BUILT_PRODUCTS_DIR}/YBImageBrowser/YBImageBrowser.framework",
 				"${BUILT_PRODUCTS_DIR}/YYAsyncLayer/YYAsyncLayer.framework",
 				"${BUILT_PRODUCTS_DIR}/YYCache/YYCache.framework",
 				"${BUILT_PRODUCTS_DIR}/YYCategories/YYCategories.framework",
@@ -445,6 +449,7 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DSBaseModule.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DSGTMBase64.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DZNEmptyDataSet.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FMDB.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/HappyDNS.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/IQKeyboardManager.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/JXCategoryView.framework",
@@ -459,6 +464,7 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDAutoLayout.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SSZipArchive.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YBImageBrowser.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYAsyncLayer.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYCache.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYCategories.framework",
@@ -24,7 +24,7 @@
     [IQKeyboardManager sharedManager].enable = YES;
     [IQKeyboardManager sharedManager].enableAutoToolbar = YES;
-    [CNUserInfoManager manager].userInfoModel.uid = @"10458139";//@"145680";//@"10458139";//@"145680";//@"395098";//@"10545988";//@"353001";//@"353417";//@"10511059";//@"10537318";//@"10499533";//@"11973842";//@"1342671"
+    [CNUserInfoManager manager].userInfoModel.uid = @"145680";//@"10458139";//@"11174272";//@"145680";//@"395098";//@"10545988";//@"353001";//@"353417";//@"10511059";//@"10537318";//@"10499533";//@"11973842";//@"1342671"
 //    [[NSUserDefaults standardUserDefaults] setObject:@"38" forKey:@"kCNLiveCommuntyNBhdIdIdentifier"];
 //    [[NSUserDefaults standardUserDefaults] synchronize];
@@ -148,6 +148,10 @@
         if ([cmnt_id isNotBlank]) {
             CNLiveCommuntyOrderViewController * orderVC = [[CNLiveCommuntyOrderViewController alloc] initWithMaintenId:cmnt_id];
             [self.navigationController pushViewController:orderVC animated:YES];
+        }else{
+            
+            CNLiveCommuntyOrderViewController * orderVC = [[CNLiveCommuntyOrderViewController alloc] initWithMaintenId:@"cmnt2022032232427862564"];
+            [self.navigationController pushViewController:orderVC animated:YES];
         }
     }
@@ -12,7 +12,7 @@
 int main(int argc, char * argv[])
 {
     @autoreleasepool {
-        [CNLiveEnvironmentManager setAppType:CNLiveAppTypeUser environmentType:CNLiveProductionAppStore];//CNLiveDebugAppStore];
+        [CNLiveEnvironmentManager setAppType:CNLiveAppTypeUser environmentType:CNLiveDebugAppStore];//CNLiveProductionAppStore//CNLiveDebugAppStore];
         return UIApplicationMain(argc, argv, nil, NSStringFromClass([CNLIVEAppDelegate class]));
     }
 }