提交

梁星国
1 parent 5abd0c15
Showing 13 changed files with 524 additions and 425 deletions
CNLiveImagePickerController.podspec
CNLiveImagePickerController/Classes/.gitkeep
CNLiveImagePickerController/Classes/CNEditVideoController.m
CNLiveImagePickerController/Classes/CNImagePickerController.m
CNLiveImagePickerController/Classes/CNImagePickerManager.m
CNLiveImagePickerController/Classes/TZImageManager.m
CNLiveImagePickerController/Classes/TZImagePickerController.m
CNLiveImagePickerController/Classes/TZPhotoPickerController.m
CNLiveImagePickerController/Classes/TZPhotoPreviewCell.m
CNLiveImagePickerController/Classes/TZPhotoPreviewController.m
CNLiveImagePickerController/Classes/TZVideoPlayerController.m
Example/CNLiveImagePickerController.xcodeproj/project.pbxproj
Example/Podfile
@@ -8,8 +8,8 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLiveImagePickerController'
-  s.version          = '0.1.0'
-  s.summary          = 'A short description of CNLiveImagePickerController.'
+  s.version          = '0.1.1'
+  s.summary          = '相册'
 # This description is used to generate tags and improve search results.
 #   * Think: What does it do? Why did you write it? What is the focus?
@@ -21,16 +21,19 @@ Pod::Spec.new do |s|
 TODO: Add long description of the pod here.
                        DESC
-  s.homepage         = 'https://github.com/jyyjkt/CNLiveImagePickerController'
+  s.homepage         = 'http://bj.gitlab.cnlive.com/ios-team/CNLiveImagePickerController'
   # s.screenshots     = 'www.example.com/screenshots_1', 'www.example.com/screenshots_2'
   s.license          = { :type => 'MIT', :file => 'LICENSE' }
-  s.author           = { 'jyyjkt' => 'jyyjkt@qq.com' }
-  s.source           = { :git => 'https://github.com/jyyjkt/CNLiveImagePickerController.git', :tag => s.version.to_s }
+  s.author           = { 'lianxingguo' => 'jyyjkt@qq.com' }
+  s.source           = { :git => 'http://bj.gitlab.cnlive.com/ios-team/CNLiveImagePickerController.git', :tag => s.version.to_s }
   # s.social_media_url = 'https://twitter.com/<TWITTER_USERNAME>'
   s.ios.deployment_target = '8.0'
-  s.source_files = 'CNLiveImagePickerController/Classes/**/*'
+  s.requires_arc = true
+  s.resources    = "CNLiveImagePickerController/Classes/*.{png,bundle}"
+  s.source_files = "CNLiveImagePickerController/Classes/*.{h,m}"
+  s.frameworks   = "Photos", "CoreServices"
   # s.resource_bundles = {
   #   'CNLiveImagePickerController' => ['CNLiveImagePickerController/Assets/*.png']
@@ -38,5 +41,9 @@ TODO: Add long description of the pod here.
   # s.public_header_files = 'Pod/Classes/**/*.h'
   # s.frameworks = 'UIKit', 'MapKit'
-  # s.dependency 'AFNetworking', '~> 2.3'
+  s.dependency 'CNLiveBaseKit'
+#  s.dependency 'CNLiveUploadManager'
+
+
+  
 end
@@ -120,58 +120,59 @@
     CGPoint point = [pan locationInView:self];
     CGRect rct = self.validRect;
-    
-    const CGFloat W = self.width;
-    CGFloat minX = 0;
-    CGFloat maxX = W;
-    
-    switch (pan.view.tag) {
-        case 0: {
-            //left视图响应
-            maxX = rct.origin.x + rct.size.width - kItemWidth;
-            
-            point.x = MAX(minX, MIN(point.x, maxX));
-            point.y = 0;
-            
-            rct.size.width -= (point.x - rct.origin.x);
-            rct.origin.x = point.x;
-        }
-            break;
-            
-        case 1:
-        {
-            //right视图响应
-            minX = rct.origin.x + kItemWidth/2;
-            maxX = W - kItemWidth/2;
-            
-            point.x = MAX(minX, MIN(point.x, maxX));
-            point.y = 0;
-            
-            rct.size.width = (point.x - rct.origin.x + kItemWidth/2);
-        }
-            break;
-    }
-    
-    switch (pan.state) {
-        case UIGestureRecognizerStateBegan:
-        case UIGestureRecognizerStateChanged:
-            if (self.delegate && [self.delegate respondsToSelector:@selector(editViewValidRectChanged)]) {
-                [self.delegate editViewValidRectChanged];//滑动响应实现
-            }
-            break;
-            
-        case UIGestureRecognizerStateEnded:
-        case UIGestureRecognizerStateCancelled:
-            self.layer.borderColor = [UIColor clearColor].CGColor;
-            if (self.delegate && [self.delegate respondsToSelector:@selector(editViewValidRectEndChanged)]) {
-                [self.delegate editViewValidRectEndChanged];//滑动结束响应实现
-            }
-            break;
-            
-        default:
-            break;
-    }
-    
+    #pragma mark - TODO: 2019.11.12 需要其他库依赖
+//    const CGFloat W = self.width;
+//    CGFloat minX = 0;
+//    CGFloat maxX = W;
+//
+//    switch (pan.view.tag) {
+//        case 0: {
+//            //left视图响应
+//            maxX = rct.origin.x + rct.size.width - kItemWidth;
+//
+//            point.x = MAX(minX, MIN(point.x, maxX));
+//            point.y = 0;
+//
+//            rct.size.width -= (point.x - rct.origin.x);
+//            rct.origin.x = point.x;
+//        }
+//            break;
+//
+//        case 1:
+//        {
+//            //right视图响应
+//            minX = rct.origin.x + kItemWidth/2;
+//            maxX = W - kItemWidth/2;
+//
+//            point.x = MAX(minX, MIN(point.x, maxX));
+//            point.y = 0;
+//
+//            rct.size.width = (point.x - rct.origin.x + kItemWidth/2);
+//        }
+//            break;
+//    }
+//
+//    switch (pan.state) {
+//        case UIGestureRecognizerStateBegan:
+//        case UIGestureRecognizerStateChanged:
+//            if (self.delegate && [self.delegate respondsToSelector:@selector(editViewValidRectChanged)]) {
+//                [self.delegate editViewValidRectChanged];//滑动响应实现
+//            }
+//            break;
+//
+//        case UIGestureRecognizerStateEnded:
+//        case UIGestureRecognizerStateCancelled:
+//            self.layer.borderColor = [UIColor clearColor].CGColor;
+//            if (self.delegate && [self.delegate respondsToSelector:@selector(editViewValidRectEndChanged)]) {
+//                [self.delegate editViewValidRectEndChanged];//滑动结束响应实现
+//            }
+//            break;
+//
+//        default:
+//            break;
+//    }
+//
+    //////////////////////////////
     self.validRect = rct;
 }
@@ -298,29 +299,30 @@
 - (void)viewDidLayoutSubviews
 {
     [super viewDidLayoutSubviews];
-    
-    UIEdgeInsets inset = UIEdgeInsetsZero;
-    if (@available(iOS 11, *)) {
-        inset = self.view.safeAreaInsets;
-    }
-    
-    self.playerLayer.frame = CGRectMake(15, inset.top>0?inset.top:30, KScreenWidth-30, KScreenHeight-160-inset.bottom);
-   
-    self.editView.frame = CGRectMake((KScreenWidth-kItemWidth*10)/2, KScreenHeight-100-inset.bottom, kItemWidth*10, kItemHeight);
-    self.editView.validRect = self.editView.bounds;
-    self.collectionView.frame = CGRectMake(inset.left, KScreenHeight-100-inset.bottom, KScreenWidth-inset.left-inset.right, kItemHeight);
-   
-    CGFloat leftOffset = ((KScreenWidth-kItemWidth*10)/2-inset.left);
-    CGFloat rightOffset = ((KScreenWidth-kItemWidth*10)/2-inset.right);
-    [self.collectionView setContentInset:UIEdgeInsetsMake(0, leftOffset, 0, rightOffset)];
-    [self.collectionView setContentOffset:CGPointMake(_offsetX-leftOffset, 0)];
-    
-    CGFloat bottomViewH = 44;
-    CGFloat bottomBtnH = 30;
-    _bottomView.frame = CGRectMake(0, KScreenHeight-bottomViewH-inset.bottom, KScreenWidth, kItemHeight);
-    _cancelBtn.frame = CGRectMake(10+inset.left, 7, 60, bottomBtnH);
-    _doneBtn.frame = CGRectMake(KScreenWidth-70-inset.right, 7, 60, bottomBtnH);
-    
+    #pragma mark - TODO: 2019.11.12 需要其他库依赖
+//    UIEdgeInsets inset = UIEdgeInsetsZero;
+//    if (@available(iOS 11, *)) {
+//        inset = self.view.safeAreaInsets;
+//    }
+//
+//    self.playerLayer.frame = CGRectMake(15, inset.top>0?inset.top:30, KScreenWidth-30, KScreenHeight-160-inset.bottom);
+//
+//    self.editView.frame = CGRectMake((KScreenWidth-kItemWidth*10)/2, KScreenHeight-100-inset.bottom, kItemWidth*10, kItemHeight);
+//    self.editView.validRect = self.editView.bounds;
+//    self.collectionView.frame = CGRectMake(inset.left, KScreenHeight-100-inset.bottom, KScreenWidth-inset.left-inset.right, kItemHeight);
+//
+//    CGFloat leftOffset = ((KScreenWidth-kItemWidth*10)/2-inset.left);
+//    CGFloat rightOffset = ((KScreenWidth-kItemWidth*10)/2-inset.right);
+//    [self.collectionView setContentInset:UIEdgeInsetsMake(0, leftOffset, 0, rightOffset)];
+//    [self.collectionView setContentOffset:CGPointMake(_offsetX-leftOffset, 0)];
+//
+//    CGFloat bottomViewH = 44;
+//    CGFloat bottomBtnH = 30;
+//    _bottomView.frame = CGRectMake(0, KScreenHeight-bottomViewH-inset.bottom, KScreenWidth, kItemHeight);
+//    _cancelBtn.frame = CGRectMake(10+inset.left, 7, 60, bottomBtnH);
+//    _doneBtn.frame = CGRectMake(KScreenWidth-70-inset.right, 7, 60, bottomBtnH);
+//
+    ///////////////////////////////////////
     [self.playerLayer setBackgroundColor:[UIColor clearColor].CGColor];
 }
