1.6.8版本 新增最小必选张数、直接停留在相册列表页、完成按钮一直可点三个属性

TZImagePickerController.podspec

 Pod::Spec.new do |s|
   s.name         = "TZImagePickerController"
-  s.version      = "1.6.6"
+  s.version      = "1.6.8"
   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.6.6" }
+  s.source       = { :git => "https://github.com/banchichen/TZImagePickerController.git", :tag => "1.6.8" }
   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.6.7</string>
+	<string>1.6.8</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

TZImagePickerController/TZImagePickerController/TZImagePickerController.bundle/en.lproj/Localizable.strings

 "OK" = "OK";

TZImagePickerController/TZImagePickerController/TZImagePickerController.bundle/zh-Hans.lproj/Localizable.strings

 "OK" = "确定";

TZImagePickerController/TZImagePickerController/TZImagePickerController.h

@@ -4,7 +4,7 @@
 //
 //  Created by 谭真 on 15/12/24.
 //  Copyright © 2015年 谭真. All rights reserved.
-//  version 1.6.7 - 2016.09.23
+//  version 1.6.8 - 2016.10.08
 
 /*
  经过测试，比起xib的方式，把TZAssetCell改用纯代码的方式来写，滑动帧数明显提高了（约提高10帧左右）
@@ -30,12 +30,21 @@
 /// Use this init method / 用这个初始化方法
 - (instancetype)initWithMaxImagesCount:(NSInteger)maxImagesCount delegate:(id<TZImagePickerControllerDelegate>)delegate;
 - (instancetype)initWithMaxImagesCount:(NSInteger)maxImagesCount columnNumber:(NSInteger)columnNumber delegate:(id<TZImagePickerControllerDelegate>)delegate;
+- (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;
 
 /// Default is 9 / 默认最大可选9张图片
 @property (nonatomic, assign) NSInteger maxImagesCount;
 
+/// The minimum count photos user must pick, Default is 0
+/// 最小照片必选张数,默认是0
+@property (nonatomic, assign) NSInteger minImagesCount;
+
+/// Always enale the done button, not require minimum 1 photo be picked
+/// 让完成按钮一直可以点击，无须最少选择一张图片
+@property (nonatomic, assign) BOOL alwaysEnableDoneBtn;
+
 /// Sort photos ascending by modificationDate，Default is YES
 /// 对照片排序，按修改时间升序，默认是YES。如果设置为NO,最新的照片会显示在最前面，内部的拍照按钮会排在第一个
 @property (nonatomic, assign) BOOL sortAscendingByModificationDate;

TZImagePickerController/TZImagePickerController/TZImagePickerController.m

@@ -4,7 +4,7 @@
 //
 //  Created by 谭真 on 15/12/24.
 //  Copyright © 2015年 谭真. All rights reserved.
-//  version 1.6.7 - 2016.09.23
+//  version 1.6.8 - 2016.10.08
 
 #import "TZImagePickerController.h"
 #import "TZPhotoPickerController.h"
@@ -18,7 +18,8 @@
     NSTimer *_timer;
     UILabel *_tipLable;
     UIButton *_settingBtn;
-    BOOL _pushToPhotoPickerVc;
+    BOOL _pushPhotoPickerVc;
+    BOOL _didPushPhotoPickerVc;
     
     UIButton *_progressHUD;
     UIView *_HUDContainer;
@@ -95,10 +96,15 @@
 }
 
 - (instancetype)initWithMaxImagesCount:(NSInteger)maxImagesCount delegate:(id<TZImagePickerControllerDelegate>)delegate {
-    return [self initWithMaxImagesCount:maxImagesCount columnNumber:4 delegate:delegate];
+    return [self initWithMaxImagesCount:maxImagesCount columnNumber:4 delegate:delegate pushPhotoPickerVc:YES];
 }
 
 - (instancetype)initWithMaxImagesCount:(NSInteger)maxImagesCount columnNumber:(NSInteger)columnNumber delegate:(id<TZImagePickerControllerDelegate>)delegate {
+    return [self initWithMaxImagesCount:maxImagesCount columnNumber:columnNumber delegate:delegate pushPhotoPickerVc:YES];
+}
+
+- (instancetype)initWithMaxImagesCount:(NSInteger)maxImagesCount columnNumber:(NSInteger)columnNumber delegate:(id<TZImagePickerControllerDelegate>)delegate pushPhotoPickerVc:(BOOL)pushPhotoPickerVc {
+    _pushPhotoPickerVc = pushPhotoPickerVc;
     TZAlbumPickerController *albumPickerVc = [[TZAlbumPickerController alloc] init];
     albumPickerVc.columnNumber = columnNumber;
     self = [super initWithRootViewController:albumPickerVc];
@@ -145,7 +151,7 @@
             
             _timer = [NSTimer scheduledTimerWithTimeInterval:0.2 target:self selector:@selector(observeAuthrizationStatusChange) userInfo:nil repeats:YES];
         } else {
-            [self pushToPhotoPickerVc];
+            [self pushPhotoPickerVc];
         }
     }
     return self;
@@ -190,7 +196,6 @@
 
 - (void)observeAuthrizationStatusChange {
     if ([[TZImageManager manager] authorizationStatusAuthorized]) {
-        [self pushToPhotoPickerVc];
         [_tipLable removeFromSuperview];
         [_settingBtn removeFromSuperview];
         [_timer invalidate];
@@ -198,16 +203,17 @@
     }
 }
 
-- (void)pushToPhotoPickerVc {
-    _pushToPhotoPickerVc = YES;
-    if (_pushToPhotoPickerVc) {
+- (void)pushPhotoPickerVc {
+    _didPushPhotoPickerVc = NO;
+    // 1.6.8 判断是否需要push到照片选择页，如果_pushPhotoPickerVc为NO,则不push
+    if (!_didPushPhotoPickerVc && _pushPhotoPickerVc) {
         TZPhotoPickerController *photoPickerVc = [[TZPhotoPickerController alloc] init];
         photoPickerVc.isFirstAppear = YES;
         photoPickerVc.columnNumber = self.columnNumber;
         [[TZImageManager manager] getCameraRollAlbum:self.allowPickingVideo allowPickingImage:self.allowPickingImage completion:^(TZAlbumModel *model) {
             photoPickerVc.model = model;
             [self pushViewController:photoPickerVc animated:YES];
-            _pushToPhotoPickerVc = NO;
+            _didPushPhotoPickerVc = YES;
         }];
     }
 }

TZImagePickerController/TZImagePickerController/TZPhotoPickerController.m

@@ -212,7 +212,7 @@ static CGSize AssetGridThumbnailSize;
     [_okButton setTitle:[NSBundle tz_localizedStringForKey:@"Done"] forState:UIControlStateDisabled];
     [_okButton setTitleColor:tzImagePickerVc.oKButtonTitleColorNormal forState:UIControlStateNormal];
     [_okButton setTitleColor:tzImagePickerVc.oKButtonTitleColorDisabled forState:UIControlStateDisabled];
-    _okButton.enabled = tzImagePickerVc.selectedModels.count;
+    _okButton.enabled = tzImagePickerVc.selectedModels.count || tzImagePickerVc.alwaysEnableDoneBtn;
     
     _numberImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamedFromMyBundle:tzImagePickerVc.photoNumberIconImageName]];
     _numberImageView.frame = CGRectMake(self.view.tz_width - 56 - 28, 10, 30, 30);
@@ -272,6 +272,13 @@ static CGSize AssetGridThumbnailSize;
 
 - (void)okButtonClick {
     TZImagePickerController *tzImagePickerVc = (TZImagePickerController *)self.navigationController;
+    // 1.6.8 判断是否满足最小必选张数的限制
+    if (tzImagePickerVc.minImagesCount && tzImagePickerVc.selectedModels.count < tzImagePickerVc.minImagesCount) {
+        NSString *title = [NSString stringWithFormat:[NSBundle tz_localizedStringForKey:@"Select a minimum of %zd photos"], tzImagePickerVc.minImagesCount];
+        [tzImagePickerVc showAlertWithTitle:title];
+        return;
+    }
+    
     [tzImagePickerVc showProgressHUD];
     NSMutableArray *photos = [NSMutableArray array];
     NSMutableArray *assets = [NSMutableArray array];
@@ -292,25 +299,33 @@ static CGSize AssetGridThumbnailSize;
 
             for (id item in photos) { if ([item isKindOfClass:[NSNumber class]]) return; }
             
-            if ([tzImagePickerVc.pickerDelegate respondsToSelector:@selector(imagePickerController:didFinishPickingPhotos:sourceAssets:isSelectOriginalPhoto:)]) {
-                [tzImagePickerVc.pickerDelegate imagePickerController:tzImagePickerVc didFinishPickingPhotos:photos sourceAssets:assets isSelectOriginalPhoto:_isSelectOriginalPhoto];
-            }
-            if ([tzImagePickerVc.pickerDelegate respondsToSelector:@selector(imagePickerController:didFinishPickingPhotos:sourceAssets:isSelectOriginalPhoto:infos:)]) {
-                [tzImagePickerVc.pickerDelegate imagePickerController:tzImagePickerVc didFinishPickingPhotos:photos sourceAssets:assets isSelectOriginalPhoto:_isSelectOriginalPhoto infos:infoArr];
-            }
-            if (tzImagePickerVc.didFinishPickingPhotosHandle) {
-                tzImagePickerVc.didFinishPickingPhotosHandle(photos,assets,_isSelectOriginalPhoto);
-            }
-            if (tzImagePickerVc.didFinishPickingPhotosWithInfosHandle) {
-                tzImagePickerVc.didFinishPickingPhotosWithInfosHandle(photos,assets,_isSelectOriginalPhoto,infoArr);
-            }
-            [tzImagePickerVc hideProgressHUD];
-
-            if (tzImagePickerVc.autoDismiss) {
-                [self.navigationController dismissViewControllerAnimated:YES completion:nil];
-            }
+            [self didGetAllPhotos:photos assets:assets infoArr:infoArr];
         }];
     }
+    if (tzImagePickerVc.selectedModels.count <= 0) {
+        [self didGetAllPhotos:photos assets:assets infoArr:infoArr];
+    }
+}
+
+- (void)didGetAllPhotos:(NSArray *)photos assets:(NSArray *)assets infoArr:(NSArray *)infoArr{
+    TZImagePickerController *tzImagePickerVc = (TZImagePickerController *)self.navigationController;
+    if ([tzImagePickerVc.pickerDelegate respondsToSelector:@selector(imagePickerController:didFinishPickingPhotos:sourceAssets:isSelectOriginalPhoto:)]) {
+        [tzImagePickerVc.pickerDelegate imagePickerController:tzImagePickerVc didFinishPickingPhotos:photos sourceAssets:assets isSelectOriginalPhoto:_isSelectOriginalPhoto];
+    }
+    if ([tzImagePickerVc.pickerDelegate respondsToSelector:@selector(imagePickerController:didFinishPickingPhotos:sourceAssets:isSelectOriginalPhoto:infos:)]) {
+        [tzImagePickerVc.pickerDelegate imagePickerController:tzImagePickerVc didFinishPickingPhotos:photos sourceAssets:assets isSelectOriginalPhoto:_isSelectOriginalPhoto infos:infoArr];
+    }
+    if (tzImagePickerVc.didFinishPickingPhotosHandle) {
+        tzImagePickerVc.didFinishPickingPhotosHandle(photos,assets,_isSelectOriginalPhoto);
+    }
+    if (tzImagePickerVc.didFinishPickingPhotosWithInfosHandle) {
+        tzImagePickerVc.didFinishPickingPhotosWithInfosHandle(photos,assets,_isSelectOriginalPhoto,infoArr);
+    }
+    [tzImagePickerVc hideProgressHUD];
+    
+    if (tzImagePickerVc.autoDismiss) {
+        [self.navigationController dismissViewControllerAnimated:YES completion:nil];
+    }
 }
 
 #pragma mark - UICollectionViewDataSource && Delegate
@@ -446,16 +461,16 @@ static CGSize AssetGridThumbnailSize;
 }
 
 - (void)refreshBottomToolBarStatus {
-    TZImagePickerController *imagePickerVc = (TZImagePickerController *)self.navigationController;
+    TZImagePickerController *tzImagePickerVc = (TZImagePickerController *)self.navigationController;
     
-    _previewButton.enabled = imagePickerVc.selectedModels.count > 0;
-    _okButton.enabled = imagePickerVc.selectedModels.count > 0;
+    _previewButton.enabled = tzImagePickerVc.selectedModels.count > 0;
+    _okButton.enabled = tzImagePickerVc.selectedModels.count > 0 || tzImagePickerVc.alwaysEnableDoneBtn;
     
-    _numberImageView.hidden = imagePickerVc.selectedModels.count <= 0;
-    _numberLable.hidden = imagePickerVc.selectedModels.count <= 0;
-    _numberLable.text = [NSString stringWithFormat:@"%zd",imagePickerVc.selectedModels.count];
+    _numberImageView.hidden = tzImagePickerVc.selectedModels.count <= 0;
+    _numberLable.hidden = tzImagePickerVc.selectedModels.count <= 0;
+    _numberLable.text = [NSString stringWithFormat:@"%zd",tzImagePickerVc.selectedModels.count];
     
-    _originalPhotoButton.enabled = imagePickerVc.selectedModels.count > 0;
+    _originalPhotoButton.enabled = tzImagePickerVc.selectedModels.count > 0;
     _originalPhotoButton.selected = (_isSelectOriginalPhoto && _originalPhotoButton.enabled);
     _originalPhotoLable.hidden = (!_originalPhotoButton.isSelected);
     if (_isSelectOriginalPhoto) [self getSelectedPhotoBytes];

TZImagePickerController/TZImagePickerController/TZPhotoPreviewController.m

@@ -250,7 +250,7 @@
 - (void)okButtonClick {
     TZImagePickerController *_tzImagePickerVc = (TZImagePickerController *)self.navigationController;
     // 如果没有选中过照片 点击确定时选中当前预览的照片
-    if (_tzImagePickerVc.selectedModels.count == 0) {
+    if (_tzImagePickerVc.selectedModels.count == 0 && _tzImagePickerVc.minImagesCount <= 0) {
         TZAssetModel *model = _models[_currentIndex];
         [_tzImagePickerVc.selectedModels addObject:model];
     }

TZImagePickerController/ViewController.m

@@ -193,7 +193,7 @@
     if (self.maxCountTF.text.integerValue <= 0) {
         return;
     }
-    TZImagePickerController *imagePickerVc = [[TZImagePickerController alloc] initWithMaxImagesCount:self.maxCountTF.text.integerValue columnNumber:self.columnNumberTF.text.integerValue delegate:self];
+    TZImagePickerController *imagePickerVc = [[TZImagePickerController alloc] initWithMaxImagesCount:self.maxCountTF.text.integerValue columnNumber:self.columnNumberTF.text.integerValue delegate:self pushPhotoPickerVc:YES];
     
 
 #pragma mark - 四类个性化设置，这些参数都可以不传，此时会走默认设置
@@ -219,6 +219,9 @@
     
     // 4. 照片排列按修改时间升序
     imagePickerVc.sortAscendingByModificationDate = self.sortAscendingSwitch.isOn;
+    
+    imagePickerVc.minImagesCount = 3;
+    imagePickerVc.alwaysEnableDoneBtn = YES;
 #pragma mark - 到这里为止
     
     // You can get the photos by block, the same as by delegate.