1.7.5 允许在外界弹出裁剪控制器

TZImagePickerController.podspec

 Pod::Spec.new do |s|
   s.name         = "TZImagePickerController"
-  s.version      = "1.7.4"
+  s.version      = "1.7.5"
   s.summary      = "A clone of UIImagePickerController, support picking multiple photos、original photo and video"
   s.homepage     = "https://github.com/banchichen/TZImagePickerController"
   s.license      = "MIT"
   s.author       = { "banchichen" => "tanzhenios@foxmail.com" }
   s.platform     = :ios
   s.ios.deployment_target = "6.0"
-  s.source       = { :git => "https://github.com/banchichen/TZImagePickerController.git", :tag => "1.7.4" }
+  s.source       = { :git => "https://github.com/banchichen/TZImagePickerController.git", :tag => "1.7.5" }
   s.requires_arc = true
   s.resources    = "TZImagePickerController/TZImagePickerController/*.{png,xib,nib,bundle}"
   s.source_files = "TZImagePickerController/TZImagePickerController/*.{h,m}"

TZImagePickerController/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.7.4</string>
+	<string>1.7.5</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

TZImagePickerController/TZImagePickerController/TZImagePickerController.h

@@ -4,7 +4,7 @@
 //
 //  Created by 谭真 on 15/12/24.
 //  Copyright © 2015年 谭真. All rights reserved.