@@ -377,7 +379,9 @@
     [self.view addSubview:self.editView];
     _indicatorLine = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 2, kItemHeight)];
-    _indicatorLine.backgroundColor = [RGBOF(0x0BBE06) colorWithAlphaComponent:.7];
+    #pragma mark - TODO: 2019.11.12 需要其他库依赖
+//    _indicatorLine.backgroundColor = [RGBOF(0x0BBE06) colorWithAlphaComponent:.7];
+    /////////////////
 }
 - (void)creatBottomView
@@ -393,12 +397,14 @@
     [_cancelBtn setTitle:@"取消" forState:UIControlStateNormal];
     [_cancelBtn addTarget:self action:@selector(cancelBtn_click) forControlEvents:UIControlEventTouchUpInside];
     [_bottomView addSubview:_cancelBtn];
-    
-    _doneBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-    [_doneBtn setTitle:@"完成" forState:UIControlStateNormal];
-    [_doneBtn setBackgroundColor:[UIColor clearColor]];
-    [_doneBtn setTitleColor:RGBOF(0x0BBE06) forState:UIControlStateNormal];
-    _doneBtn.titleLabel.font = [UIFont systemFontOfSize:15];
+    #pragma mark - TODO: 2019.11.12 需要其他库依赖
+//    _doneBtn = [UIButton buttonWithType:UIButtonTypeCustom];
+//    [_doneBtn setTitle:@"完成" forState:UIControlStateNormal];
+//    [_doneBtn setBackgroundColor:[UIColor clearColor]];
+//
+//    [_doneBtn setTitleColor:RGBOF(0x0BBE06) forState:UIControlStateNormal];
+//    _doneBtn.titleLabel.font = [UIFont systemFontOfSize:15];
+    ////////////////////////
     _doneBtn.layer.masksToBounds = YES;
     _doneBtn.layer.cornerRadius = 3.0f;
     [_doneBtn addTarget:self action:@selector(btnDone_click) forControlEvents:UIControlEventTouchUpInside];
@@ -502,12 +508,23 @@
     TZImagePickerController *_tzImagePickerVc = (TZImagePickerController *)self.navigationController;
     [_tzImagePickerVc showProgressHUD];
+    _doneBtn.enabled = NO;
+    _cancelBtn.enabled = NO;
     __weak typeof(self) weakSelf = self;
+    if (!_avAsset) {
+        [_tzImagePickerVc hideProgressHUD];
+        [_tzImagePickerVc showAlertWithTitle:@"编辑视频失败"];
+        _doneBtn.enabled = YES;
+        _cancelBtn.enabled = YES;
+        return;
+    }
     [self exportEditVideoForAsset:_avAsset range:[self getTimeRange] complete:^(BOOL isSuc, id asset) {
         [_tzImagePickerVc hideProgressHUD];
+        
         if (isSuc) {
             [self stopPlay];
+            [_tzImagePickerVc showProgressHUD];
             TZAssetModel *editModel = [TZAssetModel modelWithAsset:asset type:TZAssetModelMediaTypeVideo];
             // 如果没有选中过照片 点击确定时选中当前预览的照片
@@ -519,8 +536,17 @@
                 weakSelf.doneButtonEditClickBlock(_tzImagePickerVc.isSelectOriginalPhoto);
             }
             [_tzImagePickerVc hideProgressHUD];
+            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                self->_doneBtn.enabled = YES;
+                self->_cancelBtn.enabled = YES;
+            });
+            
         }else{
             [_tzImagePickerVc showAlertWithTitle:@"编辑失败"];
+            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                self->_doneBtn.enabled = YES;
+                self->_cancelBtn.enabled = YES;
+            });
         }
     }];
@@ -44,254 +44,256 @@
     // imagePickerVc.oKButtonTitleColorDisabled = [UIColor lightGrayColor];
     // imagePickerVc.oKButtonTitleColorNormal = [UIColor greenColor];
     // imagePickerVc.navigationBar.translucent = NO;
