Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/CNLiveCMineModule

* 'master' of bj.gitlab.cnlive.com:ios-team/CNLiveCMineModule: 0.3.1 版本图片选择库整理

Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/CNLiveCMineModule
* 'master' of bj.gitlab.cnlive.com:ios-team/CNLiveCMineModule: 0.3.1 版本图片选择库整理
yanglingyu
2 parents c2ac6470 85b84708
Showing 2 changed files with 24 additions and 22 deletions
CNLiveCMineModule/Classes/CNCSubMine/ViewController/CNMinePersonIconController.m
CNLiveCMineModule/Classes/CNOrder/View/CNUploadVoucher.m
@@ -8,13 +8,13 @@
 #import "CNMinePersonIconController.h"
 #import "CNBottomSelectView.h"
-#import "TZImagePickerController.h"
+#import <CNLiveImagePickerController/CNImagePickerManager.h>
 #import "RSKImageCropper.h"
 #import "CNCSubMinePresent.h"
 #import <CoreServices/CoreServices.h>
 #import <CNLiveUserSystemSDK/CNLiveUserSystemCenter.h>
 #import <CNLiveNewIMAManagerKit/IMAPlatform.h>
-@interface CNMinePersonIconController ()<UIImagePickerControllerDelegate,UINavigationControllerDelegate,TZImagePickerControllerDelegate, RSKImageCropViewControllerDelegate,RSKImageCropViewControllerDataSource>
+@interface CNMinePersonIconController ()<UIImagePickerControllerDelegate,UINavigationControllerDelegate, RSKImageCropViewControllerDelegate,RSKImageCropViewControllerDataSource>
 @property (nonatomic, strong) UIImageView *iconView;
 @property (nonatomic, strong) CNBottomSelectView *selectV;
