提交订单界面

yinqiaojuan
1 parent 956725d8
Showing 11 changed files with 472 additions and 600 deletions
CNLiveMyOrderModule.podspec
CNLiveMyOrderModule/Classes/Controller/CNLiveOrderDetailController.m
CNLiveMyOrderModule/Classes/View/CNLiveMineOrderTableViewCell.m
CNLiveMyOrderModule/Classes/View/CNLiveMineOrderView.m
CNLiveMyOrderModule/Classes/View/CNLiveOrderListCommonView.m
CNLiveMyOrderModule/Classes/View/CNLiveUploadVoucher.m
CNLiveMyOrderModule/Classes/ViewModel/CNLiveOrderEventHandle.h
CNLiveMyOrderModule/Classes/ViewModel/CNLiveOrderEventHandle.m
Example/CNLiveMyOrderModule.xcodeproj/project.pbxproj
Example/Podfile
README.md
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLiveMyOrderModule'
-  s.version          = '0.0.2'
+  s.version          = '0.0.1'
   s.summary          = '我的订单组件化'
 # This description is used to generate tags and improve search results.
@@ -30,62 +30,57 @@ TODO: Add long description of the pod here.
   s.ios.deployment_target = '9.0'
-  s.source_files = 'CNLiveMyOrderModule/Classes/**/*'
-  
+ # s.source_files = 'CNLiveMyOrderModule/Classes/**/*'
+  s.subspec 'Model' do |model|
+      model.source_files = 'CNLiveMyOrderModule/Classes/Model/*.{h,m}'
+  end
+  s.subspec 'ViewModel' do |viewModel|
+       viewModel.source_files = 'CNLiveMyOrderModule/Classes/ViewModel/*.{h,m}'
+       viewModel.dependency 'CNLiveMyOrderModule/Model'
+   end
+  s.subspec 'View' do |view|
+       view.source_files = 'CNLiveMyOrderModule/Classes/View/*.{h,m}'
+#       view.dependency 'CNLiveMyOrderModule/Model'
+       view.dependency 'CNLiveMyOrderModule/ViewModel'
+   end
    s.subspec 'Controller' do |controller|
       controller.source_files = 'CNLiveMyOrderModule/Classes/Controller/*.{h,m}'
-      controller.dependency 'CNLiveCommonClass'
-      controller.dependency 'CNLiveCommonCategory'
-      controller.dependency 'CNLiveBaseKit'
-      controller.dependency 'CNLiveTripartiteManagement/Masonry'
-      controller.dependency 'JXCategoryView'
       controller.dependency 'CNLiveMyOrderModule/View'
-      controller.dependency 'CNLiveTripartiteManagement/QMUIKit'
-      controller.dependency 'CNLiveTripartiteManagement/Masonry'
-      controller.dependency 'CNLiveTripartiteManagement/YYKit'
-      controller.dependency 'CNLiveTripartiteManagement/MJExtension'
-      controller.dependency 'CNLiveIMBaseSDK'
-  end
-  s.subspec 'View' do |view|
-      view.source_files = 'CNLiveMyOrderModule/Classes/View/*.{h,m}'
-      view.dependency 'CNLiveTripartiteManagement/QMUIKit'
-      view.dependency 'CNLiveTripartiteManagement/Masonry'
-      view.dependency 'CNLiveMyOrderModule/Model'
-      view.dependency 'CNLiveCommonCategory'
-      view.dependency 'CNLiveTripartiteManagement/SDWebImage'
-      view.dependency 'CNLiveTripartiteManagement/YYKit'
-      view.dependency 'CNLiveTripartiteManagement/MJRefresh'
-      view.dependency 'CNLiveCustomUI'
-      view.dependency 'CNLiveTripartiteManagement/MJExtension'
-      view.dependency 'CNLiveEnvironment'
-      view.dependency 'CNLiveUserManagement'
-      view.dependency 'CNLiveIMBaseSDK'
-      view.dependency 'CNLiveMyOrderModule/ViewModel'
-      view.dependency 'CNLiveImagePickerController'
-  end
-  s.subspec 'ViewModel' do |viewModel|
-      viewModel.source_files = 'CNLiveMyOrderModule/Classes/ViewModel/*.{h,m}'
-      viewModel.dependency 'CNLiveUserManagement'
-      viewModel.dependency 'CNLiveEnvironment'
-      viewModel.dependency 'CNLiveRequestBastKit'
-      viewModel.dependency 'CNLiveMyOrderModule/Model'
-      viewModel.dependency 'CNLiveTripartiteManagement/QMUIKit'
-      viewModel.dependency 'CNLiveTripartiteManagement/MJExtension'
+#      controller.dependency 'CNLiveMyOrderModule/Model'
+#      controller.dependency 'CNLiveMyOrderModule/ViewModel'
   end
   s.subspec 'Module' do |modules|
       modules.source_files = 'CNLiveMyOrderModule/Classes/Module/*.{h,m}'
   end
-  s.subspec 'Model' do |model|
-      model.source_files = 'CNLiveMyOrderModule/Classes/Model/*.{h,m}'
-      model.dependency 'CNLiveTripartiteManagement/MJExtension'
-  end
   s.subspec 'Service' do |service|
       service.source_files = 'CNLiveMyOrderModule/Classes/Service/*.{h,m}'
       service.dependency 'CNLiveMyOrderModule/Controller'
   end
   s.dependency 'CNLiveBeeHive'
   s.dependency 'CNLiveServices'
+  #基础库
+  s.dependency 'CNLiveCommonClass'
   s.dependency 'CNLiveBaseKit'