-    self.iconThemeColor = RGBOF(0x00BBE06);// 主体颜色
-    self.showPhotoCannotSelectLayer = YES;//达到上限是否有浮层
-    self.cannotSelectLayerColor = [[UIColor whiteColor] colorWithAlphaComponent:0.8];//设置达到上限的浮层
-    self.photoDefImage = [UIImage imageNamed:@"photo_cell_normal"];
-    self.photoSelImage = [UIImage qmui_imageWithColor:RGBOF(0x0BBE06) size:CGSizeMake(22, 22) cornerRadius:11];
-    self.photoOriginDefImage = [UIImage imageNamed:@"photo_original_nor"];
-    
-    // 3. Set allow picking video & photo & originalPhoto or not
-    // 3. 设置是否可以选择视频/图片/原图/gif(未开放)
-    self.allowPickingVideo = YES;// 显示视频
-    self.allowPickingImage = YES;// 显示图片
-    self.allowPickingOriginalPhoto = YES; //显示原图
-    self.allowPickingGif = NO;// 显示GIF
-    self.allowPickingMultipleVideo = YES; // 是否可以多选视频
-    
-    // 4. 照片排列按修改时间升序
-    self.sortAscendingByModificationDate = YES;
-    
-    // imagePickerVc.minImagesCount = 3;
-    // imagePickerVc.alwaysEnableDoneBtn = YES;
-    
-    // imagePickerVc.minPhotoWidthSelectable = 3000;
-    // imagePickerVc.minPhotoHeightSelectable = 2000;
-    
-    /// 5. Single selection mode, valid when maxImagesCount = 1
-    /// 5. 单选模式,maxImagesCount为1时才生效
-    self.showSelectBtn = NO;
-    self.allowCrop = NO;
-    self.needCircleCrop = NO;
-    // 设置横屏下的裁剪尺寸
-    // imagePickerVc.cropRectLandscape = CGRectMake((self.view.tz_height - widthHeight) / 2, left, widthHeight, widthHeight);
-    /*
-     [imagePickerVc setCropViewSettingBlock:^(UIView *cropView) {
-     cropView.layer.borderColor = [UIColor redColor].CGColor;
-     cropView.layer.borderWidth = 2.0;
-     }];*/
-    
-    //imagePickerVc.allowPreview = NO;
-    // 自定义导航栏上的返回按钮
-    /*
-     [imagePickerVc setNavLeftBarButtonSettingBlock:^(UIButton *leftButton){
-     [leftButton setImage:[UIImage imageNamed:@"back"] forState:UIControlStateNormal];
-     [leftButton setImageEdgeInsets:UIEdgeInsetsMake(0, -10, 0, 20)];
-     }];
-     imagePickerVc.delegate = self;
-     */
-    
-    self.statusBarStyle = UIStatusBarStyleDefault;//状态栏黑色
-    
-    self.showSelectedIndex = YES;    // 设置是否显示图片序号
-    
-    self.naviBgColor = RGBOF(0xFFFFFF);//导航栏颜色
-    self.naviTitleColor = RGBOF(0x282828);//相册title
-    self.naviTitleFont = [UIFont fontWithName:@"PingFangSC-Medium" size:18];//title文字大小
-    [self setNavLeftBarButtonSettingBlock:^(UIButton *leftButton) {//设置返回按钮图标
-        [leftButton setImage:[UIImage imageNamed:@"photo_back"] forState:UIControlStateNormal];//返回按钮图片
-        [leftButton setTitle:@"返回" forState:UIControlStateNormal];//设置文字大小
-        [leftButton setTitleColor:RGBOF(0x282828) forState:UIControlStateNormal];//设置文字颜色
-        leftButton.titleLabel.font = [UIFont systemFontOfSize:15];//设置文字大小
-        leftButton.imageEdgeInsets = UIEdgeInsetsMake(0, -7, 0, +7);//设置图片边缘
-    }];
-    self.barItemTextColor = RGBOF(0x282828);//设置barItem文字颜色
-    self.barItemTextFont = [UIFont systemFontOfSize:15];
-    
-    // 设置首选语言 / Set preferred language
-    // imagePickerVc.preferredLanguage = @"zh-Hans";
-    
-    // 设置languageBundle以使用其它语言 / Set languageBundle to use other language
-    // imagePickerVc.languageBundle = [NSBundle bundleWithPath:[[NSBundle mainBundle] pathForResource:@"tz-ru" ofType:@"lproj"]];
-    
-    /// 【自定义各页面/组件的样式】在界面初始化/组件setModel完成后调用，允许外界修改样式等
-    //相册
-    [self setPhotoPickerPageUIConfigBlock:^(UICollectionView *collectionView, UIView *bottomToolBar, UIButton *previewButton, UIButton *originalPhotoButton, UILabel *originalPhotoLabel, UIButton *doneButton, UIImageView *numberImageView, UILabel *numberLabel, UIView *divideLine) {
-        
-        //底部栏
-        [bottomToolBar setBackgroundColor:RGBOF(0xFFFFFF)];
-        
-        //预览
-        previewButton.titleLabel.font = [UIFont systemFontOfSize:16];
-        [previewButton setTitleColor:RGBOF(0xB3B3B3) forState:UIControlStateDisabled];//禁用
-        [previewButton setTitleColor:RGBOF(0x000000) forState:UIControlStateNormal];//默认
-        
-        //原图按钮
-        [originalPhotoButton setImage:[UIImage imageNamed:@"photo_original_normal"] forState:UIControlStateDisabled];//禁用
-        [originalPhotoButton setImage:[UIImage imageNamed:@"photo_original_normal"] forState:UIControlStateNormal];//默认
-        [originalPhotoButton setImage:[UIImage imageNamed:@"photo_original_select"] forState:UIControlStateSelected];//选中
-        originalPhotoButton.titleLabel.font = [UIFont systemFontOfSize:16];
-        [originalPhotoButton setTitleColor:RGBOF(0xB3B3B3) forState:UIControlStateDisabled];
-        [originalPhotoButton setTitleColor:RGBOF(0x000000) forState:UIControlStateNormal];
-        
-        //原图文字提示
-        originalPhotoLabel.font = [UIFont fontWithName:@"PingFang-SC-Regular" size:16];
-        originalPhotoLabel.textColor = RGBOF(0xB3B3B3);
-        originalPhotoLabel.hidden = YES;
-        
-        //选中提示
-        numberImageView = [UIImageView new];
-        numberLabel = [UILabel new];
-        
-        //完成按钮
-        doneButton.titleLabel.font = [UIFont systemFontOfSize:13];
-        [doneButton setTitle:@"完成" forState:UIControlStateDisabled];
-        [doneButton setTitleColor:RGBAOF(0xFFFFFF, 0.5) forState:UIControlStateDisabled];
-        [doneButton setTitleColor:RGBOF(0xFFFFFF) forState:UIControlStateNormal];
-        
-        //颜色绘制成图片
-        UIImage *dis_image = [UIImage qmui_imageWithColor:RGBAOF(0x0BBE06, 0.5)];
-        [doneButton setBackgroundImage:dis_image forState:UIControlStateDisabled];
-        UIImage *nor_image = [UIImage qmui_imageWithColor:RGBOF(0x0BBE06)];
-        [doneButton setBackgroundImage:nor_image forState:UIControlStateNormal];
-        doneButton.layer.masksToBounds = YES;
-        doneButton.layer.cornerRadius = 5;
-        
-        //分割线
-        [divideLine setBackgroundColor:RGBOF(0xDEDEDE)];
-        
-    }];
-    
-    //图片预览
-    [self setPhotoPreviewPageUIConfigBlock:^(UICollectionView *collectionView, UIView *naviBar, UIButton *backButton, UIButton *selectButton, UILabel *indexLabel, UIView *toolBar, UIButton *originalPhotoButton, UILabel *originalPhotoLabel, UIButton *doneButton, UIImageView *numberImageView, UILabel *numberLabel) {
-        
-        //返回按钮
-        [backButton setImage:[UIImage imageNamed:@"photo_original_back"] forState:UIControlStateNormal];
-        //选择按钮
-        [selectButton setImage:[UIImage imageNamed:@"photo_original_nor"] forState:UIControlStateNormal];
-        [selectButton setImage:[UIImage qmui_imageWithColor:RGBOF(0x0BBE06) size:CGSizeMake(28, 28) cornerRadius:14] forState:UIControlStateSelected];
-        [selectButton setTitle:@"" forState:UIControlStateDisabled];
-        
-        //原图按钮
-        [originalPhotoButton setImage:[UIImage imageNamed:@"photo_original_normal"] forState:UIControlStateDisabled];//禁用
-        [originalPhotoButton setImage:[UIImage imageNamed:@"photo_original_normal"] forState:UIControlStateNormal];//默认
-        [originalPhotoButton setImage:[UIImage imageNamed:@"photo_original_select"] forState:UIControlStateSelected];//选中
-        originalPhotoButton.titleLabel.font = [UIFont systemFontOfSize:16];
-        [originalPhotoButton setTitleColor:RGBOF(0xB3B3B3) forState:UIControlStateDisabled];
-        [originalPhotoButton setTitleColor:RGBAOF(0xFFFFFF, 0.7) forState:UIControlStateNormal];
-        //原图内容隐藏
-        originalPhotoLabel.hidden = YES;
-        
-        //完成按钮
-        doneButton.titleLabel.font = [UIFont systemFontOfSize:13];
-        [doneButton setTitle:@"完成" forState:UIControlStateDisabled];
-        [doneButton setTitleColor:RGBOF(0xFFFFFF) forState:UIControlStateDisabled];
-        [doneButton setTitleColor:RGBOF(0xFFFFFF) forState:UIControlStateNormal];
-        
-        //颜色绘制成图片
-        UIImage *dis_image = [UIImage qmui_imageWithColor:RGBAOF(0x0BBE06, 0.5)];
-        [doneButton setBackgroundImage:dis_image forState:UIControlStateSelected];
-        UIImage *nor_image = [UIImage qmui_imageWithColor:RGBOF(0x0BBE06)];
-        [doneButton setBackgroundImage:nor_image forState:UIControlStateNormal];
-        doneButton.layer.masksToBounds = YES;
-        doneButton.layer.cornerRadius = 5;
-    }];
-    
-    //视频预览
-    [self setVideoPreviewPageUIConfigBlock:^(UIButton *playButton, UIView *toolBar, UIButton *doneButton) {
-        
-        //完成按钮
-        doneButton.titleLabel.font = [UIFont systemFontOfSize:13];
-        [doneButton setTitle:@"完成" forState:UIControlStateDisabled];
-        [doneButton setTitleColor:RGBOF(0xFFFFFF) forState:UIControlStateDisabled];
-        [doneButton setTitleColor:RGBOF(0xFFFFFF) forState:UIControlStateNormal];
-        
-        //颜色绘制成图片
-        UIImage *dis_image = [UIImage qmui_imageWithColor:RGBAOF(0x0BBE06, 0.5)];
-        [doneButton setBackgroundImage:dis_image forState:UIControlStateSelected];
-        UIImage *nor_image = [UIImage qmui_imageWithColor:RGBOF(0x0BBE06)];
-        [doneButton setBackgroundImage:nor_image forState:UIControlStateNormal];
-        doneButton.layer.masksToBounds = YES;
-        doneButton.layer.cornerRadius = 5;
-        
-    }];
-    
-    //gif预览
-    [self setGifPreviewPageUIConfigBlock:^(UIView *toolBar, UIButton *doneButton) {
-        
-        //完成按钮
-        doneButton.titleLabel.font = [UIFont systemFontOfSize:13];
-        [doneButton setTitle:@"完成" forState:UIControlStateDisabled];
-        [doneButton setTitleColor:RGBOF(0xFFFFFF) forState:UIControlStateDisabled];
-        [doneButton setTitleColor:RGBOF(0xFFFFFF) forState:UIControlStateNormal];
-        
-        //颜色绘制成图片
-        UIImage *dis_image = [UIImage qmui_imageWithColor:RGBAOF(0x0BBE06, 0.5)];
-        [doneButton setBackgroundImage:dis_image forState:UIControlStateSelected];
-        UIImage *nor_image = [UIImage qmui_imageWithColor:RGBOF(0x0BBE06)];
-        [doneButton setBackgroundImage:nor_image forState:UIControlStateNormal];
-        doneButton.layer.masksToBounds = YES;
-        doneButton.layer.cornerRadius = 5;
-        
-    }];
-    //相册cell
-    [self setAssetCellDidSetModelBlock:^(TZAssetCell *cell, UIImageView *imageView, UIImageView *selectImageView, UILabel *indexLabel, UIView *bottomView, UILabel *timeLength, UIImageView *videoImgView) {
-        
-        
-    }];
-    //相簿
-    [self setAlbumCellDidSetModelBlock:^(TZAlbumCell *cell, UIImageView *posterImageView, UILabel *titleLabel) {
-        [posterImageView setBackgroundColor:[UIColor blueColor]];
-        [posterImageView setBackgroundColor:[UIColor blueColor]];
-        
-    }];
-    
-    
-    /// 【自定义各页面/组件的frame】在界面viewDidLayoutSubviews/组件layoutSubviews后调用，允许外界修改frame等
-    //相册
-    [self setPhotoPickerPageDidLayoutSubviewsBlock:^(UICollectionView *collectionView, UIView *bottomToolBar, UIButton *previewButton, UIButton *originalPhotoButton, UILabel *originalPhotoLabel, UIButton *doneButton, UIImageView *numberImageView, UILabel *numberLabel, UIView *divideLine) {
-        
-        CGRect frame = bottomToolBar.frame;
-        doneButton.frame = CGRectMake(frame.size.width - 60 - 13, frame.size.height /2 - 15 - (kVerticalBottomSafeHeight /2), 60, 30);
-        
-        CGRect originalPhotoLabelFrame = originalPhotoLabel.frame;
-        CGFloat originalX = (bottomToolBar.frame.size.width - originalPhotoLabelFrame.size.width) /2;
-        CGFloat originalY = originalPhotoLabelFrame.origin.y;
-        originalPhotoButton.frame = CGRectMake(originalX, originalY, originalPhotoLabelFrame.size.width, originalPhotoLabelFrame.size.height);
-
-        
-    }];
-    //图片预览
-    [self setPhotoPreviewPageDidLayoutSubviewsBlock:^(UICollectionView *collectionView, UIView *naviBar, UIButton *backButton, UIButton *selectButton, UILabel *indexLabel, UIView *toolBar, UIButton *originalPhotoButton, UILabel *originalPhotoLabel, UIButton *doneButton, UIImageView *numberImageView, UILabel *numberLabel) {
-
-        CGRect frame = toolBar.frame;
-        doneButton.frame = CGRectMake(frame.size.width - 60 - 13, frame.size.height /2 - 15 - (kVerticalBottomSafeHeight /2), 60, 30);
-        
-    }];
-    //视频预览
-    [self setVideoPreviewPageDidLayoutSubviewsBlock:^(UIButton *playButton, UIView *toolBar, UIButton *doneButton) {
-        
-        CGRect frame = toolBar.frame;
-        doneButton.frame = CGRectMake(frame.size.width - 60 - 13, frame.size.height /2 - 15 - (kVerticalBottomSafeHeight /2), 60, 30);
-        
-    }];
-    //gif预览
-    [self setGifPreviewPageDidLayoutSubviewsBlock:^(UIView *toolBar, UIButton *doneButton) {
-        
-        CGRect frame = toolBar.frame;
-        doneButton.frame = CGRectMake(frame.size.width - 60 - 13, frame.size.height /2 - 15 - (kVerticalBottomSafeHeight /2), 60, 30);
-        
-    }];
-    //相册cell
-    [self setAssetCellDidLayoutSubviewsBlock:^(TZAssetCell *cell, UIImageView *imageView, UIImageView *selectImageView, UILabel *indexLabel, UIView *bottomView, UILabel *timeLength, UIImageView *videoImgView) {
-    }];
-    //相簿
-    [self setAlbumCellDidLayoutSubviewsBlock:^(TZAlbumCell *cell, UIImageView *posterImageView, UILabel *titleLabel) {
-        
-    }];
-    
-    //设置图片个数
-    self.photoNumberIconImage = [UIImage new];
+    #pragma mark - TODO: 2019.11.12 需要其他库依赖
+//    self.iconThemeColor = RGBOF(0x00BBE06);// 主体颜色
+//    self.showPhotoCannotSelectLayer = YES;//达到上限是否有浮层
+//    self.cannotSelectLayerColor = [[UIColor whiteColor] colorWithAlphaComponent:0.8];//设置达到上限的浮层
+//    self.photoDefImage = [UIImage imageNamed:@"photo_cell_normal"];
+//    self.photoSelImage = [UIImage qmui_imageWithColor:RGBOF(0x0BBE06) size:CGSizeMake(22, 22) cornerRadius:11];
+//    self.photoOriginDefImage = [UIImage imageNamed:@"photo_original_nor"];
+//
+//    // 3. Set allow picking video & photo & originalPhoto or not
+//    // 3. 设置是否可以选择视频/图片/原图/gif(未开放)
+//    self.allowPickingVideo = YES;// 显示视频
+//    self.allowPickingImage = YES;// 显示图片
+//    self.allowPickingOriginalPhoto = YES; //显示原图
+//    self.allowPickingGif = NO;// 显示GIF
+//    self.allowPickingMultipleVideo = YES; // 是否可以多选视频
+//
+//    // 4. 照片排列按修改时间升序
+//    self.sortAscendingByModificationDate = YES;
+//
+//    // imagePickerVc.minImagesCount = 3;
+//    // imagePickerVc.alwaysEnableDoneBtn = YES;
+//
+//    // imagePickerVc.minPhotoWidthSelectable = 3000;
+//    // imagePickerVc.minPhotoHeightSelectable = 2000;
+//
+//    /// 5. Single selection mode, valid when maxImagesCount = 1
+//    /// 5. 单选模式,maxImagesCount为1时才生效
+//    self.showSelectBtn = NO;
+//    self.allowCrop = NO;
+//    self.needCircleCrop = NO;
+//    // 设置横屏下的裁剪尺寸
+//    // imagePickerVc.cropRectLandscape = CGRectMake((self.view.tz_height - widthHeight) / 2, left, widthHeight, widthHeight);
+//    /*
+//     [imagePickerVc setCropViewSettingBlock:^(UIView *cropView) {
+//     cropView.layer.borderColor = [UIColor redColor].CGColor;
+//     cropView.layer.borderWidth = 2.0;
+//     }];*/
+//
+//    //imagePickerVc.allowPreview = NO;
+//    // 自定义导航栏上的返回按钮
+//    /*
+//     [imagePickerVc setNavLeftBarButtonSettingBlock:^(UIButton *leftButton){
+//     [leftButton setImage:[UIImage imageNamed:@"back"] forState:UIControlStateNormal];
+//     [leftButton setImageEdgeInsets:UIEdgeInsetsMake(0, -10, 0, 20)];
+//     }];
+//     imagePickerVc.delegate = self;
+//     */
+//
+//    self.statusBarStyle = UIStatusBarStyleDefault;//状态栏黑色
+//
+//    self.showSelectedIndex = YES;    // 设置是否显示图片序号
+//
+//    self.naviBgColor = RGBOF(0xFFFFFF);//导航栏颜色
+//    self.naviTitleColor = RGBOF(0x282828);//相册title
+//    self.naviTitleFont = [UIFont fontWithName:@"PingFangSC-Medium" size:18];//title文字大小
+//    [self setNavLeftBarButtonSettingBlock:^(UIButton *leftButton) {//设置返回按钮图标
+//        [leftButton setImage:[UIImage imageNamed:@"photo_back"] forState:UIControlStateNormal];//返回按钮图片
+//        [leftButton setTitle:@"返回" forState:UIControlStateNormal];//设置文字大小
+//        [leftButton setTitleColor:RGBOF(0x282828) forState:UIControlStateNormal];//设置文字颜色
+//        leftButton.titleLabel.font = [UIFont systemFontOfSize:15];//设置文字大小
+//        leftButton.imageEdgeInsets = UIEdgeInsetsMake(0, -7, 0, +7);//设置图片边缘
+//    }];
+//    self.barItemTextColor = RGBOF(0x282828);//设置barItem文字颜色
+//    self.barItemTextFont = [UIFont systemFontOfSize:15];
+//
+//    // 设置首选语言 / Set preferred language
+//    // imagePickerVc.preferredLanguage = @"zh-Hans";
+//
+//    // 设置languageBundle以使用其它语言 / Set languageBundle to use other language
+//    // imagePickerVc.languageBundle = [NSBundle bundleWithPath:[[NSBundle mainBundle] pathForResource:@"tz-ru" ofType:@"lproj"]];
+//
+//    /// 【自定义各页面/组件的样式】在界面初始化/组件setModel完成后调用，允许外界修改样式等
+//    //相册
+//    [self setPhotoPickerPageUIConfigBlock:^(UICollectionView *collectionView, UIView *bottomToolBar, UIButton *previewButton, UIButton *originalPhotoButton, UILabel *originalPhotoLabel, UIButton *doneButton, UIImageView *numberImageView, UILabel *numberLabel, UIView *divideLine) {
+//
+//        //底部栏
+//        [bottomToolBar setBackgroundColor:RGBOF(0xFFFFFF)];
+//
+//        //预览
+//        previewButton.titleLabel.font = [UIFont systemFontOfSize:16];
+//        [previewButton setTitleColor:RGBOF(0xB3B3B3) forState:UIControlStateDisabled];//禁用
+//        [previewButton setTitleColor:RGBOF(0x000000) forState:UIControlStateNormal];//默认
+//
+//        //原图按钮
+//        [originalPhotoButton setImage:[UIImage imageNamed:@"photo_original_normal"] forState:UIControlStateDisabled];//禁用
+//        [originalPhotoButton setImage:[UIImage imageNamed:@"photo_original_normal"] forState:UIControlStateNormal];//默认
+//        [originalPhotoButton setImage:[UIImage imageNamed:@"photo_original_select"] forState:UIControlStateSelected];//选中
+//        originalPhotoButton.titleLabel.font = [UIFont systemFontOfSize:16];
+//        [originalPhotoButton setTitleColor:RGBOF(0xB3B3B3) forState:UIControlStateDisabled];
+//        [originalPhotoButton setTitleColor:RGBOF(0x000000) forState:UIControlStateNormal];
+//
+//        //原图文字提示
+//        originalPhotoLabel.font = [UIFont fontWithName:@"PingFang-SC-Regular" size:16];
+//        originalPhotoLabel.textColor = RGBOF(0xB3B3B3);
+//        originalPhotoLabel.hidden = YES;
+//
+//        //选中提示
+//        numberImageView = [UIImageView new];
+//        numberLabel = [UILabel new];
+//
+//        //完成按钮
+//        doneButton.titleLabel.font = [UIFont systemFontOfSize:13];
+//        [doneButton setTitle:@"完成" forState:UIControlStateDisabled];
+//        [doneButton setTitleColor:RGBAOF(0xFFFFFF, 0.5) forState:UIControlStateDisabled];
+//        [doneButton setTitleColor:RGBOF(0xFFFFFF) forState:UIControlStateNormal];
+//
+//        //颜色绘制成图片
+//        UIImage *dis_image = [UIImage qmui_imageWithColor:RGBAOF(0x0BBE06, 0.5)];
+//        [doneButton setBackgroundImage:dis_image forState:UIControlStateDisabled];
+//        UIImage *nor_image = [UIImage qmui_imageWithColor:RGBOF(0x0BBE06)];
+//        [doneButton setBackgroundImage:nor_image forState:UIControlStateNormal];
+//        doneButton.layer.masksToBounds = YES;
+//        doneButton.layer.cornerRadius = 5;
+//
+//        //分割线
+//        [divideLine setBackgroundColor:RGBOF(0xDEDEDE)];
+//
+//    }];
+  
+//    //图片预览
+//    [self setPhotoPreviewPageUIConfigBlock:^(UICollectionView *collectionView, UIView *naviBar, UIButton *backButton, UIButton *selectButton, UILabel *indexLabel, UIView *toolBar, UIButton *originalPhotoButton, UILabel *originalPhotoLabel, UIButton *doneButton, UIImageView *numberImageView, UILabel *numberLabel) {
+//
+//        //返回按钮
+//        [backButton setImage:[UIImage imageNamed:@"photo_original_back"] forState:UIControlStateNormal];
+//        //选择按钮
+//        [selectButton setImage:[UIImage imageNamed:@"photo_original_nor"] forState:UIControlStateNormal];
+//        [selectButton setImage:[UIImage qmui_imageWithColor:RGBOF(0x0BBE06) size:CGSizeMake(28, 28) cornerRadius:14] forState:UIControlStateSelected];
+//        [selectButton setTitle:@"" forState:UIControlStateDisabled];
+//
+//        //原图按钮
+//        [originalPhotoButton setImage:[UIImage imageNamed:@"photo_original_normal"] forState:UIControlStateDisabled];//禁用
+//        [originalPhotoButton setImage:[UIImage imageNamed:@"photo_original_normal"] forState:UIControlStateNormal];//默认
+//        [originalPhotoButton setImage:[UIImage imageNamed:@"photo_original_select"] forState:UIControlStateSelected];//选中
+//        originalPhotoButton.titleLabel.font = [UIFont systemFontOfSize:16];
+//        [originalPhotoButton setTitleColor:RGBOF(0xB3B3B3) forState:UIControlStateDisabled];
+//        [originalPhotoButton setTitleColor:RGBAOF(0xFFFFFF, 0.7) forState:UIControlStateNormal];
+//        //原图内容隐藏
+//        originalPhotoLabel.hidden = YES;
+//
+//        //完成按钮
+//        doneButton.titleLabel.font = [UIFont systemFontOfSize:13];
+//        [doneButton setTitle:@"完成" forState:UIControlStateDisabled];
+//        [doneButton setTitleColor:RGBOF(0xFFFFFF) forState:UIControlStateDisabled];
+//        [doneButton setTitleColor:RGBOF(0xFFFFFF) forState:UIControlStateNormal];
+//
+//        //颜色绘制成图片
+//        UIImage *dis_image = [UIImage qmui_imageWithColor:RGBAOF(0x0BBE06, 0.5)];
+//        [doneButton setBackgroundImage:dis_image forState:UIControlStateSelected];
+//        UIImage *nor_image = [UIImage qmui_imageWithColor:RGBOF(0x0BBE06)];
+//        [doneButton setBackgroundImage:nor_image forState:UIControlStateNormal];
+//        doneButton.layer.masksToBounds = YES;
+//        doneButton.layer.cornerRadius = 5;
+//    }];
+//
+//    //视频预览
+//    [self setVideoPreviewPageUIConfigBlock:^(UIButton *playButton, UIView *toolBar, UIButton *doneButton) {
+//
+//        //完成按钮
+//        doneButton.titleLabel.font = [UIFont systemFontOfSize:13];
+//        [doneButton setTitle:@"完成" forState:UIControlStateDisabled];
+//        [doneButton setTitleColor:RGBOF(0xFFFFFF) forState:UIControlStateDisabled];
+//        [doneButton setTitleColor:RGBOF(0xFFFFFF) forState:UIControlStateNormal];
+//
+//        //颜色绘制成图片
+//        UIImage *dis_image = [UIImage qmui_imageWithColor:RGBAOF(0x0BBE06, 0.5)];
+//        [doneButton setBackgroundImage:dis_image forState:UIControlStateSelected];
+//        UIImage *nor_image = [UIImage qmui_imageWithColor:RGBOF(0x0BBE06)];
+//        [doneButton setBackgroundImage:nor_image forState:UIControlStateNormal];
+//        doneButton.layer.masksToBounds = YES;
+//        doneButton.layer.cornerRadius = 5;
+//
+//    }];
+//
+//    //gif预览
+//    [self setGifPreviewPageUIConfigBlock:^(UIView *toolBar, UIButton *doneButton) {
+//
+//        //完成按钮
+//        doneButton.titleLabel.font = [UIFont systemFontOfSize:13];
+//        [doneButton setTitle:@"完成" forState:UIControlStateDisabled];
+//        [doneButton setTitleColor:RGBOF(0xFFFFFF) forState:UIControlStateDisabled];
+//        [doneButton setTitleColor:RGBOF(0xFFFFFF) forState:UIControlStateNormal];
+//
+//        //颜色绘制成图片
+//        UIImage *dis_image = [UIImage qmui_imageWithColor:RGBAOF(0x0BBE06, 0.5)];
+//        [doneButton setBackgroundImage:dis_image forState:UIControlStateSelected];
+//        UIImage *nor_image = [UIImage qmui_imageWithColor:RGBOF(0x0BBE06)];
+//        [doneButton setBackgroundImage:nor_image forState:UIControlStateNormal];
+//        doneButton.layer.masksToBounds = YES;
+//        doneButton.layer.cornerRadius = 5;
+//
+//    }];
+//    //相册cell
+//    [self setAssetCellDidSetModelBlock:^(TZAssetCell *cell, UIImageView *imageView, UIImageView *selectImageView, UILabel *indexLabel, UIView *bottomView, UILabel *timeLength, UIImageView *videoImgView) {
+//
+//
+//    }];
+//    //相簿
+//    [self setAlbumCellDidSetModelBlock:^(TZAlbumCell *cell, UIImageView *posterImageView, UILabel *titleLabel) {
+//        [posterImageView setBackgroundColor:[UIColor blueColor]];
+//        [posterImageView setBackgroundColor:[UIColor blueColor]];
+//
+//    }];
+//
+//
+//    /// 【自定义各页面/组件的frame】在界面viewDidLayoutSubviews/组件layoutSubviews后调用，允许外界修改frame等
+//    //相册
+//    [self setPhotoPickerPageDidLayoutSubviewsBlock:^(UICollectionView *collectionView, UIView *bottomToolBar, UIButton *previewButton, UIButton *originalPhotoButton, UILabel *originalPhotoLabel, UIButton *doneButton, UIImageView *numberImageView, UILabel *numberLabel, UIView *divideLine) {
+//
+//        CGRect frame = bottomToolBar.frame;
+//        doneButton.frame = CGRectMake(frame.size.width - 60 - 13, frame.size.height /2 - 15 - (kVerticalBottomSafeHeight /2), 60, 30);
+//
+//        CGRect originalPhotoLabelFrame = originalPhotoLabel.frame;
+//        CGFloat originalX = (bottomToolBar.frame.size.width - originalPhotoLabelFrame.size.width) /2;
+//        CGFloat originalY = originalPhotoLabelFrame.origin.y;
+//        originalPhotoButton.frame = CGRectMake(originalX, originalY, originalPhotoLabelFrame.size.width, originalPhotoLabelFrame.size.height);
+//
+//
+//    }];
+//    //图片预览
+//    [self setPhotoPreviewPageDidLayoutSubviewsBlock:^(UICollectionView *collectionView, UIView *naviBar, UIButton *backButton, UIButton *selectButton, UILabel *indexLabel, UIView *toolBar, UIButton *originalPhotoButton, UILabel *originalPhotoLabel, UIButton *doneButton, UIImageView *numberImageView, UILabel *numberLabel) {
+//
+//        CGRect frame = toolBar.frame;
+//        doneButton.frame = CGRectMake(frame.size.width - 60 - 13, frame.size.height /2 - 15 - (kVerticalBottomSafeHeight /2), 60, 30);
+//
+//    }];
+//    //视频预览
+//    [self setVideoPreviewPageDidLayoutSubviewsBlock:^(UIButton *playButton, UIView *toolBar, UIButton *doneButton) {
+//
+//        CGRect frame = toolBar.frame;
+//        doneButton.frame = CGRectMake(frame.size.width - 60 - 13, frame.size.height /2 - 15 - (kVerticalBottomSafeHeight /2), 60, 30);
+//
+//    }];
+//    //gif预览
+//    [self setGifPreviewPageDidLayoutSubviewsBlock:^(UIView *toolBar, UIButton *doneButton) {
+//
+//        CGRect frame = toolBar.frame;
+//        doneButton.frame = CGRectMake(frame.size.width - 60 - 13, frame.size.height /2 - 15 - (kVerticalBottomSafeHeight /2), 60, 30);
+//
+//    }];
+//    //相册cell
+//    [self setAssetCellDidLayoutSubviewsBlock:^(TZAssetCell *cell, UIImageView *imageView, UIImageView *selectImageView, UILabel *indexLabel, UIView *bottomView, UILabel *timeLength, UIImageView *videoImgView) {
+//    }];
+//    //相簿
+//    [self setAlbumCellDidLayoutSubviewsBlock:^(TZAlbumCell *cell, UIImageView *posterImageView, UILabel *titleLabel) {
+//
+//    }];
+//
+//    //设置图片个数
+//    self.photoNumberIconImage = [UIImage new];
+    ////////////////////////////////////////
 }