@@ -207,7 +207,7 @@
             }
         } else if (index == 1) {
-            TZImagePickerController *imagePickerVc = [[TZImagePickerController alloc] initWithMaxImagesCount:1 delegate:weakSelf];
+            CNTZImagePickerController *imagePickerVc = [[CNTZImagePickerController alloc] initWithMaxImagesCount:1 delegate:weakSelf];
             imagePickerVc.modalPresentationStyle = UIModalPresentationFullScreen;
             imagePickerVc.allowTakePicture = NO; // 在内部显示拍照按钮
             imagePickerVc.allowPreview = NO;
@@ -7,18 +7,20 @@
 //
 #import "CNUploadVoucher.h"
-#import "TZImagePickerController.h"
-#import "TZImageManager.h"
+//#import "TZImagePickerController.h"
+//#import "TZImageManager.h"
 #import "LxGridViewFlowLayout.h"
+
 #import "TZTestNewCell.h"
+
 #import <AssetsLibrary/AssetsLibrary.h>
 #import <Photos/Photos.h>
-#import "TZLocationManager.h"
-#import "CNImagePickerController.h"
+//#import "TZLocationManager.h"
+#import <CNLiveImagePickerController/CNImagePickerManager.h>
 @interface CNUploadVoucher ()
-<TZImagePickerControllerDelegate,UINavigationControllerDelegate, UIImagePickerControllerDelegate,
+<UINavigationControllerDelegate, UIImagePickerControllerDelegate,
 UICollectionViewDataSource,UICollectionViewDelegate,
 UIActionSheetDelegate>
 {
@@ -173,7 +175,7 @@ UIActionSheetDelegate&gt;
     } else { //预览照片
         CNImagePickerController *imagePickerVc = [[CNImagePickerController alloc] initWithSelectedAssets:_selectedAssets selectedPhotos:_selectedPhotos index:indexPath.row];
-        [imagePickerVc configTZImagePicker];
+        [imagePickerVc configCNTZImagePicker];
         imagePickerVc.maxImagesCount = 9;
         imagePickerVc.allowPickingGif = NO;
         imagePickerVc.allowPickingOriginalPhoto = YES;
@@ -221,7 +223,7 @@ UIActionSheetDelegate&gt;
 #pragma mark - TZImagePickerController
 - (void)pushTZImagePickerController {
     CNImagePickerController *imagePickerVc = [[CNImagePickerController alloc]initWithMaxImagesCount:9 columnNumber:4 delegate:self pushPhotoPickerVc:YES];
-    [imagePickerVc configTZImagePicker];//配置
+    [imagePickerVc configCNTZImagePicker];//配置
 #pragma mark - 五类个性化设置，这些参数都可以不传，此时会走默认设置
     imagePickerVc.isSelectOriginalPhoto = _isSelectOriginalPhoto;
@@ -277,7 +279,7 @@ UIActionSheetDelegate&gt;
             [self takePhoto];
         }
         // 拍照之前还需要检查相册权限
-    } else if ([TZImageManager authorizationStatus] == 2) { // 已被拒绝，没有相册权限，将无法保存拍的照片
+    } else if ([CNTZImageManager authorizationStatus] == 2) { // 已被拒绝，没有相册权限，将无法保存拍的照片
         if (iOS8Later) {
             UIAlertView * alert = [[UIAlertView alloc]initWithTitle:@"无法访问相册" message:@"请在iPhone的“设置-隐私-相册“中允许访问相册" delegate:self cancelButtonTitle:@"取消" otherButtonTitles:nil, nil];//设置
             [alert show];
@@ -286,8 +288,8 @@ UIActionSheetDelegate&gt;
 //            UIAlertView * alert = [[UIAlertView alloc]initWithTitle:@"无法访问相册" message:@"请在iPhone的""设置-隐私-相册""中允许访问相册" delegate:self cancelButtonTitle:@"确定" otherButtonTitles:nil];
 //            [alert show];
 //        }
-    } else if ([TZImageManager authorizationStatus] == 0) { // 未请求过相册权限
-        [[TZImageManager manager] requestAuthorizationWithCompletion:^{
+    } else if ([CNTZImageManager authorizationStatus] == 0) { // 未请求过相册权限
+        [[CNTZImageManager manager] requestAuthorizationWithCompletion:^{
             [self takePhoto];
         }];
     } else {
@@ -323,23 +325,23 @@ UIActionSheetDelegate&gt;
     [picker dismissViewControllerAnimated:YES completion:nil];
     NSString *type = [info objectForKey:UIImagePickerControllerMediaType];
     if ([type isEqualToString:@"public.image"]) {
-        TZImagePickerController *tzImagePickerVc = [[TZImagePickerController alloc] initWithMaxImagesCount:1 delegate:self];
+        CNTZImagePickerController *tzImagePickerVc = [[CNTZImagePickerController 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){
+        [[CNTZImageManager 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) {
+                [[CNTZImageManager manager] getCameraRollAlbum:NO allowPickingImage:YES needFetchAssets:YES completion:^(CNTZAlbumModel *model) {
+                    [[CNTZImageManager manager] getAssetsFromFetchResult:model.result allowPickingVideo:NO allowPickingImage:YES completion:^(NSArray<CNTZAssetModel *> *models) {
                         [tzImagePickerVc hideProgressHUD];
-                        TZAssetModel *assetModel = [models firstObject];
+                        CNTZAssetModel *assetModel = [models firstObject];
                         if (tzImagePickerVc.sortAscendingByModificationDate) {
                             assetModel = [models lastObject];
                         }
@@ -394,11 +396,11 @@ UIActionSheetDelegate&gt;
 }
 #pragma mark - TZImagePickerControllerDelegate
-- (void)tz_imagePickerControllerDidCancel:(TZImagePickerController *)picker {
+- (void)tz_imagePickerControllerDidCancel:(CNTZImagePickerController *)picker {
     // NSLog(@"cancel");
 }
-- (void)imagePickerController:(TZImagePickerController *)picker didFinishPickingPhotos:(NSArray<UIImage *> *)photos sourceAssets:(NSArray *)assets isSelectOriginalPhoto:(BOOL)isSelectOriginalPhoto infos:(NSArray<NSDictionary *> *)infos {
+- (void)imagePickerController:(CNTZImagePickerController *)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;
@@ -480,10 +482,10 @@ UIActionSheetDelegate&gt;
         _imagePickerVc.navigationBar.tintColor = self.viewController.navigationController.navigationBar.tintColor;
         UIBarButtonItem *tzBarItem, *BarItem;
         if (iOS9Later) {
-            tzBarItem = [UIBarButtonItem appearanceWhenContainedInInstancesOfClasses:@[[TZImagePickerController class]]];
+            tzBarItem = [UIBarButtonItem appearanceWhenContainedInInstancesOfClasses:@[[CNTZImagePickerController class]]];
             BarItem = [UIBarButtonItem appearanceWhenContainedInInstancesOfClasses:@[[UIImagePickerController class]]];
         } else {
-            tzBarItem = [UIBarButtonItem appearanceWhenContainedIn:[TZImagePickerController class], nil];
+            tzBarItem = [UIBarButtonItem appearanceWhenContainedIn:[CNTZImagePickerController class], nil];
             BarItem = [UIBarButtonItem appearanceWhenContainedIn:[UIImagePickerController class], nil];
         }
         NSDictionary *titleTextAttributes = [tzBarItem titleTextAttributesForState:UIControlStateNormal];