+  s.dependency 'CNLiveCommonCategory'
+  s.dependency 'CNLiveCustomUI'
+  #环境库
+  s.dependency 'CNLiveEnvironment'
+  #用户库
+  s.dependency 'CNLiveUserManagement'
+  #IM
+ # s.dependency 'CNLiveIMBaseSDK'
+  #相册
+#  s.dependency 'CNLiveImagePickerController'
+  #网络请求
+  s.dependency 'CNLiveRequestBastKit'
+  #三方库
+  s.dependency 'CNLiveTripartiteManagement/Masonry'
+  s.dependency 'CNLiveTripartiteManagement/QMUIKit'
+  s.dependency 'CNLiveTripartiteManagement/YYKit'
+  s.dependency 'CNLiveTripartiteManagement/MJExtension'
+  s.dependency 'CNLiveTripartiteManagement/SDWebImage'
+  s.dependency 'CNLiveTripartiteManagement/MJRefresh'
+  s.dependency 'JXCategoryView'
   s.user_target_xcconfig = { 'CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES' => 'YES'
    }
    s.resource_bundles = {
@@ -16,8 +16,8 @@
 #import "Masonry.h"
 #import "CNLiveErrorOrNoNetView.h"
 #import "CNLiveOrderEventHandle.h"
-#import "TIMAdapter.h"
-#import "CommonLibrary.h"
+//#import "TIMAdapter.h"
+//#import "CommonLibrary.h"
 #import "CNLiveCommonCategory.h"
 #import "CNLiveAddPopFuncView.h"
 #import "CNLiveOrderDetailContentView.h"
@@ -857,7 +857,7 @@
             case CNLiveMineOrderButtonItemTypeReminder: { //催单
                 [CNLiveOrderEventHandle reminderOrder:weakSelf.list  superView:weakSelf.view complete:^(NSString *msg) {
-                    [[HUDHelper sharedInstance] tipMessage:msg];
+//                    [[HUDHelper sharedInstance] tipMessage:msg];
                 }];
             }
@@ -9,7 +9,6 @@
 #import "CNLiveMineOrderView.h"
 #import "Masonry.h"
 #import "CNLiveBaseKit.h"
-#import "CNLiveOrderEventHandle.h"
 #define Line_H  0.5
 /** 通用的间距值 */
 CGFloat const ZXMargin = 10;
@@ -12,7 +12,7 @@
 #import <QMUIKit/QMUIKit.h>
 #import "CNLiveCommonCategory.h"
 #import "CNLiveBaseKit.h"
-#import "TIMAdapter.h"
+//#import "TIMAdapter.h"
 #import <SDWebImage/SDWebImage.h>
 #import "DSAddressModel.h"
 #import "CNLiveSelectRefundButton.h"
@@ -2513,7 +2513,7 @@
 - (void)setList:(CNLiveOrderList *)list {
     CNLiveOrderListIconBean *icon = list.iconBean;
-    [_iconImgView sd_setImageWithURL:[NSURL URLWithString:icon.image] placeholderImage:kDefaultUserIcon];
+//    [_iconImgView sd_setImageWithURL:[NSURL URLWithString:icon.image] placeholderImage:kDefaultUserIcon];
 }
 - (void)starsControl:(CNLiveStarsControl *)starsControl didChangeScore:(CGFloat)score {
@@ -17,8 +17,8 @@
 #import "CNLiveMineOrderItem.h"
 #import "MJExtension.h"
 #import "CNUserInfoManager.h"
-#import "TIMAdapter.h"
-#import "CommonLibrary.h"
+//#import "TIMAdapter.h"
+//#import "CommonLibrary.h"
 #import "CNLiveCommonCategory.h"
 #import "CNLiveOrderViewModel.h"
 #import "CNLiveOrderList.h"
@@ -211,7 +211,7 @@ static const CGFloat KCategoryViewHeight = 44;
         case CNLiveMineOrderButtonItemTypeReminder: { //催单
             [CNLiveOrderEventHandle reminderOrder:model superView:self complete:^(NSString *msg) {
-                [[HUDHelper sharedInstance] tipMessage:msg];
+//                [[HUDHelper sharedInstance] tipMessage:msg];
             }];
         }
         break;
@@ -6,34 +6,34 @@
 //
 #import "CNLiveUploadVoucher.h"
-#import <CNLiveImagePickerController/TZImagePickerController.h>
-#import "TZImageManager.h"
-#import "LxGridViewFlowLayout.h"
-#import "TZTestCell.h"
-#import <AssetsLibrary/AssetsLibrary.h>
-#import <Photos/Photos.h>
-#import <YYKit/YYKit.h>
-#import "CNImagePickerController.h"
-#import "CNLiveBaseKit.h"
-#import <QMUIKit/QMUIKit.h>
-#import <Masonry/Masonry.h>
-#import "CNLiveCommonCategory.h"
-@interface CNLiveUploadVoucher ()<TZImagePickerControllerDelegate,UINavigationControllerDelegate,UIImagePickerControllerDelegate,UICollectionViewDataSource,UICollectionViewDelegate,UIActionSheetDelegate>{
+//#import <CNLiveImagePickerController/TZImagePickerController.h>
+//#import "TZImageManager.h"
+//#import "LxGridViewFlowLayout.h"
+//#import "TZTestCell.h"
+//#import <AssetsLibrary/AssetsLibrary.h>
+//#import <Photos/Photos.h>
+//#import <YYKit/YYKit.h>
+//#import "CNImagePickerController.h"
+//#import "CNLiveBaseKit.h"
+//#import <QMUIKit/QMUIKit.h>
+//#import <Masonry/Masonry.h>
+//#import "CNLiveCommonCategory.h"
+@interface CNLiveUploadVoucher ()<UINavigationControllerDelegate,UIImagePickerControllerDelegate,UICollectionViewDataSource,UICollectionViewDelegate,UIActionSheetDelegate>{
 }
-@property (nonatomic, strong) UIImagePickerController *imagePickerVc;
-
-@property (nonatomic, strong) UILabel *titleLab;
-@property (nonatomic, strong) UICollectionView *collectionView;
-@property (nonatomic, strong) LxGridViewFlowLayout *layout;
-@property (nonatomic, strong) CLLocation *location;
-@property (nonatomic, strong) NSMutableArray *selectedPhotos;
-@property (nonatomic, strong) NSMutableArray *selectedAssets;
-@property (nonatomic, assign) BOOL isSelectOriginalPhoto;
-@property (nonatomic, assign) CGFloat itemWH;
-@property (nonatomic, assign) CGFloat margin;
-@property (nonatomic, assign) CGFloat collHeight;
-@property (nonatomic, assign) CGFloat add; //是否隐藏加号
-@property (nonatomic, assign) CGFloat colTop; //collectionView 距离顶部坐标
+//@property (nonatomic, strong) UIImagePickerController *imagePickerVc;
+//
+//@property (nonatomic, strong) UILabel *titleLab;
+//@property (nonatomic, strong) UICollectionView *collectionView;
+//@property (nonatomic, strong) LxGridViewFlowLayout *layout;
+//@property (nonatomic, strong) CLLocation *location;
+//@property (nonatomic, strong) NSMutableArray *selectedPhotos;
+//@property (nonatomic, strong) NSMutableArray *selectedAssets;
+//@property (nonatomic, assign) BOOL isSelectOriginalPhoto;
+//@property (nonatomic, assign) CGFloat itemWH;
+//@property (nonatomic, assign) CGFloat margin;
+//@property (nonatomic, assign) CGFloat collHeight;
+//@property (nonatomic, assign) CGFloat add; //是否隐藏加号
+//@property (nonatomic, assign) CGFloat colTop; //collectionView 距离顶部坐标
 @end
 @implementation CNLiveUploadVoucher
 #pragma clang diagnostic push
@@ -47,9 +47,9 @@
     self = [super initWithFrame:frame];
     if (self) {
         self.backgroundColor = [UIColor whiteColor];
-        _add = 1;
-        _selectedPhotos = [[NSMutableArray alloc] init];
-        _selectedAssets = [[NSMutableArray alloc] init];
+//        _add = 1;
+//        _selectedPhotos = [[NSMutableArray alloc] init];
+//        _selectedAssets = [[NSMutableArray alloc] init];
         [self configCollectionView];
     }
     return self;
@@ -57,386 +57,386 @@
 #pragma mark - 添加collectionView
 - (void)configCollectionView {
     // 如不需要长按排序效果，将LxGridViewFlowLayout类改成UICollectionViewFlowLayout即可
-    _layout = [[LxGridViewFlowLayout alloc] init];
-    _margin = 8;
-    _itemWH = (KScreenWidth - 20 - 2 * _margin - 4) / 3 - _margin;
-    _layout.itemSize = CGSizeMake(_itemWH, _itemWH);
-    _layout.minimumInteritemSpacing = _margin;
-    _layout.minimumLineSpacing = _margin;
-    _colTop = 20;
-    if (self.titleLabel) {
-        _colTop += self.titleLabel.height+15;
-        [self addSubview:self.titleLabel];
-    }
-    _collectionView = [[UICollectionView alloc] initWithFrame:CGRectMake(10, _colTop, KScreenWidth-20, _itemWH+10) collectionViewLayout:_layout];
-    _collectionView.alwaysBounceVertical = YES;
-    _collectionView.backgroundColor = [UIColor whiteColor];
-    _collectionView.contentInset = UIEdgeInsetsMake(4, 4, 4, 4);
-    _collectionView.dataSource = self;
-    _collectionView.delegate = self;
-    _collectionView.scrollEnabled = NO;
-    _collectionView.keyboardDismissMode = UIScrollViewKeyboardDismissModeOnDrag;
-    [self addSubview:_collectionView];
-    [_collectionView registerClass:[TZTestCell class] forCellWithReuseIdentifier:@"TZTestCell"];
+//    _layout = [[LxGridViewFlowLayout alloc] init];
+//    _margin = 8;
+//    _itemWH = (KScreenWidth - 20 - 2 * _margin - 4) / 3 - _margin;
+//    _layout.itemSize = CGSizeMake(_itemWH, _itemWH);
+//    _layout.minimumInteritemSpacing = _margin;
+//    _layout.minimumLineSpacing = _margin;
+//    _colTop = 20;
+//    if (self.titleLabel) {
+//        _colTop += self.titleLabel.height+15;
+//        [self addSubview:self.titleLabel];
+//    }
+//    _collectionView = [[UICollectionView alloc] initWithFrame:CGRectMake(10, _colTop, KScreenWidth-20, _itemWH+10) collectionViewLayout:_layout];
+//    _collectionView.alwaysBounceVertical = YES;
+//    _collectionView.backgroundColor = [UIColor whiteColor];
+//    _collectionView.contentInset = UIEdgeInsetsMake(4, 4, 4, 4);
+//    _collectionView.dataSource = self;
+//    _collectionView.delegate = self;
+//    _collectionView.scrollEnabled = NO;
+//    _collectionView.keyboardDismissMode = UIScrollViewKeyboardDismissModeOnDrag;
+//    [self addSubview:_collectionView];
+//    [_collectionView registerClass:[TZTestCell class] forCellWithReuseIdentifier:@"TZTestCell"];
 }
 #pragma mark - Action
 #pragma mark - Action
-- (void)deleteBtnClik:(UIButton *)sender {
-    __weak typeof(self) weakSelf = self;
-    [_selectedPhotos removeObjectAtIndex:sender.tag];
-    [_selectedAssets removeObjectAtIndex:sender.tag];
-    [_collectionView performBatchUpdates:^{
-        NSIndexPath *indexPath = [NSIndexPath indexPathForItem:sender.tag inSection:0];
-        [weakSelf.collectionView deleteItemsAtIndexPaths:@[indexPath]];
-    } completion:^(BOOL finished) {
-        weakSelf.add = 1;
-        [weakSelf updateHeight];
-    }];
-    
-}
-
-#pragma mark - UICollectionViewdelegate
-
-- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section {
-    return self.selectedPhotos.count + self.add;
-}
-- (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath {
-    TZTestCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"TZTestCell" forIndexPath:indexPath];
-    cell.videoImageView.hidden = YES;
-    cell.gifLable.hidden = YES;
-
-    if (indexPath.row == _selectedPhotos.count) {
-        cell.imageView.image = [UIImage cnLive_getImageNameWithBundle:@"pj_tianjiazhaopian" bundle:@"CNLiveMyOrderModule.bundle/CNLiveMyOrderModule" targetClass:[self class]];
-        cell.deleteBtn.hidden = YES;
-    } else {
-        cell.imageView.image = _selectedPhotos[indexPath.row];
-        cell.asset = _selectedAssets[indexPath.row];
-        cell.deleteBtn.hidden = NO;
-    }
-
-    cell.deleteBtn.tag = indexPath.row;
-    [cell.deleteBtn addTarget:self action:@selector(deleteBtnClik:) forControlEvents:UIControlEventTouchUpInside];
-    return cell;
-}
-
-- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath {
-    __weak typeof(self) weakSelf = self;
-    if (indexPath.row == _selectedPhotos.count) {
-        
-        [self createAlertViewTitleArray:@[@"拍照",@"从相册选取"] textColor:KTextBlackColor font:UIFontMake(15) actionBlock:^(UIButton *button, NSInteger didRow) {
-
-            switch (didRow) {
-                case 0: {
-                    [self takePhoto];
-                }
-                    break;
-
-                case 1: {
-                    [self pushTZImagePickerController];
-                }
-                    break;
-
-                default:
-                    break;
-            }
-
-        }];
-        
-    } else { //预览照片
-        CNImagePickerController *imagePickerVc = [[CNImagePickerController alloc] initWithSelectedAssets:_selectedAssets selectedPhotos:_selectedPhotos index:indexPath.row];
-        [imagePickerVc configTZImagePicker];
-        imagePickerVc.maxImagesCount = 9;
-        imagePickerVc.allowPickingGif = NO;
-        imagePickerVc.allowPickingOriginalPhoto = YES;
-        imagePickerVc.allowPickingMultipleVideo = NO;
-        imagePickerVc.isSelectOriginalPhoto = _isSelectOriginalPhoto;
-        [imagePickerVc setDidFinishPickingPhotosHandle:^(NSArray<UIImage *> *photos, NSArray *assets, BOOL isSelectOriginalPhoto) {
-            weakSelf.selectedPhotos = [NSMutableArray arrayWithArray:photos];
-            weakSelf.selectedAssets = [NSMutableArray arrayWithArray:assets];
-            weakSelf.isSelectOriginalPhoto = isSelectOriginalPhoto;
-           [weakSelf.collectionView reloadData];
-            weakSelf.collectionView.contentSize = CGSizeMake(0, ((weakSelf.selectedPhotos.count + 2) / 3 ) * (weakSelf.margin + weakSelf.itemWH));
-        }];
-        [self.viewController presentViewController:imagePickerVc animated:YES completion:nil];
-
-    }
-}
-#pragma mark - LxGridViewDataSource
-/// 以下三个方法为长按排序相关代码
-- (BOOL)collectionView:(UICollectionView *)collectionView canMoveItemAtIndexPath:(NSIndexPath *)indexPath {
-    return indexPath.item < _selectedPhotos.count;
-}
-
-- (BOOL)collectionView:(UICollectionView *)collectionView itemAtIndexPath:(NSIndexPath *)sourceIndexPath canMoveToIndexPath:(NSIndexPath *)destinationIndexPath {
-    return (sourceIndexPath.item < _selectedPhotos.count && destinationIndexPath.item < _selectedPhotos.count);
-}
-
-- (void)collectionView:(UICollectionView *)collectionView itemAtIndexPath:(NSIndexPath *)sourceIndexPath didMoveToIndexPath:(NSIndexPath *)destinationIndexPath {
-    UIImage *image = _selectedPhotos[sourceIndexPath.item];
-    [_selectedPhotos removeObjectAtIndex:sourceIndexPath.item];
-    [_selectedPhotos insertObject:image atIndex:destinationIndexPath.item];
-    
-    id asset = _selectedAssets[sourceIndexPath.item];
-    [_selectedAssets removeObjectAtIndex:sourceIndexPath.item];
-    [_selectedAssets insertObject:asset atIndex:destinationIndexPath.item];
-    
-    [_collectionView reloadData];
-    
-    if (self.delegate && [self.delegate respondsToSelector:@selector(updateImages:)]) {
-        [self.delegate updateImages:_selectedAssets];
-    }
-}
-
-#pragma mark - UIImagePickerController
-- (void)takePhoto {
-    AVAuthorizationStatus authStatus = [AVCaptureDevice authorizationStatusForMediaType:AVMediaTypeVideo];
-    if ((authStatus == AVAuthorizationStatusRestricted || authStatus == AVAuthorizationStatusDenied) && iOS7Later) {
-        // 无相机权限 做一个友好的提示
-        if (iOS8Later) {
-            UIAlertView * alert = [[UIAlertView alloc]initWithTitle:@"无法使用相机" message:@"请在iPhone的“设置-隐私-相机“中允许访问相机" delegate:self cancelButtonTitle:@"取消" otherButtonTitles:nil, nil];//设置
-            
-            [alert show];
-        }
-    } else if (authStatus == AVAuthorizationStatusNotDetermined) {
-        // fix issue 466, 防止用户首次拍照拒绝授权时相机页黑屏
-        if (iOS7Later) {
-            [AVCaptureDevice requestAccessForMediaType:AVMediaTypeVideo completionHandler:^(BOOL granted) {
-                if (granted) {
-                    dispatch_sync(dispatch_get_main_queue(), ^{
-                        [self takePhoto];
-                    });
-                }
-            }];
-        } else {
-            [self takePhoto];
-        }
-        // 拍照之前还需要检查相册权限
-    } else if ([TZImageManager authorizationStatus] == 2) { // 已被拒绝，没有相册权限，将无法保存拍的照片
-        if (iOS8Later) {
-            UIAlertView * alert = [[UIAlertView alloc]initWithTitle:@"无法访问相册" message:@"请在iPhone的“设置-隐私-相册“中允许访问相册" delegate:self cancelButtonTitle:@"取消" otherButtonTitles:nil, nil];//设置
-            [alert show];
-        }
-    } else if ([TZImageManager authorizationStatus] == 0) { // 未请求过相册权限
-        [[TZImageManager manager] requestAuthorizationWithCompletion:^{
-            [self takePhoto];
-        }];
-    } else {
-        [self pushImagePickerController];
-    }
-}
-// 调用相机
-- (void)pushImagePickerController {
-    UIImagePickerControllerSourceType sourceType = UIImagePickerControllerSourceTypeCamera;
-    if ([UIImagePickerController isSourceTypeAvailable: UIImagePickerControllerSourceTypeCamera]) {
-        self.imagePickerVc.sourceType = sourceType;
-        if(iOS8Later) {
-            _imagePickerVc.modalPresentationStyle = UIModalPresentationOverCurrentContext;
-        }
-        [self.viewController presentViewController:_imagePickerVc animated:YES completion:nil];
-    } else {
-        NSLog(@"模拟器中无法打开照相机,请在真机中使用");
-    }
-}
-#pragma mark - TZImagePickerController
-- (void)pushTZImagePickerController {
-    CNImagePickerController *imagePickerVc = [[CNImagePickerController alloc]initWithMaxImagesCount:9 columnNumber:4 delegate:self pushPhotoPickerVc:YES];
-    [imagePickerVc configTZImagePicker];//配置
-#pragma mark - 五类个性化设置，这些参数都可以不传，此时会走默认设置
-    imagePickerVc.isSelectOriginalPhoto = _isSelectOriginalPhoto;
-
-    imagePickerVc.selectedAssets = _selectedAssets;     //目前已经选中的图片数组
-    imagePickerVc.allowTakePicture = NO;                //在内部显示拍照按钮
-    imagePickerVc.allowPickingVideo = NO;               //是否允许选择视频
-    imagePickerVc.allowPickingImage = YES;              //是否允许选择图片
-    imagePickerVc.allowPickingOriginalPhoto = YES;      //选择原图
-    imagePickerVc.allowPickingGif = NO;                 //选择Gif
-    imagePickerVc.allowPickingMultipleVideo = NO;       // 是否可以多选视频
-    imagePickerVc.sortAscendingByModificationDate = YES;//排序
-    imagePickerVc.showSelectBtn = NO;
-    imagePickerVc.allowCrop = NO;                       //是否允许裁剪
-    imagePickerVc.needCircleCrop = NO;                  //是否使用圆形裁剪
-    
-    // 你可以通过block或者代理，来得到用户选择的照片.
-    [imagePickerVc setDidFinishPickingPhotosHandle:^(NSArray<UIImage *> *photos, NSArray *assets, BOOL isSelectOriginalPhoto) {
-        
-    }];
-    [self.viewController presentViewController:imagePickerVc animated:YES completion:nil];
-}
-- (void)imagePickerController:(UIImagePickerController*)picker didFinishPickingMediaWithInfo:(NSDictionary *)info {
-    [picker dismissViewControllerAnimated:YES completion:nil];
-    NSString *type = [info objectForKey:UIImagePickerControllerMediaType];
-    if ([type isEqualToString:@"public.image"]) {
-        TZImagePickerController *tzImagePickerVc = [[TZImagePickerController alloc] initWithMaxImagesCount:1 delegate:self];
-        tzImagePickerVc.modalPresentationStyle = UIModalPresentationFullScreen;
-        tzImagePickerVc.sortAscendingByModificationDate = YES;
-        [tzImagePickerVc showProgressHUD];
-        UIImage *image = [info objectForKey:UIImagePickerControllerOriginalImage];
-        
-        // save photo and get asset / 保存图片，获取到asset
-        [[TZImageManager manager] savePhotoWithImage:image location:nil completion:^(NSError *error){
-            [tzImagePickerVc hideProgressHUD];
-            if (error) {
-                [tzImagePickerVc hideProgressHUD];
-                NSLog(@"图片保存失败 %@",error);
-            } else {
-                [[TZImageManager manager] getCameraRollAlbum:NO allowPickingImage:YES needFetchAssets:YES completion:^(TZAlbumModel *model) {
-                    [[TZImageManager manager] getAssetsFromFetchResult:model.result allowPickingVideo:NO allowPickingImage:YES completion:^(NSArray<TZAssetModel *> *models) {
-                        [tzImagePickerVc hideProgressHUD];
-                        TZAssetModel *assetModel = [models firstObject];
-                        if (tzImagePickerVc.sortAscendingByModificationDate) {
-                            assetModel = [models lastObject];
-                        }
-                        
-                        [self refreshCollectionViewWithAddedAsset:assetModel.asset image:image];
-                        
-                    }];
-                }];
-            }
-        }];
-    }
-}
-
-- (void)refreshCollectionViewWithAddedAsset:(id)asset image:(UIImage *)image {
-    [_selectedAssets addObject:asset];
-    [_selectedPhotos addObject:image];
-    [_collectionView reloadData];
-    
-    if (_selectedPhotos.count == 9) {
-        _add = 0;
-    } else {
-        _add = 1;
-    }
-    
-    [self updateHeight];
-    
-}
-- (void)imagePickerControllerDidCancel:(UIImagePickerController *)picker {
-    if ([picker isKindOfClass:[UIImagePickerController class]]) {
-        [picker dismissViewControllerAnimated:YES completion:nil];
-    }
-}
-
-#pragma mark - UIActionSheetDelegate
-
-- (void)actionSheet:(UIActionSheet *)actionSheet clickedButtonAtIndex:(NSInteger)buttonIndex {
-    if (buttonIndex == 0) { // take photo / 去拍照
-        [self takePhoto];
-    } else if (buttonIndex == 1) {
-        [self pushTZImagePickerController];
-    }
-}
-
-#pragma mark - UIAlertViewDelegate
-- (void)alertView:(UIAlertView *)alertView clickedButtonAtIndex:(NSInteger)buttonIndex {
-    if (buttonIndex == 1) { // 去设置界面，开启相机访问权限
-        if (iOS8Later) {
-            [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString]];
-        }
-    }
-}
-
-#pragma mark - TZImagePickerControllerDelegate
-- (void)tz_imagePickerControllerDidCancel:(TZImagePickerController *)picker {
-    // NSLog(@"cancel");
-}
-
-- (void)imagePickerController:(TZImagePickerController *)picker didFinishPickingPhotos:(NSArray<UIImage *> *)photos sourceAssets:(NSArray *)assets isSelectOriginalPhoto:(BOOL)isSelectOriginalPhoto infos:(NSArray<NSDictionary *> *)infos {
-    _selectedPhotos = [NSMutableArray arrayWithArray:photos];
-    _selectedAssets = [NSMutableArray arrayWithArray:assets];
-    _isSelectOriginalPhoto = isSelectOriginalPhoto;
-
-    if (_selectedPhotos.count == 9) {
-        _add = 0;
-    } else {
-        _add = 1;
-    }
-
-    [self updateHeight];
-
-}
-
-//更新自身高度
-- (void)updateHeight {
-    
-    NSInteger num = 0;
-    if (_selectedAssets.count == 9) {
-        num = 9;
-    } else {
-        num = _selectedAssets.count+1;
-    }
-    
-    NSInteger integer = num/3;
-    NSInteger remainder = num%3;
-    
-    if (remainder > 0) {
-        integer += 1;
-    }
-    
-    _collectionView.frame = CGRectMake(10, _colTop, KScreenWidth-20, _itemWH*integer + integer*_margin +10);
-    [_collectionView reloadData];
-    
-    CGFloat h = _collectionView.height + integer*_margin + 60;
-    [self mas_updateConstraints:^(MASConstraintMaker *make) {
-        make.height.mas_equalTo(h);
-    }];
-    
-    if (self.delegate && [self.delegate respondsToSelector:@selector(updateImages:)]) {
-        [self.delegate updateImages:_selectedPhotos];
-    }
-    
-}
-
-
-// Decide album show or not't
-// 决定相册显示与否
-- (BOOL)isAlbumCanSelect:(NSString *)albumName result:(id)result {
-    return YES;
-}
-
-// Decide asset show or not't
-// 决定asset显示与否
-- (BOOL)isAssetCanSelect:(id)asset {
-    return YES;
-}
-
-#pragma mark -
-#pragma mark - Getter
-- (UILabel *)titleLab
-{
-    if (!_titleLab) {
-        _titleLab = [[UILabel alloc] init];
-        _titleLab.font = [UIFont systemFontOfSize:15];
-        _titleLab.text = @"上传照片";
-    }
-    return _titleLab;
-}
-
-- (UIImagePickerController *)imagePickerVc {
-    if (_imagePickerVc == nil) {
-        _imagePickerVc = [[UIImagePickerController alloc] init];
-        _imagePickerVc.delegate = self;
-        // set appearance / 改变相册选择页的导航栏外观
-        if (iOS7Later) {
-            _imagePickerVc.navigationBar.barTintColor = self.viewController.navigationController.navigationBar.barTintColor;
-        }
-        _imagePickerVc.navigationBar.tintColor = self.viewController.navigationController.navigationBar.tintColor;
-        UIBarButtonItem *tzBarItem, *BarItem;
-        if (iOS9Later) {
-            tzBarItem = [UIBarButtonItem appearanceWhenContainedInInstancesOfClasses:@[[TZImagePickerController class]]];
-            BarItem = [UIBarButtonItem appearanceWhenContainedInInstancesOfClasses:@[[UIImagePickerController class]]];
-        } else {
-            tzBarItem = [UIBarButtonItem appearanceWhenContainedIn:[TZImagePickerController class], nil];
-            BarItem = [UIBarButtonItem appearanceWhenContainedIn:[UIImagePickerController class], nil];
-        }
-        NSDictionary *titleTextAttributes = [tzBarItem titleTextAttributesForState:UIControlStateNormal];
-        [BarItem setTitleTextAttributes:titleTextAttributes forState:UIControlStateNormal];
-        
-    }
-    return _imagePickerVc;
-}
-
-#pragma clang diagnostic pop
+//- (void)deleteBtnClik:(UIButton *)sender {
+//    __weak typeof(self) weakSelf = self;
+//    [_selectedPhotos removeObjectAtIndex:sender.tag];
+//    [_selectedAssets removeObjectAtIndex:sender.tag];
+//    [_collectionView performBatchUpdates:^{
+//        NSIndexPath *indexPath = [NSIndexPath indexPathForItem:sender.tag inSection:0];
+//        [weakSelf.collectionView deleteItemsAtIndexPaths:@[indexPath]];
+//    } completion:^(BOOL finished) {
+//        weakSelf.add = 1;
+//        [weakSelf updateHeight];
+//    }];
+//    
+//}
+//
+//#pragma mark - UICollectionViewdelegate
+//
+//- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section {
+//    return self.selectedPhotos.count + self.add;
+//}
+//- (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath {
+//    TZTestCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"TZTestCell" forIndexPath:indexPath];
+//    cell.videoImageView.hidden = YES;
+//    cell.gifLable.hidden = YES;
+//
+//    if (indexPath.row == _selectedPhotos.count) {
+//        cell.imageView.image = [UIImage cnLive_getImageNameWithBundle:@"pj_tianjiazhaopian" bundle:@"CNLiveMyOrderModule.bundle/CNLiveMyOrderModule" targetClass:[self class]];
+//        cell.deleteBtn.hidden = YES;
+//    } else {
+//        cell.imageView.image = _selectedPhotos[indexPath.row];
+//        cell.asset = _selectedAssets[indexPath.row];
+//        cell.deleteBtn.hidden = NO;
+//    }
+//
+//    cell.deleteBtn.tag = indexPath.row;
+//    [cell.deleteBtn addTarget:self action:@selector(deleteBtnClik:) forControlEvents:UIControlEventTouchUpInside];
+//    return cell;
+//}
+//
+//- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath {
+//    __weak typeof(self) weakSelf = self;
+//    if (indexPath.row == _selectedPhotos.count) {
+//        
+//        [self createAlertViewTitleArray:@[@"拍照",@"从相册选取"] textColor:KTextBlackColor font:UIFontMake(15) actionBlock:^(UIButton *button, NSInteger didRow) {
+//
+//            switch (didRow) {
+//                case 0: {
+//                    [self takePhoto];
+//                }
+//                    break;
+//
+//                case 1: {
+//                    [self pushTZImagePickerController];
+//                }
+//                    break;
+//
+//                default:
+//                    break;
+//            }
+//
+//        }];
+//        
+//    } else { //预览照片
+//        CNImagePickerController *imagePickerVc = [[CNImagePickerController alloc] initWithSelectedAssets:_selectedAssets selectedPhotos:_selectedPhotos index:indexPath.row];
+//        [imagePickerVc configTZImagePicker];
+//        imagePickerVc.maxImagesCount = 9;
+//        imagePickerVc.allowPickingGif = NO;
+//        imagePickerVc.allowPickingOriginalPhoto = YES;
+//        imagePickerVc.allowPickingMultipleVideo = NO;
+//        imagePickerVc.isSelectOriginalPhoto = _isSelectOriginalPhoto;
+//        [imagePickerVc setDidFinishPickingPhotosHandle:^(NSArray<UIImage *> *photos, NSArray *assets, BOOL isSelectOriginalPhoto) {
+//            weakSelf.selectedPhotos = [NSMutableArray arrayWithArray:photos];
+//            weakSelf.selectedAssets = [NSMutableArray arrayWithArray:assets];
+//            weakSelf.isSelectOriginalPhoto = isSelectOriginalPhoto;
+//           [weakSelf.collectionView reloadData];
+//            weakSelf.collectionView.contentSize = CGSizeMake(0, ((weakSelf.selectedPhotos.count + 2) / 3 ) * (weakSelf.margin + weakSelf.itemWH));
+//        }];
+//        [self.viewController presentViewController:imagePickerVc animated:YES completion:nil];
+//
+//    }
+//}
+//#pragma mark - LxGridViewDataSource
+///// 以下三个方法为长按排序相关代码
+//- (BOOL)collectionView:(UICollectionView *)collectionView canMoveItemAtIndexPath:(NSIndexPath *)indexPath {
+//    return indexPath.item < _selectedPhotos.count;
+//}
+//
+//- (BOOL)collectionView:(UICollectionView *)collectionView itemAtIndexPath:(NSIndexPath *)sourceIndexPath canMoveToIndexPath:(NSIndexPath *)destinationIndexPath {
+//    return (sourceIndexPath.item < _selectedPhotos.count && destinationIndexPath.item < _selectedPhotos.count);
+//}
+//
+//- (void)collectionView:(UICollectionView *)collectionView itemAtIndexPath:(NSIndexPath *)sourceIndexPath didMoveToIndexPath:(NSIndexPath *)destinationIndexPath {
+//    UIImage *image = _selectedPhotos[sourceIndexPath.item];
+//    [_selectedPhotos removeObjectAtIndex:sourceIndexPath.item];
+//    [_selectedPhotos insertObject:image atIndex:destinationIndexPath.item];
+//    
+//    id asset = _selectedAssets[sourceIndexPath.item];
+//    [_selectedAssets removeObjectAtIndex:sourceIndexPath.item];
+//    [_selectedAssets insertObject:asset atIndex:destinationIndexPath.item];
+//    
+//    [_collectionView reloadData];
+//    
+//    if (self.delegate && [self.delegate respondsToSelector:@selector(updateImages:)]) {
+//        [self.delegate updateImages:_selectedAssets];
+//    }
+//}
+//
+//#pragma mark - UIImagePickerController
+//- (void)takePhoto {
+//    AVAuthorizationStatus authStatus = [AVCaptureDevice authorizationStatusForMediaType:AVMediaTypeVideo];
+//    if ((authStatus == AVAuthorizationStatusRestricted || authStatus == AVAuthorizationStatusDenied) && iOS7Later) {
+//        // 无相机权限 做一个友好的提示
+//        if (iOS8Later) {
+//            UIAlertView * alert = [[UIAlertView alloc]initWithTitle:@"无法使用相机" message:@"请在iPhone的“设置-隐私-相机“中允许访问相机" delegate:self cancelButtonTitle:@"取消" otherButtonTitles:nil, nil];//设置
+//            
+//            [alert show];
+//        }
+//    } else if (authStatus == AVAuthorizationStatusNotDetermined) {
+//        // fix issue 466, 防止用户首次拍照拒绝授权时相机页黑屏
+//        if (iOS7Later) {
+//            [AVCaptureDevice requestAccessForMediaType:AVMediaTypeVideo completionHandler:^(BOOL granted) {
+//                if (granted) {
+//                    dispatch_sync(dispatch_get_main_queue(), ^{
+//                        [self takePhoto];
+//                    });
+//                }
+//            }];
+//        } else {
+//            [self takePhoto];
+//        }
+//        // 拍照之前还需要检查相册权限
+//    } else if ([TZImageManager authorizationStatus] == 2) { // 已被拒绝，没有相册权限，将无法保存拍的照片
+//        if (iOS8Later) {
+//            UIAlertView * alert = [[UIAlertView alloc]initWithTitle:@"无法访问相册" message:@"请在iPhone的“设置-隐私-相册“中允许访问相册" delegate:self cancelButtonTitle:@"取消" otherButtonTitles:nil, nil];//设置
+//            [alert show];
+//        }
+//    } else if ([TZImageManager authorizationStatus] == 0) { // 未请求过相册权限
+//        [[TZImageManager manager] requestAuthorizationWithCompletion:^{
+//            [self takePhoto];
+//        }];
+//    } else {
+//        [self pushImagePickerController];
+//    }
+//}
+//// 调用相机
+//- (void)pushImagePickerController {
+//    UIImagePickerControllerSourceType sourceType = UIImagePickerControllerSourceTypeCamera;
+//    if ([UIImagePickerController isSourceTypeAvailable: UIImagePickerControllerSourceTypeCamera]) {
+//        self.imagePickerVc.sourceType = sourceType;
+//        if(iOS8Later) {
+//            _imagePickerVc.modalPresentationStyle = UIModalPresentationOverCurrentContext;
+//        }
+//        [self.viewController presentViewController:_imagePickerVc animated:YES completion:nil];
+//    } else {
+//        NSLog(@"模拟器中无法打开照相机,请在真机中使用");
+//    }
+//}
+//#pragma mark - TZImagePickerController
+////- (void)pushTZImagePickerController {
+////    CNImagePickerController *imagePickerVc = [[CNImagePickerController alloc]initWithMaxImagesCount:9 columnNumber:4 delegate:self pushPhotoPickerVc:YES];
+////    [imagePickerVc configTZImagePicker];//配置
+////#pragma mark - 五类个性化设置，这些参数都可以不传，此时会走默认设置
+////    imagePickerVc.isSelectOriginalPhoto = _isSelectOriginalPhoto;
+////
+////    imagePickerVc.selectedAssets = _selectedAssets;     //目前已经选中的图片数组
+////    imagePickerVc.allowTakePicture = NO;                //在内部显示拍照按钮
+////    imagePickerVc.allowPickingVideo = NO;               //是否允许选择视频
+////    imagePickerVc.allowPickingImage = YES;              //是否允许选择图片
+////    imagePickerVc.allowPickingOriginalPhoto = YES;      //选择原图
+////    imagePickerVc.allowPickingGif = NO;                 //选择Gif
+////    imagePickerVc.allowPickingMultipleVideo = NO;       // 是否可以多选视频
+////    imagePickerVc.sortAscendingByModificationDate = YES;//排序
+////    imagePickerVc.showSelectBtn = NO;
+////    imagePickerVc.allowCrop = NO;                       //是否允许裁剪
+////    imagePickerVc.needCircleCrop = NO;                  //是否使用圆形裁剪
+////
+////    // 你可以通过block或者代理，来得到用户选择的照片.
+////    [imagePickerVc setDidFinishPickingPhotosHandle:^(NSArray<UIImage *> *photos, NSArray *assets, BOOL isSelectOriginalPhoto) {
+////
+////    }];
+////    [self.viewController presentViewController:imagePickerVc animated:YES completion:nil];
+////}
+//- (void)imagePickerController:(UIImagePickerController*)picker didFinishPickingMediaWithInfo:(NSDictionary *)info {
+//    [picker dismissViewControllerAnimated:YES completion:nil];
+//    NSString *type = [info objectForKey:UIImagePickerControllerMediaType];
+//    if ([type isEqualToString:@"public.image"]) {
+//        TZImagePickerController *tzImagePickerVc = [[TZImagePickerController alloc] initWithMaxImagesCount:1 delegate:self];
+//        tzImagePickerVc.modalPresentationStyle = UIModalPresentationFullScreen;
+//        tzImagePickerVc.sortAscendingByModificationDate = YES;
+//        [tzImagePickerVc showProgressHUD];
+//        UIImage *image = [info objectForKey:UIImagePickerControllerOriginalImage];
+//        
+//        // save photo and get asset / 保存图片，获取到asset
+//        [[TZImageManager manager] savePhotoWithImage:image location:nil completion:^(NSError *error){
+//            [tzImagePickerVc hideProgressHUD];
+//            if (error) {
+//                [tzImagePickerVc hideProgressHUD];
+//                NSLog(@"图片保存失败 %@",error);
+//            } else {
+//                [[TZImageManager manager] getCameraRollAlbum:NO allowPickingImage:YES needFetchAssets:YES completion:^(TZAlbumModel *model) {
+//                    [[TZImageManager manager] getAssetsFromFetchResult:model.result allowPickingVideo:NO allowPickingImage:YES completion:^(NSArray<TZAssetModel *> *models) {
+//                        [tzImagePickerVc hideProgressHUD];
+//                        TZAssetModel *assetModel = [models firstObject];
+//                        if (tzImagePickerVc.sortAscendingByModificationDate) {
+//                            assetModel = [models lastObject];
+//                        }
+//                        
+//                        [self refreshCollectionViewWithAddedAsset:assetModel.asset image:image];
+//                        
+//                    }];
+//                }];
+//            }
+//        }];
+//    }
+//}
+//
+//- (void)refreshCollectionViewWithAddedAsset:(id)asset image:(UIImage *)image {
+//    [_selectedAssets addObject:asset];
+//    [_selectedPhotos addObject:image];
+//    [_collectionView reloadData];
+//    
+//    if (_selectedPhotos.count == 9) {
+//        _add = 0;
+//    } else {
+//        _add = 1;
+//    }
+//    
+//    [self updateHeight];
+//    
+//}
+//- (void)imagePickerControllerDidCancel:(UIImagePickerController *)picker {
+//    if ([picker isKindOfClass:[UIImagePickerController class]]) {
+//        [picker dismissViewControllerAnimated:YES completion:nil];
+//    }
+//}
+//
+//#pragma mark - UIActionSheetDelegate
+//
+//- (void)actionSheet:(UIActionSheet *)actionSheet clickedButtonAtIndex:(NSInteger)buttonIndex {
+//    if (buttonIndex == 0) { // take photo / 去拍照
+//        [self takePhoto];
+//    } else if (buttonIndex == 1) {
+//        [self pushTZImagePickerController];
+//    }
+//}
+//
+//#pragma mark - UIAlertViewDelegate
+//- (void)alertView:(UIAlertView *)alertView clickedButtonAtIndex:(NSInteger)buttonIndex {
+//    if (buttonIndex == 1) { // 去设置界面，开启相机访问权限
+//        if (iOS8Later) {
+//            [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString]];
+//        }
+//    }
+//}
+//
+//#pragma mark - TZImagePickerControllerDelegate
+//- (void)tz_imagePickerControllerDidCancel:(TZImagePickerController *)picker {
+//    // NSLog(@"cancel");
+//}
+//
+//- (void)imagePickerController:(TZImagePickerController *)picker didFinishPickingPhotos:(NSArray<UIImage *> *)photos sourceAssets:(NSArray *)assets isSelectOriginalPhoto:(BOOL)isSelectOriginalPhoto infos:(NSArray<NSDictionary *> *)infos {
+//    _selectedPhotos = [NSMutableArray arrayWithArray:photos];
+//    _selectedAssets = [NSMutableArray arrayWithArray:assets];
+//    _isSelectOriginalPhoto = isSelectOriginalPhoto;
+//
+//    if (_selectedPhotos.count == 9) {
+//        _add = 0;
+//    } else {
+//        _add = 1;
+//    }
+//
+//    [self updateHeight];
+//
+//}
+//
+////更新自身高度
+//- (void)updateHeight {
+//    
+//    NSInteger num = 0;
+//    if (_selectedAssets.count == 9) {
+//        num = 9;
+//    } else {
+//        num = _selectedAssets.count+1;
+//    }
+//    
+//    NSInteger integer = num/3;
+//    NSInteger remainder = num%3;
+//    
+//    if (remainder > 0) {
+//        integer += 1;
+//    }
+//    
+//    _collectionView.frame = CGRectMake(10, _colTop, KScreenWidth-20, _itemWH*integer + integer*_margin +10);
+//    [_collectionView reloadData];
+//    
+//    CGFloat h = _collectionView.height + integer*_margin + 60;
+//    [self mas_updateConstraints:^(MASConstraintMaker *make) {
+//        make.height.mas_equalTo(h);
+//    }];
+//    
+//    if (self.delegate && [self.delegate respondsToSelector:@selector(updateImages:)]) {
+//        [self.delegate updateImages:_selectedPhotos];
+//    }
+//    
+//}
+//
+//
+//// Decide album show or not't
+//// 决定相册显示与否
+//- (BOOL)isAlbumCanSelect:(NSString *)albumName result:(id)result {
+//    return YES;
+//}
+//
+//// Decide asset show or not't
+//// 决定asset显示与否
+//- (BOOL)isAssetCanSelect:(id)asset {
+//    return YES;
+//}
+//
+//#pragma mark -
+//#pragma mark - Getter
+//- (UILabel *)titleLab
+//{
+//    if (!_titleLab) {
+//        _titleLab = [[UILabel alloc] init];
+//        _titleLab.font = [UIFont systemFontOfSize:15];
+//        _titleLab.text = @"上传照片";
+//    }
+//    return _titleLab;
+//}
+//
+//- (UIImagePickerController *)imagePickerVc {
+//    if (_imagePickerVc == nil) {
+//        _imagePickerVc = [[UIImagePickerController alloc] init];
+//        _imagePickerVc.delegate = self;
+//        // set appearance / 改变相册选择页的导航栏外观
+//        if (iOS7Later) {
+//            _imagePickerVc.navigationBar.barTintColor = self.viewController.navigationController.navigationBar.barTintColor;
+//        }
+//        _imagePickerVc.navigationBar.tintColor = self.viewController.navigationController.navigationBar.tintColor;
+//        UIBarButtonItem *tzBarItem, *BarItem;
+//        if (iOS9Later) {
+//            tzBarItem = [UIBarButtonItem appearanceWhenContainedInInstancesOfClasses:@[[TZImagePickerController class]]];
+//            BarItem = [UIBarButtonItem appearanceWhenContainedInInstancesOfClasses:@[[UIImagePickerController class]]];
+//        } else {
+//            tzBarItem = [UIBarButtonItem appearanceWhenContainedIn:[TZImagePickerController class], nil];
+//            BarItem = [UIBarButtonItem appearanceWhenContainedIn:[UIImagePickerController class], nil];
+//        }
+//        NSDictionary *titleTextAttributes = [tzBarItem titleTextAttributesForState:UIControlStateNormal];
+//        [BarItem setTitleTextAttributes:titleTextAttributes forState:UIControlStateNormal];
+//        
+//    }
+//    return _imagePickerVc;
+//}
+//
+//#pragma clang diagnostic pop
@@ -6,8 +6,8 @@
 //
 #import <Foundation/Foundation.h>
-#import "CNLiveOrderList.h"
-#import "CNLiveAdminAddressModel.h"
+@class CNLiveOrderList;
+@class CNLiveAdminAddressModel;
 NS_ASSUME_NONNULL_BEGIN
 typedef void(^PayBlock)(int code);
 @interface CNLiveOrderEventHandle : NSObject
@@ -71,66 +71,6 @@ typedef void(^PayBlock)(int code);
 /**
  *  去支付
  */
-+ (void)pay:(CNLiveOrderList *)orderList payBlock:(PayBlock)block;/**
-*  提交订单
-*/
-+ (void)submitOrder:(CNLiveOrderList *)orderList address:(CNLiveAdminAddressModel *)model superView:(UIView *)view complete:(void(^)(BOOL ret))complete;
-/**
- *  删除订单
- */
-+ (void)deleteOrder:(CNLiveOrderList *)orderList itemId:(NSString *)itemId superView:(UIView *)view complete:(void(^)(BOOL ret))complete;
-/**
- *  催单
- */
-+ (void)reminderOrder:(CNLiveOrderList *)orderList superView:(UIView *)view complete:(void(^)(NSString *msg))complete;
-/**
- *  联系达人
- */
-+ (void)contactUser:(CNLiveOrderList *)orderList pop:(BOOL)pop jumpBlock:(void(^)(BOOL isPop))jumpBlock;
-/**
- *  退款详情
- */
-+ (void)refundDetail:(CNLiveOrderList *)orderList jumpBlock:(void(^)(NSString *orderId))jumpBlock;
-/**
- *  订单详情
- */
-+ (void)orderDetail:(CNLiveOrderList *)orderList orderBlock:(void (^)(NSString *orderId))orderBlock;
-/**
- *  订单详情
- */
-// + (void)orderDetailByOrderId:(NSString *)orderId;
-/**
- *  申请退款
- */
-+ (void)applyForRefund:(CNLiveOrderList *)orderList jumpBlock:(void (^)(CNLiveOrderList *orderList))jumpBlock;
-/**
- *  确认收货
- */
-+ (void)confirmRecv:(CNLiveOrderList *)orderList itemId:(NSString *)itemId superView:(UIView *)view complete:(void(^)(BOOL ret))complete;
-/**
- *  取消订单
- */
-+ (void)cancelOrder:(CNLiveOrderList *)orderList superView:(UIView *)view complete:(void(^)(BOOL ret))complete;
-/**
- *  订单有误
- */
-+ (void)orderError:(CNLiveOrderList *)orderList superView:(UIView *)view complete:(void(^)(BOOL ret))complete;
-/**
- *  确认订单
- */
-+ (void)confirmOrder:(CNLiveOrderList *)orderList superView:(UIView *)view complete:(void(^)(BOOL ret))complete;
-/**
- *  评价订单
- */
-+ (void)evaluateOrder:(CNLiveOrderList *)orderList jumpBlock:(void (^)(CNLiveOrderList *orderList))jumpBlock;
-/**
- *  达人主页
- */
-+ (void)darenHome:(CNLiveOrderList *)orderList jumpBlock:(void (^)(NSString *userId))jumpBlock;
-
-/**
- *  去支付
- */
 + (void)pay:(CNLiveOrderList *)orderList payBlock:(PayBlock)block;
 @end
@@ -13,6 +13,8 @@
 #import <CNLiveRequestBastKit/CNLiveNetworking.h>
 #import "CNLiveEnvironment.h"
 #import "CNUserInfoManager.h"
+#import "CNLiveOrderList.h"
+#import "CNLiveAdminAddressModel.h"
 @implementation CNLiveOrderEventHandle
 #pragma mark -提交订单
 + (void)submitOrder:(CNLiveOrderList *)orderList address:(DSAddressModel *)model superView:(UIView *)view complete:(void (^)(BOOL))complete {
@@ -207,8 +207,7 @@
 				6003F586195388D20070C39A /* Sources */,
 				6003F587195388D20070C39A /* Frameworks */,
 				6003F588195388D20070C39A /* Resources */,
-				B3C4AEE6B682DFE3670D8608 /* [CP] Embed Pods Frameworks */,
-				F110CD7F28D0CF6F4889A2A2 /* [CP] Copy Pods Resources */,
+				845F81D6903EC723010F3D5B /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -321,7 +320,7 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		B3C4AEE6B682DFE3670D8608 /* [CP] Embed Pods Frameworks */ = {
+		845F81D6903EC723010F3D5B /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -330,91 +329,43 @@
 				"${PODS_ROOT}/Target Support Files/Pods-CNLiveMyOrderModule_Example/Pods-CNLiveMyOrderModule_Example-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/AFNetworking/AFNetworking.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveBaseKit/CNLiveBaseKit.framework",
-				"${BUILT_PRODUCTS_DIR}/CNLiveBaseTools/CNLiveBaseTools.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveBeeHive/CNLiveBeeHive.framework",
-				"${BUILT_PRODUCTS_DIR}/CNLiveBusinessTools/CNLiveBusinessTools.framework",
-				"${BUILT_PRODUCTS_DIR}/CNLiveCacheManagerKit/CNLiveCacheManagerKit.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveCommonCategory/CNLiveCommonCategory.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveCommonClass/CNLiveCommonClass.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveCustomUI/CNLiveCustomUI.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework",
-				"${BUILT_PRODUCTS_DIR}/CNLiveImagePickerController/CNLiveImagePickerController.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveMyOrderModule/CNLiveMyOrderModule.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveRequestBastKit/CNLiveRequestBastKit.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveTripartiteManagement/CNLiveTripartiteManagement.framework",
-				"${BUILT_PRODUCTS_DIR}/CNLiveUploadManager/CNLiveUploadManager.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveUserManagement/CNLiveUserManagement.framework",
-				"${BUILT_PRODUCTS_DIR}/FMDB/FMDB.framework",
-				"${BUILT_PRODUCTS_DIR}/GPUImage/GPUImage.framework",
-				"${BUILT_PRODUCTS_DIR}/HappyDNS/HappyDNS.framework",
 				"${BUILT_PRODUCTS_DIR}/JXCategoryView/JXCategoryView.framework",
-				"${BUILT_PRODUCTS_DIR}/Ks3SDK/Ks3SDK.framework",
-				"${BUILT_PRODUCTS_DIR}/MBProgressHUD/MBProgressHUD.framework",
 				"${BUILT_PRODUCTS_DIR}/MJExtension/MJExtension.framework",
 				"${BUILT_PRODUCTS_DIR}/MJRefresh/MJRefresh.framework",
 				"${BUILT_PRODUCTS_DIR}/Masonry/Masonry.framework",
-				"${BUILT_PRODUCTS_DIR}/PGDatePicker/PGDatePicker.framework",
-				"${BUILT_PRODUCTS_DIR}/PGPickerView/PGPickerView.framework",
-				"${PODS_ROOT}/PLPlayerKit/Pod/Library/PLPlayerKit.framework",
 				"${BUILT_PRODUCTS_DIR}/QMUIKit/QMUIKit.framework",
-				"${BUILT_PRODUCTS_DIR}/Qiniu/Qiniu.framework",
-				"${BUILT_PRODUCTS_DIR}/RSKImageCropper/RSKImageCropper.framework",
-				"${BUILT_PRODUCTS_DIR}/SAMKeychain/SAMKeychain.framework",
-				"${BUILT_PRODUCTS_DIR}/SDAutoLayout/SDAutoLayout.framework",
-				"${BUILT_PRODUCTS_DIR}/SDCycleScrollView/SDCycleScrollView.framework",
 				"${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework",
-				"${BUILT_PRODUCTS_DIR}/SGPagingView/SGPagingView.framework",
-				"${BUILT_PRODUCTS_DIR}/SSZipArchive/SSZipArchive.framework",
-				"${PODS_ROOT}/TXIMSDK_iOS/ImSDK.framework",
-				"${BUILT_PRODUCTS_DIR}/WebViewJavascriptBridge/WebViewJavascriptBridge.framework",
 				"${BUILT_PRODUCTS_DIR}/YYKit/YYKit.framework",
-				"${BUILT_PRODUCTS_DIR}/libksygpulive_ks3/libksygpulive.framework",
-				"${BUILT_PRODUCTS_DIR}/lottie-ios/Lottie.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AFNetworking.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseKit.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseTools.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBeeHive.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBusinessTools.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCacheManagerKit.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCommonCategory.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCommonClass.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCustomUI.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEnvironment.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveImagePickerController.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveMyOrderModule.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveRequestBastKit.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveTripartiteManagement.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUploadManager.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUserManagement.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FMDB.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GPUImage.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/HappyDNS.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/JXCategoryView.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Ks3SDK.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MBProgressHUD.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJExtension.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJRefresh.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Masonry.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PGDatePicker.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PGPickerView.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PLPlayerKit.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/QMUIKit.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Qiniu.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RSKImageCropper.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SAMKeychain.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDAutoLayout.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDCycleScrollView.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SGPagingView.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SSZipArchive.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ImSDK.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/WebViewJavascriptBridge.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYKit.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/libksygpulive.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Lottie.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@@ -443,26 +394,6 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		F110CD7F28D0CF6F4889A2A2 /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-CNLiveMyOrderModule_Example/Pods-CNLiveMyOrderModule_Example-resources.sh",
-				"${PODS_ROOT}/BaiduMapKit/BaiduMapKit/BaiduMapAPI_Map.framework/mapapi.bundle",
-				"${PODS_ROOT}/Weibo_SDK/libWeiboSDK/WeiboSDK.bundle",
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/mapapi.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/WeiboSDK.bundle",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveMyOrderModule_Example/Pods-CNLiveMyOrderModule_Example-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 /* End PBXShellScriptBuildPhase section */
 /* Begin PBXSourcesBuildPhase section */
@@ -5,14 +5,14 @@ platform :ios, &#39;9.0&#39;
 target 'CNLiveMyOrderModule_Example' do
   pod 'CNLiveMyOrderModule', :path => '../'
-  pod 'JXCategoryView'
-  pod 'CNLiveCommonClass'
-  pod 'CNLiveCommonCategory'
-  pod 'CNLiveBaseKit'
-  pod 'CNLiveTripartiteManagement/Masonry'
-  pod 'CNLiveUserManagement'
-  pod 'CNLiveEnvironment'
-  pod 'CNLiveRequestBastKit'
+#  pod 'JXCategoryView'
+#  pod 'CNLiveCommonClass'
+#  pod 'CNLiveCommonCategory'
+#  pod 'CNLiveBaseKit'
+#  pod 'CNLiveTripartiteManagement/Masonry'
+#  pod 'CNLiveUserManagement'
+#  pod 'CNLiveEnvironment'
+#  pod 'CNLiveRequestBastKit'
   pre_install do |installer| Pod::Installer::Xcode::TargetValidator.send(:define_method, :verify_no_static_framework_transitive_dependencies) {}
   end
   target 'CNLiveMyOrderModule_Tests' do
 # CNLiveMyOrderModule
-
+本地验证
+pod lib lint --sources=http://bj.gitlab.cnlive.com/ios-team/CNLiveRepos.git,https://github.com/CocoaPods/Specs.git --allow-warnings --use-libraries
+远端验证
+pod spec lint --sources=http://bj.gitlab.cnlive.com/ios-team/CNLiveRepos.git,https://github.com/CocoaPods/Specs.git --allow-warnings --use-libraries
+远程推送
+pod repo push CNLiveRepos CNLiveMyOrderModule.podspec --allow-warnings --use-libraries
 [![CI Status](https://img.shields.io/travis/殷巧娟/CNLiveMyOrderModule.svg?style=flat)](https://travis-ci.org/殷巧娟/CNLiveMyOrderModule)
 [![Version](https://img.shields.io/cocoapods/v/CNLiveMyOrderModule.svg?style=flat)](https://cocoapods.org/pods/CNLiveMyOrderModule)
 [![License](https://img.shields.io/cocoapods/l/CNLiveMyOrderModule.svg?style=flat)](https://cocoapods.org/pods/CNLiveMyOrderModule)