@@ -23,27 +23,29 @@
     [imagePickerVc configTZImagePicker];//基本配置
     //特殊配置
     switch (enterType) {
-        case CNImagePickerEnterTypeFriendsCircle:
-            imagePickerVc.maxEditVideoTime = kFriendsCircle_limit_video_maxEdit;//编辑长度
-            imagePickerVc.maxVideoDuration = kFriendsCircle_limit_video_max;//编辑视频最大长度
-            // 3. 设置是否可以混选选择视频/图片/原图
-            imagePickerVc.allowPickingMultipleVideo = NO;
-            break;
-        case CNImagePickerEnterTypeComment:
-#pragma mark - TODO:根据不同设置
-            break;
-        case CNImagePickerEnterTypeSweepCode:
-            
-            break;
-        case CNImagePickerEnterTypeChat:
-            
-            break;
-        case CNImagePickerEnterTypeWitness:
-            imagePickerVc.allowPickingImage = NO;// 显示图片
-             imagePickerVc.allowPickingMultipleVideo = NO;
-            imagePickerVc.maxEditVideoTime = kFriendsCircle_limit_video_maxEdit;//编辑长度
-            imagePickerVc.maxVideoDuration = kFriendsCircle_limit_video_max;//编辑视频最大长度
-            break;
+            #pragma mark - TODO: 2019.11.12 需要其他库依赖
+//        case CNImagePickerEnterTypeFriendsCircle:
+//            imagePickerVc.maxEditVideoTime = kFriendsCircle_limit_video_maxEdit;//编辑长度
+//            imagePickerVc.maxVideoDuration = kFriendsCircle_limit_video_max;//编辑视频最大长度
+//            // 3. 设置是否可以混选选择视频/图片/原图
+//            imagePickerVc.allowPickingMultipleVideo = NO;
+//            break;
+//        case CNImagePickerEnterTypeComment:
+//#pragma mark - TODO:根据不同设置
+//            break;
+//        case CNImagePickerEnterTypeSweepCode:
+//
+//            break;
+//        case CNImagePickerEnterTypeChat:
+//
+//            break;
+//        case CNImagePickerEnterTypeWitness:
+//            imagePickerVc.allowPickingImage = NO;// 显示图片
+//             imagePickerVc.allowPickingMultipleVideo = NO;
+//            imagePickerVc.maxEditVideoTime = kFriendsCircle_limit_video_maxEdit;//编辑长度
+//            imagePickerVc.maxVideoDuration = kFriendsCircle_limit_video_max;//编辑视频最大长度
+//            break;
+            //////////////////////////////
         case CNImagePickedEnterTypeField:
             imagePickerVc.allowPickingImage = YES;// 显示图片
             imagePickerVc.allowPickingMultipleVideo = NO;
@@ -53,17 +55,19 @@
         default://其他
             break;
     }