-//  version 1.7.4 - 2016.12.6
+//  version 1.7.5 - 2016.12.7
 
 /*
  经过测试，比起xib的方式，把TZAssetCell改用纯代码的方式来写，滑动帧数明显提高了（约提高10帧左右）
@@ -33,6 +33,8 @@
 - (instancetype)initWithMaxImagesCount:(NSInteger)maxImagesCount columnNumber:(NSInteger)columnNumber delegate:(id<TZImagePickerControllerDelegate>)delegate pushPhotoPickerVc:(BOOL)pushPhotoPickerVc;
 /// This init method just for previewing photos / 用这个初始化方法以预览图片
 - (instancetype)initWithSelectedAssets:(NSMutableArray *)selectedAssets selectedPhotos:(NSMutableArray *)selectedPhotos index:(NSInteger)index;
+/// This init method for crop photo / 用这个初始化方法以裁剪图片
+- (instancetype)initCropTypeWithAsset:(id)asset photo:(UIImage *)photo completion:(void (^)(UIImage *cropImage,id asset))completion;
 
 /// Default is 9 / 默认最大可选9张图片
 @property (nonatomic, assign) NSInteger maxImagesCount;

TZImagePickerController/TZImagePickerController/TZImagePickerController.m

@@ -4,7 +4,7 @@
 //
 //  Created by 谭真 on 15/12/24.
 //  Copyright © 2015年 谭真. All rights reserved.
-//  version 1.7.4 - 2016.12.6
+//  version 1.7.5 - 2016.12.7
 
 #import "TZImagePickerController.h"
 #import "TZPhotoPickerController.h"
@@ -115,16 +115,10 @@
         self.allowPickingVideo = YES;
         self.allowPickingImage = YES;
         self.allowTakePicture = YES;
-        self.timeout = 15;
-        self.photoWidth = 828.0;
-        self.photoPreviewMaxWidth = 600;
         self.sortAscendingByModificationDate = YES;
         self.autoDismiss = YES;
-        self.barItemTextFont = [UIFont systemFontOfSize:15];
-        self.barItemTextColor = [UIColor whiteColor];
         self.columnNumber = columnNumber;
-        [self configDefaultImageName];
-        [self configDefaultBtnTitle];
+        [self configDefaultSetting];
         
         if (![[TZImageManager manager] authorizationStatusAuthorized]) {
             _tipLable = [[UILabel alloc] init];
@@ -161,13 +155,7 @@
     if (self) {
         self.selectedAssets = [NSMutableArray arrayWithArray:selectedAssets];
         self.allowPickingOriginalPhoto = self.allowPickingOriginalPhoto;
-        self.timeout = 15;
-        self.photoWidth = 828.0;
-        self.photoPreviewMaxWidth = 600;
-        self.barItemTextFont = [UIFont systemFontOfSize:15];
-        self.barItemTextColor = [UIColor whiteColor];
-        [self configDefaultImageName];
-        [self configDefaultBtnTitle];
+        [self configDefaultSetting];
 
         previewVc.photos = [NSMutableArray arrayWithArray:selectedPhotos];
         previewVc.currentIndex = index;
@@ -183,6 +171,42 @@
     return self;
 }
 
+/// This init method for crop photo / 用这个初始化方法以裁剪图片
+- (instancetype)initCropTypeWithAsset:(id)asset photo:(UIImage *)photo completion:(void (^)(UIImage *cropImage,id asset))completion {
+    TZPhotoPreviewController *previewVc = [[TZPhotoPreviewController alloc] init];
+    self = [super initWithRootViewController:previewVc];
+    if (self) {
+        self.maxImagesCount = 1;
+        self.allowCrop = YES;
+        self.selectedAssets = [NSMutableArray arrayWithArray:@[asset]];
+        [self configDefaultSetting];
+        
+        previewVc.photos = [NSMutableArray arrayWithArray:@[photo]];
+        previewVc.isCropImage = YES;
+        previewVc.currentIndex = 0;
+        __weak typeof(self) weakSelf = self;
+        [previewVc setDoneButtonClickBlockCropMode:^(UIImage *cropImage, id asset) {
+            [weakSelf dismissViewControllerAnimated:YES completion:^{
+                if (completion) {
+                    completion(cropImage,asset);
+                }
+            }];
+        }];
+    }
+    return self;
+}
+
+- (void)configDefaultSetting {
+    self.timeout = 15;
+    self.photoWidth = 828.0;
+    self.photoPreviewMaxWidth = 600;
+    self.barItemTextFont = [UIFont systemFontOfSize:15];
+    self.barItemTextColor = [UIColor whiteColor];
+    
+    [self configDefaultImageName];
+    [self configDefaultBtnTitle];
+}
+
 - (void)configDefaultImageName {
     self.takePictureImageName = @"takePicture.png";
     self.photoSelImageName = @"photo_sel_photoPickerVc.png";

TZImagePickerController/TZImagePickerController/TZPhotoPickerController.m

@@ -447,7 +447,6 @@ static CGSize AssetGridThumbnailSize;
         UIAlertView * alert = [[UIAlertView alloc]initWithTitle:[NSBundle tz_localizedStringForKey:@"Can not use camera"] message:message delegate:self cancelButtonTitle:[NSBundle tz_localizedStringForKey:@"Cancel"] otherButtonTitles:[NSBundle tz_localizedStringForKey:@"Setting"], nil];
         [alert show];
     } else { // 调用相机
-        TZImagePickerController *tzImagePickerVc = (TZImagePickerController *)self.navigationController;
         UIImagePickerControllerSourceType sourceType = UIImagePickerControllerSourceTypeCamera;
         if ([UIImagePickerController isSourceTypeAvailable: UIImagePickerControllerSourceTypeCamera]) {
             self.imagePickerVc.sourceType = sourceType;

TZImagePickerController/TZImagePickerController/TZPhotoPreviewController.h

@@ -14,6 +14,7 @@
 @property (nonatomic, strong) NSMutableArray *photos;                  ///< All photos  / 所有图片数组
 @property (nonatomic, assign) NSInteger currentIndex;           ///< Index of the photo user click / 用户点击的图片的索引
 @property (nonatomic, assign) BOOL isSelectOriginalPhoto;       ///< If YES,return original photo / 是否返回原图
+@property (nonatomic, assign) BOOL isCropImage;
 
 /// Return the new selected photos / 返回最新的选中图片数组
 @property (nonatomic, copy) void (^backButtonClickBlock)(BOOL isSelectOriginalPhoto);

TZImagePickerController/TZImagePickerController/TZPhotoPreviewController.m

@@ -390,8 +390,8 @@
     TZAssetModel *model = _models[_currentIndex];
     _selectButton.selected = model.isSelected;
     _numberLable.text = [NSString stringWithFormat:@"%zd",_tzImagePickerVc.selectedModels.count];
-    _numberImageView.hidden = (_tzImagePickerVc.selectedModels.count <= 0 || _isHideNaviBar);
-    _numberLable.hidden = (_tzImagePickerVc.selectedModels.count <= 0 || _isHideNaviBar);
+    _numberImageView.hidden = (_tzImagePickerVc.selectedModels.count <= 0 || _isHideNaviBar || _isCropImage);
+    _numberLable.hidden = (_tzImagePickerVc.selectedModels.count <= 0 || _isHideNaviBar || _isCropImage);
     
     _originalPhotoButton.selected = _isSelectOriginalPhoto;
     _originalPhotoLable.hidden = !_originalPhotoButton.isSelected;

TZImagePickerController/ViewController.m

@@ -15,6 +15,7 @@
 #import "LxGridViewFlowLayout.h"
 #import "TZImageManager.h"
 #import "TZVideoPlayerController.h"
+#import "TZPhotoPreviewController.h"
 
 @interface ViewController ()<TZImagePickerControllerDelegate,UICollectionViewDataSource,UICollectionViewDelegate,UIActionSheetDelegate,UIImagePickerControllerDelegate,UIAlertViewDelegate,UINavigationControllerDelegate> {
     NSMutableArray *_selectedPhotos;
@@ -33,8 +34,10 @@
 @property (weak, nonatomic) IBOutlet UISwitch *allowPickingImageSwitch; ///< 允许选择图片
 @property (weak, nonatomic) IBOutlet UISwitch *allowPickingOriginalPhotoSwitch; ///< 允许选择原图
 @property (weak, nonatomic) IBOutlet UISwitch *showSheetSwitch; ///< 显示一个sheet,把拍照按钮放在外面
-@property (weak, nonatomic) IBOutlet UITextField *maxCountTF; ///< 照片最大可选张数，设置为1即为单选模式
+@property (weak, nonatomic) IBOutlet UITextField *maxCountTF;  ///< 照片最大可选张数，设置为1即为单选模式
 @property (weak, nonatomic) IBOutlet UITextField *columnNumberTF;
+@property (weak, nonatomic) IBOutlet UISwitch *allowCropSwitch;
+@property (weak, nonatomic) IBOutlet UISwitch *needCircleCropSwitch;
 @end
 
 @implementation ViewController
@@ -82,7 +85,7 @@
     layout.itemSize = CGSizeMake(_itemWH, _itemWH);
     layout.minimumInteritemSpacing = _margin;
     layout.minimumLineSpacing = _margin;
-    _collectionView = [[UICollectionView alloc] initWithFrame:CGRectMake(0, 344, self.view.tz_width, self.view.tz_height - 344) collectionViewLayout:layout];
+    _collectionView = [[UICollectionView alloc] initWithFrame:CGRectMake(0, 374, self.view.tz_width, self.view.tz_height - 374) collectionViewLayout:layout];
     CGFloat rgb = 244 / 255.0;
     _collectionView.alwaysBounceVertical = YES;
     _collectionView.backgroundColor = [UIColor colorWithRed:rgb green:rgb blue:rgb alpha:1.0];
@@ -222,8 +225,8 @@
     /// 5. Single selection mode, valid when maxImagesCount = 1
     /// 5. 单选模式,maxImagesCount为1时才生效
     imagePickerVc.showSelectBtn = NO;
-    imagePickerVc.allowCrop = YES;
-    imagePickerVc.needCircleCrop = YES;
+    imagePickerVc.allowCrop = self.allowCropSwitch.isOn;
+    imagePickerVc.needCircleCrop = self.needCircleCropSwitch.isOn;
     imagePickerVc.circleCropRadius = 100;
     /*
     [imagePickerVc setCropViewSettingBlock:^(UIView *cropView) {
@@ -276,7 +279,7 @@
     [picker dismissViewControllerAnimated:YES completion:nil];
     NSString *type = [info objectForKey:UIImagePickerControllerMediaType];
     if ([type isEqualToString:@"public.image"]) {
-        TZImagePickerController *tzImagePickerVc = [[TZImagePickerController alloc] initWithMaxImagesCount:9 delegate:self];
+        TZImagePickerController *tzImagePickerVc = [[TZImagePickerController alloc] initWithMaxImagesCount:1 delegate:self];
         tzImagePickerVc.sortAscendingByModificationDate = self.sortAscendingSwitch.isOn;
         [tzImagePickerVc showProgressHUD];
         UIImage *image = [info objectForKey:UIImagePickerControllerOriginalImage];
@@ -293,9 +296,16 @@
                         if (tzImagePickerVc.sortAscendingByModificationDate) {
                             assetModel = [models lastObject];
                         }
-                        [_selectedAssets addObject:assetModel.asset];
-                        [_selectedPhotos addObject:image];
-                        [_collectionView reloadData];
+                        if (self.allowCropSwitch.isOn) { // 允许裁剪,去裁剪
+                            TZImagePickerController *imagePicker = [[TZImagePickerController alloc] initCropTypeWithAsset:assetModel.asset photo:image completion:^(UIImage *cropImage, id asset) {
+                                [self refreshCollectionViewWithAddedAsset:asset image:cropImage];
+                            }];
+                            imagePicker.needCircleCrop = self.needCircleCropSwitch.isOn;
+                            imagePicker.circleCropRadius = 100;
+                            [self presentViewController:imagePicker animated:YES completion:nil];
+                        } else {
+                            [self refreshCollectionViewWithAddedAsset:assetModel.asset image:image];
+                        }
                     }];
                 }];
             }
@@ -303,6 +313,12 @@
     }
 }
 
+- (void)refreshCollectionViewWithAddedAsset:(id)asset image:(UIImage *)image {
+    [_selectedAssets addObject:asset];
+    [_selectedPhotos addObject:image];
+    [_collectionView reloadData];
+}
+
 - (void)imagePickerControllerDidCancel:(UIImagePickerController *)picker {
     if ([picker isKindOfClass:[UIImagePickerController class]]) {
         [picker dismissViewControllerAnimated:YES completion:nil];
@@ -435,6 +451,21 @@
     }
 }
 
+- (IBAction)allowCropSwitchClick:(UISwitch *)sender {
+    if (sender.isOn) {
+        self.maxCountTF.text = @"1";
+    } else {
+        [self.needCircleCropSwitch setOn:NO animated:YES];
+    }
+}
+
+- (IBAction)needCircleCropSwitchClick:(UISwitch *)sender {
+    if (sender.isOn) {
+        [self.allowCropSwitch setOn:YES animated:YES];
+        self.maxCountTF.text = @"1";
+    }
+}
+
 - (void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event {
     [self.view endEditing:YES];
 }