-    
+    imagePickerVc.modalPresentationStyle = UIModalPresentationFullScreen;
     imagePickerVc.isSelectOriginalPhoto = isSelectOriginalPhoto;//是否选择原图
     // 1.设置目前已经选中的图片数组
     imagePickerVc.selectedAssets = selectedAssets; // 目前已经选中的图片数组
     /// 5. Single selection mode, valid when maxImagesCount = 1
     /// 5. 单选模式,maxImagesCount为1时才生效
     // 设置竖屏下的裁剪尺寸
-    NSInteger left = 30;
-    NSInteger widthHeight = vc.view.width - 2 * left;
-    NSInteger top = (vc.view.height - widthHeight) / 2;
-    imagePickerVc.cropRect = CGRectMake(left, top, widthHeight, widthHeight);
+    #pragma mark - TODO: 2019.11.12 需要其他库依赖
+//    NSInteger left = 30;
+//    NSInteger widthHeight = vc.view.width - 2 * left;
+//    NSInteger top = (vc.view.height - widthHeight) / 2;
+//    imagePickerVc.cropRect = CGRectMake(left, top, widthHeight, widthHeight);
+    ////////////////////////
     // 你可以通过block或者代理，来得到用户选择的照片.
     [imagePickerVc setDidFinishPickingPhotosHandle:^(NSArray<UIImage *> *photos, NSArray *assets, BOOL isSelectOriginalPhoto) {
         // 回调参数
@@ -93,6 +97,7 @@
     CNImagePickerController *imagePickerVc = [[CNImagePickerController alloc] initWithSelectedAssets:selectedAssets selectedPhotos:selectedPhotos index:index];
     [imagePickerVc configTZImagePicker];//基本配置
+    imagePickerVc.modalPresentationStyle = UIModalPresentationFullScreen;
     //特殊配置
     switch (enterType) {
         case CNImagePickerEnterTypeFriendsCircle:
@@ -142,6 +147,7 @@
     TZAssetModel *model = [TZAssetModel modelWithAsset:selectedAsset type:TZAssetModelMediaTypeVideo timeLength:@""];
     videoVC.isOther = YES;//(LXG)相册外进入
     videoVC.model = model;
+    videoVC.modalPresentationStyle = UIModalPresentationFullScreen;
     [vc presentViewController:videoVC animated:YES completion:nil];
 }
@@ -887,13 +887,16 @@ static dispatch_once_t onceToken;
 //        NSString *outputPath = [NSHomeDirectory() stringByAppendingFormat:@"/tmp/output-%@.mp4", [formater stringFromDate:[NSDate date]]];
         NSString *outputPath = @"";
         if (self.conversationId) {
-            outputPath = [[CNLiveBusinessTools newChatFilePathByUserId:self.conversationId] stringByAppendingPathComponent:filaName];//聊天
+            #pragma mark - TODO: 2019.11.12 需要其他库依赖
+//            outputPath = [[CNLiveBusinessTools newChatFilePathByUserId:self.conversationId] stringByAppendingPathComponent:filaName];//聊天
+            ///////////////
         }
         else
         {
-            
-            outputPath =  [[CNLiveBusinessTools chatFilePathByUserId:[IMAPlatform sharedInstance].host.userId] stringByAppendingString:filaName];//朋友圈
+            #pragma mark - TODO: 2019.11.12 需要其他库依赖
+//            outputPath =  [[CNLiveBusinessTools chatFilePathByUserId:[IMAPlatform sharedInstance].host.userId] stringByAppendingString:filaName];//朋友圈
+            ///////////
         }
         NSLog(@"video outputPath = %@",outputPath);
@@ -745,6 +745,7 @@
     TZImagePickerController *imagePickerVc = (TZImagePickerController *)self.navigationController;
     self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:imagePickerVc.cancelBtnTitleStr style:UIBarButtonItemStylePlain target:imagePickerVc action:@selector(cancelButtonClick)];
+    [self.navigationItem.rightBarButtonItem setTintColor:[UIColor blackColor]];
 }
 - (void)viewWillAppear:(BOOL)animated {
@@ -18,8 +18,9 @@
 #import "TZLocationManager.h"
 #import <MobileCoreServices/MobileCoreServices.h>
 #import <AssetsLibrary/AssetsLibrary.h>///lxg
-#import "CNLiveUploadManager.h"
-
+#pragma mark - TODO: 2019.11.12 需要其他库依赖
+//#import "CNLiveUploadManager.h"
+///////////
 @implementation PHAsset (Qiniu)
 - (NSURL *)movieURL {
@@ -697,14 +698,15 @@ static CGFloat itemMargin = 5;
     __block NSURL *returnURL = nil;
     TZImagePickerController *tzImagePickerVc = (TZImagePickerController *)self.navigationController;
-
-    [CNLiveUploadManager zipNewVideoWithAsset:model.asset conversationId:tzImagePickerVc.conversationId limitType:AppPhototLimitTypeChat progressCount:^(float progress) {
-        
-    } success:^(NSURL *url) {
-        returnURL = url;
-    } failure:^{
-        
-    }];
+#pragma mark - TODO: 2019.11.12 需要其他库依赖
+//    [CNLiveUploadManager zipNewVideoWithAsset:model.asset conversationId:tzImagePickerVc.conversationId limitType:AppPhototLimitTypeChat progressCount:^(float progress) {
+//
+//    } success:^(NSURL *url) {
+//        returnURL = url;
+//    } failure:^{
+//
+//    }];
+    ////////////
     return returnURL;
@@ -14,8 +14,11 @@
 #import "TZImageCropManager.h"
 #import <MediaPlayer/MediaPlayer.h>
 #import "TZImagePickerController.h"
-#import "CNAudioOrVideoMananger.h"
+#pragma mark - TODO: 2019.11.12 需要其他库依赖
+//#import "CNAudioOrVideoMananger.h"
+//#import "CNLiveSoundManager.h"
+////////////////////////
 @implementation TZAssetPreviewCell
 - (instancetype)initWithFrame:(CGRect)frame {
@@ -369,14 +372,15 @@
 - (void)configSubviews {
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(pausePlayerAndShowNaviBar) name:UIApplicationWillResignActiveNotification object:nil];
-    
-    [[NSNotificationCenter defaultCenter] addObserver:self
-                                             selector:@selector(pauseVideoView:) name:CNVideoOrAudioEnterNotification
-                                               object:nil];
-    
-    [[NSNotificationCenter defaultCenter] addObserver:self
-                                             selector:@selector(playVideoView:) name:CNVideoOrAudioOutNotification
-                                               object:nil];
+    #pragma mark - TODO: 2019.11.12 需要其他库依赖
+//    [[NSNotificationCenter defaultCenter] addObserver:self
+//                                             selector:@selector(pauseVideoView:) name:CNVideoOrAudioEnterNotification
+//                                               object:nil];
+//
+//    [[NSNotificationCenter defaultCenter] addObserver:self
+//                                             selector:@selector(playVideoView:) name:CNVideoOrAudioOutNotification
+//                                               object:nil];
+    ////////////////
 }
@@ -662,12 +666,20 @@
 - (void)playButtonClick {
-    if ([CNAudioOrVideoMananger IsEnter]) {//在房间
-        [QMUITips showWithText:@"音视频通话中..." inView:AppKeyWindow hideAfterDelay:1.5];
-        return;
-    }else {
-        [[AVAudioSession sharedInstance] setCategory:AVAudioSessionCategoryPlayback error:nil];
-    }
+//    if ([CNAudioOrVideoMananger IsEnter]) {//在房间
+//        [QMUITips showWithText:@"音视频通话中..." inView:AppKeyWindow hideAfterDelay:1.5];
+//        return;
+//    }else {
+//        [[AVAudioSession sharedInstance] setCategory:AVAudioSessionCategoryPlayback error:nil];
+//    }
+    #pragma mark - TODO: 2019.11.12 需要其他库依赖
+//    if ([[CNLiveSoundManager sharedInstance] isEnterChatAudio]) {
+//        [QMUITips showWithText:@"音视频通话中..." inView:AppKeyWindow hideAfterDelay:1.5];
+//            return;
+//    }else {
+//        [[AVAudioSession sharedInstance] setCategory:AVAudioSessionCategoryPlayback error:nil];
+//    }
+    //////////////////////////
     CMTime currentTime = _player.currentItem.currentTime;
     CMTime durationTime = _player.currentItem.duration;
@@ -15,8 +15,9 @@
 #import "TZImageCropManager.h"
 #import <AssetsLibrary/AssetsLibrary.h>///lxg
 #import "CNEditVideoController.h"
-#import "CNAudioOrVideoMananger.h"
+//#import "CNAudioOrVideoMananger.h"
+//#import "CNLiveSoundManager.h"
 @interface TZPhotoPreviewController ()<UICollectionViewDataSource,UICollectionViewDelegate,UIScrollViewDelegate> {
     UICollectionView *_collectionView;
     UICollectionViewFlowLayout *_layout;
@@ -487,10 +488,17 @@
 ///lxg 编辑按钮实现
 - (void)editVideoButtonClick{
-    if ([CNAudioOrVideoMananger IsEnter]) {//在房间
-        [QMUITips showWithText:@"音视频通话中..." inView:AppKeyWindow hideAfterDelay:1.5];
-        return;
-    }
+    //    if ([CNAudioOrVideoMananger IsEnter]) {//在房间
+    //        [QMUITips showWithText:@"音视频通话中..." inView:AppKeyWindow hideAfterDelay:1.5];
+    //        return;
+    //    }
+#pragma mark - TODO: 2019.11.12 需要其他库依赖
+//    if ([[CNLiveSoundManager sharedInstance]isEnterChatAudio]) {
+//        [QMUITips showWithText:@"音视频通话中..." inView:AppKeyWindow hideAfterDelay:1.5];
+//        return;
+//    }
+    /////////////////////////////////////
+//    [[CNLiveSoundManager sharedInstance] audioOrVideoCalling];
     NSLog(@"开始编辑视频了");
     TZImagePickerController *_tzImagePickerVc = (TZImagePickerController *)self.navigationController;
@@ -13,8 +13,10 @@
 #import "TZAssetModel.h"
 #import "TZImagePickerController.h"
 #import "TZPhotoPreviewController.h"
-#import "CNAudioOrVideoMananger.h"
-
+#pragma mark - TODO: 2019.11.12 需要其他库依赖
+//#import "CNAudioOrVideoMananger.h"
+//#import "CNLiveSoundManager.h"
+////////////////////////////
 @interface TZVideoPlayerController () {
     AVPlayer *_player;
     AVPlayerLayer *_playerLayer;
@@ -49,13 +51,17 @@
     }
     [self configMoviePlayer];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(pausePlayerAndShowNaviBar) name:UIApplicationWillResignActiveNotification object:nil];
-    [[NSNotificationCenter defaultCenter] addObserver:self
-                                             selector:@selector(pauseVideoView:) name:CNVideoOrAudioEnterNotification
-                                               object:nil];
+    #pragma mark - TODO: 2019.11.12 需要其他库依赖
+//    [[NSNotificationCenter defaultCenter] addObserver:self
+//                                             selector:@selector(pauseVideoView:) name:CNVideoOrAudioEnterNotification
+//                                               object:nil];
+//
+//    [[NSNotificationCenter defaultCenter] addObserver:self
+//                                             selector:@selector(playVideoView:) name:CNVideoOrAudioOutNotification
+//                                               object:nil];
+    /////////////////////////////
-    [[NSNotificationCenter defaultCenter] addObserver:self
-                                             selector:@selector(playVideoView:) name:CNVideoOrAudioOutNotification
-                                               object:nil];
+//    [self videoOrAudioEnterOrOut];
 }
 #pragma mark - 添加: 导航栏(LXG)
 - (void)viewWillAppear:(BOOL)animated {
@@ -193,14 +199,16 @@
         //完成按钮
         _doneButton.titleLabel.font = [UIFont systemFontOfSize:13];
         [_doneButton setTitle:@"完成" forState:UIControlStateDisabled];
-        [_doneButton setTitleColor:RGBOF(0xFFFFFF) forState:UIControlStateDisabled];
-        [_doneButton setTitleColor:RGBOF(0xFFFFFF) forState:UIControlStateNormal];
-        
-        //颜色绘制成图片
-        UIImage *dis_image = [UIImage qmui_imageWithColor:RGBAOF(0x0BBE06, 0.5)];
-        [_doneButton setBackgroundImage:dis_image forState:UIControlStateSelected];
-        UIImage *nor_image = [UIImage qmui_imageWithColor:RGBOF(0x0BBE06)];
-        [_doneButton setBackgroundImage:nor_image forState:UIControlStateNormal];
+    #pragma mark - TODO: 2019.11.12 需要其他库依赖
+//        [_doneButton setTitleColor:RGBOF(0xFFFFFF) forState:UIControlStateDisabled];
+//        [_doneButton setTitleColor:RGBOF(0xFFFFFF) forState:UIControlStateNormal];
+    
+//        //颜色绘制成图片
+//        UIImage *dis_image = [UIImage qmui_imageWithColor:RGBAOF(0x0BBE06, 0.5)];
+//        [_doneButton setBackgroundImage:dis_image forState:UIControlStateSelected];
+//        UIImage *nor_image = [UIImage qmui_imageWithColor:RGBOF(0x0BBE06)];
+//        [_doneButton setBackgroundImage:nor_image forState:UIControlStateNormal];
+        /////////////////////////
         _doneButton.layer.masksToBounds = YES;
         _doneButton.layer.cornerRadius = 5;
         CGRect frame = _toolBar.frame;
@@ -222,11 +230,16 @@
 - (void)playButtonClick {
-    if ([CNAudioOrVideoMananger IsEnter]) {//在房间
-        [QMUITips showWithText:@"音视频通话中..." inView:AppKeyWindow hideAfterDelay:1.5];
-        return;
-    }
-    
+//    if ([CNAudioOrVideoMananger IsEnter]) {//在房间
+//        [QMUITips showWithText:@"音视频通话中..." inView:AppKeyWindow hideAfterDelay:1.5];
+//        return;
+//    }
+    #pragma mark - TODO: 2019.11.12 需要其他库依赖
+//    if ([[CNLiveSoundManager sharedInstance]isEnterChatAudio]) {
+//        [QMUITips showWithText:@"音视频通话中..." inView:AppKeyWindow hideAfterDelay:1.5];
+//                return;
+//    }
+    //////////////////////
     CMTime currentTime = _player.currentItem.currentTime;
     CMTime durationTime = _player.currentItem.duration;
     if (_player.rate == 0.0f) {
@@ -306,7 +319,7 @@
 //        [UIApplication sharedApplication].statusBarHidden = NO;
 //    }
 }
-
+#pragma mark 收到进入音视频的通知
 - (void)pauseVideoView:(NSNotification *)note
 {
     [self playButtonClick];
@@ -314,11 +327,21 @@
 - (void)playVideoView:(NSNotification *)note
 {
-    
-    
-}
+}
+#pragma mark 收到进入音视频的通知
+//- (void)videoOrAudioEnterOrOut {
+//    __weak typeof(self) weakSelf = self;
+//    [CNLiveSoundManager sharedInstance].enterOrExitAudioBlock = ^(CNLiveAudioType type) {
+//        if (type == CNLiveAudioTypeEnter) {  //进入音视频
+//            [weakSelf playButtonClick];
+//        }else if (type == CNLiveAudioTypeOut){ //退出音视频
+//
+//        }
+//    };
+//}
+
 - (void)dealloc {
     [[NSNotificationCenter defaultCenter] removeObserver:self];
 }
@@ -37,7 +37,7 @@
 /* End PBXContainerItemProxy section */
 /* Begin PBXFileReference section */
-		1E186CDE862673840D64652F /* CNLiveImagePickerController.podspec */ = {isa = PBXFileReference; includeInIndex = 1; name = CNLiveImagePickerController.podspec; path = ../CNLiveImagePickerController.podspec; sourceTree = "<group>"; };
+		1E186CDE862673840D64652F /* CNLiveImagePickerController.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = CNLiveImagePickerController.podspec; path = ../CNLiveImagePickerController.podspec; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
 		251D01DF472ED3B34CCF79D7 /* Pods-CNLiveImagePickerController_Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-CNLiveImagePickerController_Tests.release.xcconfig"; path = "Target Support Files/Pods-CNLiveImagePickerController_Tests/Pods-CNLiveImagePickerController_Tests.release.xcconfig"; sourceTree = "<group>"; };
 		2EFBCF51E613A31E4CA39B49 /* Pods-CNLiveImagePickerController_Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-CNLiveImagePickerController_Example.debug.xcconfig"; path = "Target Support Files/Pods-CNLiveImagePickerController_Example/Pods-CNLiveImagePickerController_Example.debug.xcconfig"; sourceTree = "<group>"; };
 		6003F58A195388D20070C39A /* CNLiveImagePickerController_Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = CNLiveImagePickerController_Example.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -61,9 +61,9 @@
 		606FC2411953D9B200FFA9A0 /* Tests-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Tests-Prefix.pch"; sourceTree = "<group>"; };
 		6774261442B1D13201144A37 /* Pods_CNLiveImagePickerController_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_CNLiveImagePickerController_Tests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		71719F9E1E33DC2100824A3D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
-		804602CE4E7E104F5222073B /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; name = README.md; path = ../README.md; sourceTree = "<group>"; };
+		804602CE4E7E104F5222073B /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../README.md; sourceTree = "<group>"; };
 		873B8AEA1B1F5CCA007FD442 /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = Main.storyboard; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
-		BF0D4829B7327822E0C4146E /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; name = LICENSE; path = ../LICENSE; sourceTree = "<group>"; };
+		BF0D4829B7327822E0C4146E /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = LICENSE; path = ../LICENSE; sourceTree = "<group>"; };
 		C188B280A1A26E9C6D19D5C6 /* Pods-CNLiveImagePickerController_Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-CNLiveImagePickerController_Example.release.xcconfig"; path = "Target Support Files/Pods-CNLiveImagePickerController_Example/Pods-CNLiveImagePickerController_Example.release.xcconfig"; sourceTree = "<group>"; };
 		E4BA720C67B8EEEF52848A79 /* Pods_CNLiveImagePickerController_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_CNLiveImagePickerController_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		F2CA825BC87A414FD6AF3A37 /* Pods-CNLiveImagePickerController_Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-CNLiveImagePickerController_Tests.debug.xcconfig"; path = "Target Support Files/Pods-CNLiveImagePickerController_Tests/Pods-CNLiveImagePickerController_Tests.debug.xcconfig"; sourceTree = "<group>"; };
@@ -193,7 +193,6 @@
 				F2CA825BC87A414FD6AF3A37 /* Pods-CNLiveImagePickerController_Tests.debug.xcconfig */,
 				251D01DF472ED3B34CCF79D7 /* Pods-CNLiveImagePickerController_Tests.release.xcconfig */,
 			);
-			name = Pods;
 			path = Pods;
 			sourceTree = "<group>";
 		};
@@ -248,6 +247,9 @@
 				LastUpgradeCheck = 0720;
 				ORGANIZATIONNAME = jyyjkt;
 				TargetAttributes = {
+					6003F589195388D20070C39A = {
+						DevelopmentTeam = 94X49GG3ZW;
+					};
 					6003F5AD195388D20070C39A = {
 						TestTargetID = 6003F589195388D20070C39A;
 					};
@@ -258,6 +260,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 				Base,
 			);
@@ -494,6 +497,7 @@
 			baseConfigurationReference = 2EFBCF51E613A31E4CA39B49 /* Pods-CNLiveImagePickerController_Example.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "CNLiveImagePickerController/CNLiveImagePickerController-Prefix.pch";
 				INFOPLIST_FILE = "CNLiveImagePickerController/CNLiveImagePickerController-Info.plist";
@@ -510,6 +514,7 @@
 			baseConfigurationReference = C188B280A1A26E9C6D19D5C6 /* Pods-CNLiveImagePickerController_Example.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "CNLiveImagePickerController/CNLiveImagePickerController-Prefix.pch";
 				INFOPLIST_FILE = "CNLiveImagePickerController/CNLiveImagePickerController-Info.plist";
 use_frameworks!
+source 'https://github.com/CocoaPods/Specs.git'
+source 'http://bj.gitlab.cnlive.com/ios-team/CNLiveRepos.git'
 platform :ios, '8.0'
 target 'CNLiveImagePickerController_Example' do
   pod 'CNLiveImagePickerController', :path => '../'
+  
+  #pod 'CNLiveBaseKit'
   target 'CNLiveImagePickerController_Tests' do
     inherit! :search_paths