加入拍照功能；优化显示效果，可全局显示已选中的图片，切换相册亦可，设置selectedAssets即可显示上次已选中的图片。

TZImagePickerController/TZImagePickerController/TZAssetCell.h

@@ -18,7 +18,7 @@ typedef enum : NSUInteger {
 @class TZAssetModel;
 @interface TZAssetCell : UICollectionViewCell
 
-@property (weak, nonatomic) IBOutlet UIButton *selectPhotoButton;
+@property (weak, nonatomic) UIButton *selectPhotoButton;
 @property (nonatomic, strong) TZAssetModel *model;
 @property (nonatomic, copy) void (^didSelectPhotoBlock)(BOOL);
 @property (nonatomic, assign) TZAssetCellType type;
@@ -31,5 +31,13 @@ typedef enum : NSUInteger {
 @interface TZAlbumCell : UITableViewCell
 
 @property (nonatomic, strong) TZAlbumModel *model;
+@property (weak, nonatomic) UIButton *selectedCountButton;
+
+@end
+
+
+@interface TZAssetCameraCell : UICollectionViewCell
+
+@property (nonatomic, strong) UIImageView *imageView;
 
 @end
\ No newline at end of file

TZImagePickerController/TZImagePickerController/TZAssetCell.m

@@ -169,11 +169,18 @@
     [[TZImageManager manager] getPostImageWithAlbumModel:model completion:^(UIImage *postImage) {
         self.posterImageView.image = postImage;
     }];
+    if (model.selectedCount) {
+        self.selectedCountButton.hidden = NO;
+        [self.selectedCountButton setTitle:[NSString stringWithFormat:@"%zd",model.selectedCount] forState:UIControlStateNormal];
+    } else {
+        self.selectedCountButton.hidden = YES;
+    }
 }
 
 /// For fitting iOS6
 - (void)layoutSubviews {
     if (iOS7Later) [super layoutSubviews];
+    _selectedCountButton.frame = CGRectMake(self.tz_width - 24 - 30, 23, 24, 24);
 }
 
 - (void)layoutSublayersOfLayer:(CALayer *)layer {
@@ -219,4 +226,42 @@
     return _arrowImageView;
 }
 
+- (UIButton *)selectedCountButton {
+    if (_selectedCountButton == nil) {
+        UIButton *selectedCountButton = [[UIButton alloc] init];
+        selectedCountButton.layer.cornerRadius = 12;
+        selectedCountButton.clipsToBounds = YES;
+        selectedCountButton.backgroundColor = [UIColor redColor];
+        [selectedCountButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
+        selectedCountButton.titleLabel.font = [UIFont systemFontOfSize:15];
+        [self.contentView addSubview:selectedCountButton];
+        _selectedCountButton = selectedCountButton;
+    }
+    return _selectedCountButton;
+}
+
+@end
+
+
+
+@implementation TZAssetCameraCell
+
+- (instancetype)initWithFrame:(CGRect)frame {
+    self = [super initWithFrame:frame];
+    if (self) {
+        self.backgroundColor = [UIColor whiteColor];
+        _imageView = [[UIImageView alloc] init];
+        _imageView.backgroundColor = [UIColor colorWithWhite:1.000 alpha:0.500];
+        _imageView.contentMode = UIViewContentModeScaleAspectFill;
+        [self addSubview:_imageView];
+        self.clipsToBounds = YES;
+    }
+    return self;
+}
+
+- (void)layoutSubviews {
+    [super layoutSubviews];
+    _imageView.frame = self.bounds;
+}
+
 @end

TZImagePickerController/TZImagePickerController/TZAssetModel.h

@@ -39,4 +39,7 @@ typedef enum : NSUInteger {
 @property (nonatomic, assign) NSInteger count;       ///< Count of photos the album contain
 @property (nonatomic, strong) id result;             ///< PHFetchResult<PHAsset> or ALAssetsGroup<ALAsset>
 
+@property (nonatomic, strong) NSArray *models;
+@property (nonatomic, strong) NSArray *selectedModels;
+@property (nonatomic, assign) NSUInteger selectedCount;
 @end
\ No newline at end of file

TZImagePickerController/TZImagePickerController/TZAssetModel.m

@@ -7,6 +7,7 @@
 //
 
 #import "TZAssetModel.h"
+#import "TZImageManager.h"
 
 @implementation TZAssetModel
 
@@ -30,5 +31,36 @@
 
 @implementation TZAlbumModel
 
+- (void)setResult:(id)result {
+    _result = result;
+    BOOL allowPickingImage = [[[NSUserDefaults standardUserDefaults] objectForKey:@"tz_allowPickingImage"] isEqualToString:@"1"];
+    BOOL allowPickingVideo = [[[NSUserDefaults standardUserDefaults] objectForKey:@"tz_allowPickingVideo"] isEqualToString:@"1"];
+    [[TZImageManager manager] getAssetsFromFetchResult:result allowPickingVideo:allowPickingVideo allowPickingImage:allowPickingImage completion:^(NSArray<TZAssetModel *> *models) {
+        _models = models;
+        if (_selectedModels) {
+            [self checkSelectedModels];
+        }
+    }];
+}
+
+- (void)setSelectedModels:(NSArray *)selectedModels {
+    _selectedModels = selectedModels;
+    if (_models) {
+        [self checkSelectedModels];
+    }
+}
+
+- (void)checkSelectedModels {
+    self.selectedCount = 0;
+    NSMutableArray *selectedAssets = [NSMutableArray array];
+    for (TZAssetModel *model in _selectedModels) {
+        [selectedAssets addObject:model.asset];
+    }
+    for (TZAssetModel *model in _models) {
+        if ([selectedAssets containsObject:model.asset]) {
+            self.selectedCount ++;
+        }
+    }
+}
 
 @end
\ No newline at end of file

TZImagePickerController/TZImagePickerController/TZImageManager.m

@@ -54,8 +54,6 @@
                                                     PHAssetMediaTypeVideo];
         option.sortDescriptors = @[[NSSortDescriptor sortDescriptorWithKey:@"creationDate" ascending:YES]];
         
-        
-        
         PHFetchResult *smartAlbums = [PHAssetCollection fetchAssetCollectionsWithType:PHAssetCollectionTypeSmartAlbum subtype:PHAssetCollectionSubtypeSmartAlbumUserLibrary options:nil];
         for (PHAssetCollection *collection in smartAlbums) {
             if ([collection.localizedTitle isEqualToString:@"Camera Roll"] || [collection.localizedTitle isEqualToString:@"相机胶卷"]) {

TZImagePickerController/TZImagePickerController/TZImagePickerController.h

@@ -16,6 +16,7 @@
  */
 
 #import <UIKit/UIKit.h>
+#import "TZAssetModel.h"
 
 #define iOS7Later ([UIDevice currentDevice].systemVersion.floatValue >= 7.0f)
 #define iOS8Later ([UIDevice currentDevice].systemVersion.floatValue >= 8.0f)
@@ -50,20 +51,30 @@
 /// 默认为YES，如果设置为NO,用户将不能选择发送图片
 @property(nonatomic, assign) BOOL allowPickingImage;
 
+/// The photos user have selected
+/// 用户选中过的图片数组
+@property (nonatomic, strong) NSArray *selectedAssets;
+@property (nonatomic, strong) NSMutableArray<TZAssetModel *> *selectedModels;
+
 - (void)showAlertWithTitle:(NSString *)title;
 - (void)showProgressHUD;
 - (void)hideProgressHUD;
+@property (nonatomic, assign) BOOL isSelectOriginalPhoto;
 
 /// Appearance / 外观颜色
 @property (nonatomic, strong) UIColor *oKButtonTitleColorNormal;
 @property (nonatomic, strong) UIColor *oKButtonTitleColorDisabled;
 
 // The picker should dismiss itself; when it dismissed these handle will be called.
-// The second array will be a empty array if user not picking original photo.
+// If isOriginalPhoto is YES, user picked the original photo.
+// You can get original photo with asset, by the method [[TZImageManager manager] getOriginalPhotoWithAsset:completion:].
+// The UIImage Object in photos default width is 828px, you can set it by photoWidth property.
 // 这个照片选择器会自己dismiss，当选择器dismiss的时候，会执行下面的handle
-// 如果用户没有选择发送原图,第二个数组将是空数组
-@property (nonatomic, copy) void (^didFinishPickingPhotosHandle)(NSArray<UIImage *> *photos,NSArray *assets);
-@property (nonatomic, copy) void (^didFinishPickingPhotosWithInfosHandle)(NSArray<UIImage *> *photos,NSArray *assets,NSArray<NSDictionary *> *infos);
+// 如果isSelectOriginalPhoto为YES，表明用户选择了原图
+// 你可以通过一个asset获得原图，通过这个方法：[[TZImageManager manager] getOriginalPhotoWithAsset:completion:]
+// photos数组里的UIImage对象，默认是828像素宽，你可以通过设置photoWidth属性的值来改变它
+@property (nonatomic, copy) void (^didFinishPickingPhotosHandle)(NSArray<UIImage *> *photos,NSArray *assets,BOOL isSelectOriginalPhoto);
+@property (nonatomic, copy) void (^didFinishPickingPhotosWithInfosHandle)(NSArray<UIImage *> *photos,NSArray *assets,BOOL isSelectOriginalPhoto,NSArray<NSDictionary *> *infos);
 @property (nonatomic, copy) void (^imagePickerControllerDidCancelHandle)();
 // If user picking a video, this handle will be called.
 // If system version > iOS8,asset is kind of PHAsset class, else is ALAsset class.
@@ -79,11 +90,15 @@
 @protocol TZImagePickerControllerDelegate <NSObject>
 @optional
 // The picker should dismiss itself; when it dismissed these handle will be called.
-// Assets will be a empty array if user not picking original photo.
-// 这个照片选择器会自己dismiss，当选择器dismiss的时候，会执行下面的回调
-// 如果用户没有选择发送原图,Assets将是空数组
-- (void)imagePickerController:(TZImagePickerController *)picker didFinishPickingPhotos:(NSArray<UIImage *> *)photos sourceAssets:(NSArray *)assets;
-- (void)imagePickerController:(TZImagePickerController *)picker didFinishPickingPhotos:(NSArray<UIImage *> *)photos sourceAssets:(NSArray *)assets infos:(NSArray<NSDictionary *> *)infos;
+// If isOriginalPhoto is YES, user picked the original photo.
+// You can get original photo with asset, by the method [[TZImageManager manager] getOriginalPhotoWithAsset:completion:].
+// The UIImage Object in photos default width is 828px, you can set it by photoWidth property.
+// 这个照片选择器会自己dismiss，当选择器dismiss的时候，会执行下面的handle
+// 如果isSelectOriginalPhoto为YES，表明用户选择了原图
+// 你可以通过一个asset获得原图，通过这个方法：[[TZImageManager manager] getOriginalPhotoWithAsset:completion:]
+// photos数组里的UIImage对象，默认是828像素宽，你可以通过设置photoWidth属性的值来改变它
+- (void)imagePickerController:(TZImagePickerController *)picker didFinishPickingPhotos:(NSArray<UIImage *> *)photos sourceAssets:(NSArray *)assets isSelectOriginalPhoto:(BOOL)isSelectOriginalPhoto;
+- (void)imagePickerController:(TZImagePickerController *)picker didFinishPickingPhotos:(NSArray<UIImage *> *)photos sourceAssets:(NSArray *)assets isSelectOriginalPhoto:(BOOL)isSelectOriginalPhoto infos:(NSArray<NSDictionary *> *)infos;
 - (void)imagePickerControllerDidCancel:(TZImagePickerController *)picker;
 // If user picking a video, this callback will be called.
 // If system version > iOS8,asset is kind of PHAsset class, else is ALAsset class.

TZImagePickerController/TZImagePickerController/TZImagePickerController.m

@@ -78,13 +78,15 @@
     if (self) {
         self.maxImagesCount = maxImagesCount > 0 ? maxImagesCount : 9; // Default is 9 / 默认最大可选9张图片
         self.pickerDelegate = delegate;
+        self.selectedModels = [NSMutableArray array];
+        
         // Allow user picking original photo and video, you also can set No after this method
         // 默认准许用户选择原图和视频, 你也可以在这个方法后置为NO
-        _allowPickingOriginalPhoto = YES;
-        _allowPickingVideo = YES;
-        _allowPickingImage = YES;
-        _timeout = 15;
-        _photoWidth = 828.0;
+        self.allowPickingOriginalPhoto = YES;
+        self.allowPickingVideo = YES;
+        self.allowPickingImage = YES;
+        self.timeout = 15;
+        self.photoWidth = 828.0;
         
         if (![[TZImageManager manager] authorizationStatusAuthorized]) {
             _tipLable = [[UILabel alloc] init];
@@ -188,6 +190,30 @@
     }
 }
 
+- (void)setSelectedAssets:(NSArray *)selectedAssets {
+    _selectedAssets = selectedAssets;
+    _selectedModels = [NSMutableArray array];
+    for (id asset in selectedAssets) {
+        TZAssetModel *model = [TZAssetModel modelWithAsset:asset type:TZAssetModelMediaTypePhoto];
+        model.isSelected = YES;
+        [_selectedModels addObject:model];
+    }
+}
+
+- (void)setAllowPickingImage:(BOOL)allowPickingImage {
+    _allowPickingImage = allowPickingImage;
+    NSString *allowPickingImageStr = _allowPickingImage ? @"1" : @"0";
+    [[NSUserDefaults standardUserDefaults] setObject:allowPickingImageStr forKey:@"tz_allowPickingImage"];
+    [[NSUserDefaults standardUserDefaults] synchronize];
+}
+
+- (void)setAllowPickingVideo:(BOOL)allowPickingVideo {
+    _allowPickingVideo = allowPickingVideo;
+    NSString *allowPickingVideoStr = _allowPickingVideo ? @"1" : @"0";
+    [[NSUserDefaults standardUserDefaults] setObject:allowPickingVideoStr forKey:@"tz_allowPickingVideo"];
+    [[NSUserDefaults standardUserDefaults] synchronize];
+}
+
 - (void)pushViewController:(UIViewController *)viewController animated:(BOOL)animated {
     if (iOS7Later) viewController.automaticallyAdjustsScrollViewInsets = NO;
     if (_timer) { [_timer invalidate]; _timer = nil;}
@@ -228,15 +254,24 @@
     [super viewWillAppear:animated];
     TZImagePickerController *imagePickerVc = (TZImagePickerController *)self.navigationController;
     [imagePickerVc hideProgressHUD];
-    if (_albumArr) return;
+    if (_albumArr) {
+        for (TZAlbumModel *albumModel in _albumArr) {
+            albumModel.selectedModels = imagePickerVc.selectedModels;
+        }
+        [_tableView reloadData];
+    } else {
         [self configTableView];
+    }
 }
 
 - (void)configTableView {
     TZImagePickerController *imagePickerVc = (TZImagePickerController *)self.navigationController;
     [[TZImageManager manager] getAllAlbums:imagePickerVc.allowPickingVideo allowPickingImage:imagePickerVc.allowPickingImage completion:^(NSArray<TZAlbumModel *> *models) {
         _albumArr = [NSMutableArray arrayWithArray:models];
-        
+        for (TZAlbumModel *albumModel in _albumArr) {
+            albumModel.selectedModels = imagePickerVc.selectedModels;
+        }
+        if (!_tableView) {
             CGFloat top = 44;
             if (iOS7Later) top += 20;
             _tableView = [[UITableView alloc] initWithFrame:CGRectMake(0, top, self.view.tz_width, self.view.tz_height - top) style:UITableViewStylePlain];
@@ -246,6 +281,9 @@
             _tableView.delegate = self;
             [_tableView registerClass:[TZAlbumCell class] forCellReuseIdentifier:@"TZAlbumCell"];
             [self.view addSubview:_tableView];
+        } else {
+            [_tableView reloadData];
+        }
     }];
 }
 
@@ -270,13 +308,20 @@
 
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
     TZAlbumCell *cell = [tableView dequeueReusableCellWithIdentifier:@"TZAlbumCell"];
+    TZImagePickerController *imagePickerVc = (TZImagePickerController *)self.navigationController;
+    cell.selectedCountButton.backgroundColor = imagePickerVc.oKButtonTitleColorNormal;
     cell.model = _albumArr[indexPath.row];
+    cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
     return cell;
 }
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
     TZPhotoPickerController *photoPickerVc = [[TZPhotoPickerController alloc] init];
-    photoPickerVc.model = _albumArr[indexPath.row];
+    TZAlbumModel *model = _albumArr[indexPath.row];
+    photoPickerVc.model = model;
+    [photoPickerVc setBackButtonClickHandle:^(TZAlbumModel *model) {
+        [_albumArr replaceObjectAtIndex:indexPath.row withObject:model];
+    }];
     [self.navigationController pushViewController:photoPickerVc animated:YES];
     [tableView deselectRowAtIndexPath:indexPath animated:NO];
 }

TZImagePickerController/TZImagePickerController/TZPhotoPickerController.h

@@ -12,5 +12,6 @@
 @interface TZPhotoPickerController : UIViewController
 
 @property (nonatomic, strong) TZAlbumModel *model;
+@property (nonatomic, copy) void (^backButtonClickHandle)(TZAlbumModel *model);
 
 @end

TZImagePickerController/TZImagePickerController/TZPhotoPickerController.m

@@ -15,7 +15,7 @@
 #import "TZImageManager.h"
 #import "TZVideoPlayerController.h"
 
-@interface TZPhotoPickerController ()<UICollectionViewDataSource,UICollectionViewDelegate> {
+@interface TZPhotoPickerController ()<UICollectionViewDataSource,UICollectionViewDelegate,UIImagePickerControllerDelegate,UINavigationControllerDelegate> {
     UICollectionView *_collectionView;
     NSMutableArray *_photoArr;
     
@@ -29,34 +29,72 @@
     BOOL _isSelectOriginalPhoto;
     BOOL _shouldScrollToBottom;
 }
-@property (nonatomic, strong) NSMutableArray *selectedPhotoArr;
 @property CGRect previousPreheatRect;
+@property (nonatomic, strong) UIImagePickerController *imagePickerVc;
+@property (nonatomic, strong) TZImagePickerController *tzImagePickerVc;
 @end
 
 static CGSize AssetGridThumbnailSize;
 
 @implementation TZPhotoPickerController
 
-- (NSMutableArray *)selectedPhotoArr {
-    if (_selectedPhotoArr == nil) _selectedPhotoArr = [NSMutableArray array];
-    return _selectedPhotoArr;
+- (UIImagePickerController *)imagePickerVc {
+    if (_imagePickerVc == nil) {
+        _imagePickerVc = [[UIImagePickerController alloc] init];
+        _imagePickerVc.delegate = self;
+        _imagePickerVc.allowsEditing = YES;
+        // set appearance / 改变相册选择页的导航栏外观
+        _imagePickerVc.navigationBar.barTintColor = self.navigationController.navigationBar.barTintColor;
+        _imagePickerVc.navigationBar.tintColor = self.navigationController.navigationBar.tintColor;
+        UIBarButtonItem *tzBarItem, *BarItem;
+        if (iOS8Later) {
+            tzBarItem = [UIBarButtonItem appearanceWhenContainedIn:[TZImagePickerController class], nil];
+            BarItem = [UIBarButtonItem appearanceWhenContainedIn:[UIImagePickerController class], nil];
+        } else {
+            tzBarItem = [UIBarButtonItem appearanceWhenContainedInInstancesOfClasses:@[[TZImagePickerController class]]];
+            BarItem = [UIBarButtonItem appearanceWhenContainedInInstancesOfClasses:@[[UIImagePickerController class]]];
+        }
+        NSDictionary *titleTextAttributes = [tzBarItem titleTextAttributesForState:UIControlStateNormal];
+        [BarItem setTitleTextAttributes:titleTextAttributes forState:UIControlStateNormal];
+    }
+    return _imagePickerVc;
 }
 
 - (void)viewDidLoad {
     [super viewDidLoad];
+    __weak typeof(self) weakSelf = self;
+    _tzImagePickerVc = (TZImagePickerController *)weakSelf.navigationController;
+    _isSelectOriginalPhoto = _tzImagePickerVc.isSelectOriginalPhoto;
     _shouldScrollToBottom = YES;
     self.view.backgroundColor = [UIColor whiteColor];
     self.navigationItem.title = _model.name;
     self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:@"取消" style:UIBarButtonItemStylePlain target:self action:@selector(cancel)];
-    TZImagePickerController *imagePickerVc = (TZImagePickerController *)self.navigationController;
-    [[TZImageManager manager] getAssetsFromFetchResult:_model.result allowPickingVideo:imagePickerVc.allowPickingVideo allowPickingImage:imagePickerVc.allowPickingImage completion:^(NSArray<TZAssetModel *> *models) {
+    if ([_model.name isEqualToString:@"相机胶卷"] || [_model.name isEqualToString:@"Camera Roll"]) {
+        [[TZImageManager manager] getAssetsFromFetchResult:_model.result allowPickingVideo:_tzImagePickerVc.allowPickingVideo allowPickingImage:_tzImagePickerVc.allowPickingImage completion:^(NSArray<TZAssetModel *> *models) {
             _photoArr = [NSMutableArray arrayWithArray:models];
-        [self configCollectionView];
-        [self configBottomToolBar];
+            [self initSubviews];
         }];
+    } else {
+        _photoArr = [NSMutableArray arrayWithArray:_model.models];
+        [self initSubviews];
+    }
     // [self resetCachedAssets];
 }
 
+- (void)initSubviews {
+    [self checkSelectedModels];
+    [self configCollectionView];
+    [self configBottomToolBar];
+}
+
+- (void)viewWillDisappear:(BOOL)animated {
+    [super viewWillDisappear:animated];
+    _tzImagePickerVc.isSelectOriginalPhoto = _isSelectOriginalPhoto;
+    if (self.backButtonClickHandle) {
+        self.backButtonClickHandle(_model);
+    }
+}
+
 - (void)configCollectionView {
     UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init];
     CGFloat margin = 4;
@@ -73,17 +111,19 @@ static CGSize AssetGridThumbnailSize;
     _collectionView.alwaysBounceHorizontal = NO;
     if (iOS7Later) _collectionView.contentInset = UIEdgeInsetsMake(0, 0, 0, 2);
     _collectionView.scrollIndicatorInsets = UIEdgeInsetsMake(0, 0, 0, -2);
+    if ([_model.name isEqualToString:@"相机胶卷"] || [_model.name isEqualToString:@"Camera Roll"] ) {
+        _collectionView.contentSize = CGSizeMake(self.view.tz_width, ((_model.count + 4) / 4) * self.view.tz_width);
+    } else {
         _collectionView.contentSize = CGSizeMake(self.view.tz_width, ((_model.count + 3) / 4) * self.view.tz_width);
+    }
     [self.view addSubview:_collectionView];
     [_collectionView registerClass:[TZAssetCell class] forCellWithReuseIdentifier:@"TZAssetCell"];
+    [_collectionView registerClass:[TZAssetCameraCell class] forCellWithReuseIdentifier:@"TZAssetCameraCell"];
 }
 
 - (void)viewWillAppear:(BOOL)animated {
     [super viewWillAppear:animated];
-    if (_shouldScrollToBottom && _photoArr.count > 0) {
-        [_collectionView scrollToItemAtIndexPath:[NSIndexPath indexPathForItem:(_photoArr.count - 1) inSection:0] atScrollPosition:UICollectionViewScrollPositionBottom animated:NO];
-        _shouldScrollToBottom = NO;
-    }
+    [self scrollCollectionViewToBottom];
     // Determine the size of the thumbnails to request from the PHCachingImageManager
     CGFloat scale = [UIScreen mainScreen].scale;
     CGSize cellSize = ((UICollectionViewFlowLayout *)_collectionView.collectionViewLayout).itemSize;
@@ -110,10 +150,9 @@ static CGSize AssetGridThumbnailSize;
     [_previewButton setTitle:@"预览" forState:UIControlStateDisabled];
     [_previewButton setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
     [_previewButton setTitleColor:[UIColor lightGrayColor] forState:UIControlStateDisabled];
-    _previewButton.enabled = NO;
+    _previewButton.enabled = _tzImagePickerVc.selectedModels.count;
     
-    TZImagePickerController *imagePickerVc = (TZImagePickerController *)self.navigationController;
-    if (imagePickerVc.allowPickingOriginalPhoto) {
+    if (_tzImagePickerVc.allowPickingOriginalPhoto) {
         _originalPhotoButton = [UIButton buttonWithType:UIButtonTypeCustom];
         _originalPhotoButton.frame = CGRectMake(50, self.view.tz_height - 50, 130, 50);
         _originalPhotoButton.imageEdgeInsets = UIEdgeInsetsMake(0, -8, 0, 0);
@@ -126,7 +165,8 @@ static CGSize AssetGridThumbnailSize;
         [_originalPhotoButton setTitleColor:[UIColor blackColor] forState:UIControlStateSelected];
         [_originalPhotoButton setImage:[UIImage imageNamedFromMyBundle:@"photo_original_def.png"] forState:UIControlStateNormal];
         [_originalPhotoButton setImage:[UIImage imageNamedFromMyBundle:@"photo_original_sel.png"] forState:UIControlStateSelected];
-        _originalPhotoButton.enabled = _selectedPhotoArr.count > 0;
+        _originalPhotoButton.selected = _isSelectOriginalPhoto;
+        _originalPhotoButton.enabled = _tzImagePickerVc.selectedModels.count > 0;
         
         _originalPhotoLable = [[UILabel alloc] init];
         _originalPhotoLable.frame = CGRectMake(70, 0, 60, 50);
@@ -142,13 +182,13 @@ static CGSize AssetGridThumbnailSize;
     [_okButton addTarget:self action:@selector(okButtonClick) forControlEvents:UIControlEventTouchUpInside];
     [_okButton setTitle:@"确定" forState:UIControlStateNormal];
     [_okButton setTitle:@"确定" forState:UIControlStateDisabled];
-    [_okButton setTitleColor:imagePickerVc.oKButtonTitleColorNormal forState:UIControlStateNormal];
-    [_okButton setTitleColor:imagePickerVc.oKButtonTitleColorDisabled forState:UIControlStateDisabled];
-    _okButton.enabled = NO;
+    [_okButton setTitleColor:_tzImagePickerVc.oKButtonTitleColorNormal forState:UIControlStateNormal];
+    [_okButton setTitleColor:_tzImagePickerVc.oKButtonTitleColorDisabled forState:UIControlStateDisabled];
+    _okButton.enabled = _tzImagePickerVc.selectedModels.count;
     
     _numberImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamedFromMyBundle:@"photo_number_icon.png"]];
     _numberImageView.frame = CGRectMake(self.view.tz_width - 56 - 24, 12, 26, 26);
-    _numberImageView.hidden = _selectedPhotoArr.count <= 0;
+    _numberImageView.hidden = _tzImagePickerVc.selectedModels.count <= 0;
     _numberImageView.backgroundColor = [UIColor clearColor];
     
     _numberLable = [[UILabel alloc] init];
@@ -156,8 +196,8 @@ static CGSize AssetGridThumbnailSize;
     _numberLable.font = [UIFont systemFontOfSize:16];
     _numberLable.textColor = [UIColor whiteColor];
     _numberLable.textAlignment = NSTextAlignmentCenter;
-    _numberLable.text = [NSString stringWithFormat:@"%zd",_selectedPhotoArr.count];
-    _numberLable.hidden = _selectedPhotoArr.count <= 0;
+    _numberLable.text = [NSString stringWithFormat:@"%zd",_tzImagePickerVc.selectedModels.count];
+    _numberLable.hidden = _tzImagePickerVc.selectedModels.count <= 0;
     _numberLable.backgroundColor = [UIColor clearColor];
     
     UIView *divide = [[UIView alloc] init];
@@ -190,7 +230,7 @@ static CGSize AssetGridThumbnailSize;
 
 - (void)previewButtonClick {
     TZPhotoPreviewController *photoPreviewVc = [[TZPhotoPreviewController alloc] init];
-    photoPreviewVc.photoArr = [NSArray arrayWithArray:self.selectedPhotoArr];
+    photoPreviewVc.photoArr = [NSArray arrayWithArray:_tzImagePickerVc.selectedModels];
     [self pushPhotoPrevireViewController:photoPreviewVc];
 }
 
@@ -202,40 +242,39 @@ static CGSize AssetGridThumbnailSize;
 }
 
 - (void)okButtonClick {
-    TZImagePickerController *imagePickerVc = (TZImagePickerController *)self.navigationController;
-    [imagePickerVc showProgressHUD];
+    [_tzImagePickerVc showProgressHUD];
     NSMutableArray *photos = [NSMutableArray array];
     NSMutableArray *assets = [NSMutableArray array];
     NSMutableArray *infoArr = [NSMutableArray array];
-    for (NSInteger i = 0; i < _selectedPhotoArr.count; i++) { [photos addObject:@1];[assets addObject:@1];[infoArr addObject:@1]; }
+    for (NSInteger i = 0; i < _tzImagePickerVc.selectedModels.count; i++) { [photos addObject:@1];[assets addObject:@1];[infoArr addObject:@1]; }
     
-    // [TZImageManager manager].shouldFixOrientation = YES;
-    for (NSInteger i = 0; i < _selectedPhotoArr.count; i++) {
-        TZAssetModel *model = _selectedPhotoArr[i];
+    [TZImageManager manager].shouldFixOrientation = YES;
+    for (NSInteger i = 0; i < _tzImagePickerVc.selectedModels.count; i++) {
+        TZAssetModel *model = _tzImagePickerVc.selectedModels[i];
         [[TZImageManager manager] getPhotoWithAsset:model.asset completion:^(UIImage *photo, NSDictionary *info, BOOL isDegraded) {
             if (isDegraded) return;
             if (photo) {
-                photo = [self scaleImage:photo toSize:CGSizeMake(imagePickerVc.photoWidth, imagePickerVc.photoWidth * photo.size.height / photo.size.width)];
+                photo = [self scaleImage:photo toSize:CGSizeMake(_tzImagePickerVc.photoWidth, _tzImagePickerVc.photoWidth * photo.size.height / photo.size.width)];
                 [photos replaceObjectAtIndex:i withObject:photo];
             }
             if (info)  [infoArr replaceObjectAtIndex:i withObject:info];
-            if (_isSelectOriginalPhoto) [assets replaceObjectAtIndex:i withObject:model.asset];
+            [assets replaceObjectAtIndex:i withObject:model.asset];
 
             for (id item in photos) { if ([item isKindOfClass:[NSNumber class]]) return; }
             
-            if ([imagePickerVc.pickerDelegate respondsToSelector:@selector(imagePickerController:didFinishPickingPhotos:sourceAssets:)]) {
-                [imagePickerVc.pickerDelegate imagePickerController:imagePickerVc didFinishPickingPhotos:photos sourceAssets:assets];
+            if ([_tzImagePickerVc.pickerDelegate respondsToSelector:@selector(imagePickerController:didFinishPickingPhotos:sourceAssets:isSelectOriginalPhoto:)]) {
+                [_tzImagePickerVc.pickerDelegate imagePickerController:_tzImagePickerVc didFinishPickingPhotos:photos sourceAssets:assets isSelectOriginalPhoto:_isSelectOriginalPhoto];
             }
-            if ([imagePickerVc.pickerDelegate respondsToSelector:@selector(imagePickerController:didFinishPickingPhotos:sourceAssets:infos:)]) {
-                [imagePickerVc.pickerDelegate imagePickerController:imagePickerVc didFinishPickingPhotos:photos sourceAssets:assets infos:infoArr];
+            if ([_tzImagePickerVc.pickerDelegate respondsToSelector:@selector(imagePickerController:didFinishPickingPhotos:sourceAssets:isSelectOriginalPhoto:infos:)]) {
+                [_tzImagePickerVc.pickerDelegate imagePickerController:_tzImagePickerVc didFinishPickingPhotos:photos sourceAssets:assets isSelectOriginalPhoto:_isSelectOriginalPhoto infos:infoArr];
             }
-            if (imagePickerVc.didFinishPickingPhotosHandle) {
-                imagePickerVc.didFinishPickingPhotosHandle(photos,assets);
+            if (_tzImagePickerVc.didFinishPickingPhotosHandle) {
+                _tzImagePickerVc.didFinishPickingPhotosHandle(photos,assets,_isSelectOriginalPhoto);
             }
-            if (imagePickerVc.didFinishPickingPhotosWithInfosHandle) {
-                imagePickerVc.didFinishPickingPhotosWithInfosHandle(photos,assets,infoArr);
+            if (_tzImagePickerVc.didFinishPickingPhotosWithInfosHandle) {
+                _tzImagePickerVc.didFinishPickingPhotosWithInfosHandle(photos,assets,_isSelectOriginalPhoto,infoArr);
             }
-            [imagePickerVc hideProgressHUD];
+            [_tzImagePickerVc hideProgressHUD];
             [self.navigationController dismissViewControllerAnimated:YES completion:nil];
         }];
     }
@@ -244,10 +283,22 @@ static CGSize AssetGridThumbnailSize;
 #pragma mark - UICollectionViewDataSource && Delegate
 
 - (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section {
+    if ([_model.name isEqualToString:@"相机胶卷"] || [_model.name isEqualToString:@"Camera Roll"]) {
+        if (_tzImagePickerVc.allowPickingImage) {
+            return _photoArr.count + 1;
+        }
+    }
     return _photoArr.count;
 }
 
 - (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath {
+    // the cell lead to take a picture / 去拍照的cell
+    if (indexPath.row >= _photoArr.count) {
+        TZAssetCameraCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"TZAssetCameraCell" forIndexPath:indexPath];
+        cell.imageView.image = [UIImage imageNamedFromMyBundle:@"takePicture.png"];
+        return cell;
+    }
+    // the cell dipaly photo or video / 展示照片或视频的cell
     TZAssetCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"TZAssetCell" forIndexPath:indexPath];
     TZAssetModel *model = _photoArr[indexPath.row];
     cell.model = model;
@@ -260,18 +311,22 @@ static CGSize AssetGridThumbnailSize;
         if (isSelected) {
             weakCell.selectPhotoButton.selected = NO;
             model.isSelected = NO;
-            [weakSelf.selectedPhotoArr removeObject:model];
+            NSArray *selectedModels = [NSArray arrayWithArray:weakSelf.tzImagePickerVc.selectedModels];
+            for (TZAssetModel *model_item in selectedModels) {
+                if ([model.asset isEqual:model_item.asset]) {
+                    [weakSelf.tzImagePickerVc.selectedModels removeObject:model_item];
+                }
+            }
             [weakSelf refreshBottomToolBarStatus];
         } else {
             // 2. select:check if over the maxImagesCount / 选择照片,检查是否超过了最大个数的限制
-            TZImagePickerController *imagePickerVc = (TZImagePickerController *)weakSelf.navigationController;
-            if (weakSelf.selectedPhotoArr.count < imagePickerVc.maxImagesCount) {
+            if (weakSelf.tzImagePickerVc.selectedModels.count < weakSelf.tzImagePickerVc.maxImagesCount) {
                 weakCell.selectPhotoButton.selected = YES;
                 model.isSelected = YES;
-                [weakSelf.selectedPhotoArr addObject:model];
+                [weakSelf.tzImagePickerVc.selectedModels addObject:model];
                 [weakSelf refreshBottomToolBarStatus];
             } else {
-                [imagePickerVc showAlertWithTitle:[NSString stringWithFormat:@"你最多只能选择%zd张照片",imagePickerVc.maxImagesCount]];
+                [weakSelf.tzImagePickerVc showAlertWithTitle:[NSString stringWithFormat:@"你最多只能选择%zd张照片",weakSelf.tzImagePickerVc.maxImagesCount]];
             }
         }
          [UIView showOscillatoryAnimationWithLayer:weakLayer type:TZOscillatoryAnimationToSmaller];
@@ -280,9 +335,14 @@ static CGSize AssetGridThumbnailSize;
 }
 
 - (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath {
+    // take a picture / 去拍照
+    if (indexPath.row >= _photoArr.count) {
+        [self takePicture]; return;
+    }
+    // preview phote or video / 预览照片或视频
     TZAssetModel *model = _photoArr[indexPath.row];
     if (model.type == TZAssetModelMediaTypeVideo) {
-        if (_selectedPhotoArr.count > 0) {
+        if (_tzImagePickerVc.selectedModels.count > 0) {
             TZImagePickerController *imagePickerVc = (TZImagePickerController *)self.navigationController;
             [imagePickerVc showAlertWithTitle:@"选择照片时不能选择视频"];
         } else {
@@ -308,15 +368,30 @@ static CGSize AssetGridThumbnailSize;
 
 #pragma mark - Private Method
 
+- (void)takePicture {
+    UIImagePickerControllerSourceType sourceType = UIImagePickerControllerSourceTypeCamera;
+    if ([UIImagePickerController isSourceTypeAvailable: UIImagePickerControllerSourceTypeCamera]) {
+        self.imagePickerVc.sourceType = sourceType;
+        if(iOS8Later) {
+            _imagePickerVc.modalPresentationStyle = UIModalPresentationOverCurrentContext;
+        }
+        [self presentViewController:_imagePickerVc animated:YES completion:nil];
+    } else {
+        NSLog(@"模拟器中无法打开照相机,请在真机中使用");
+    }
+}
+
 - (void)refreshBottomToolBarStatus {
-    _previewButton.enabled = self.selectedPhotoArr.count > 0;
-    _okButton.enabled = self.selectedPhotoArr.count > 0;
+    TZImagePickerController *imagePickerVc = (TZImagePickerController *)self.navigationController;
+    
+    _previewButton.enabled = imagePickerVc.selectedModels.count > 0;
+    _okButton.enabled = imagePickerVc.selectedModels.count > 0;
     
-    _numberImageView.hidden = _selectedPhotoArr.count <= 0;
-    _numberLable.hidden = _selectedPhotoArr.count <= 0;
-    _numberLable.text = [NSString stringWithFormat:@"%zd",_selectedPhotoArr.count];
+    _numberImageView.hidden = imagePickerVc.selectedModels.count <= 0;
+    _numberLable.hidden = imagePickerVc.selectedModels.count <= 0;
+    _numberLable.text = [NSString stringWithFormat:@"%zd",imagePickerVc.selectedModels.count];
     
-    _originalPhotoButton.enabled = _selectedPhotoArr.count > 0;
+    _originalPhotoButton.enabled = imagePickerVc.selectedModels.count > 0;
     _originalPhotoButton.selected = (_isSelectOriginalPhoto && _originalPhotoButton.enabled);
     _originalPhotoLable.hidden = (!_originalPhotoButton.isSelected);
     if (_isSelectOriginalPhoto) [self getSelectedPhotoBytes];
@@ -324,15 +399,13 @@ static CGSize AssetGridThumbnailSize;
 
 - (void)pushPhotoPrevireViewController:(TZPhotoPreviewController *)photoPreviewVc {
     photoPreviewVc.isSelectOriginalPhoto = _isSelectOriginalPhoto;
-    photoPreviewVc.selectedPhotoArr = self.selectedPhotoArr;
-    photoPreviewVc.returnNewSelectedPhotoArrBlock = ^(NSMutableArray *newSelectedPhotoArr,BOOL isSelectOriginalPhoto) {
-        _selectedPhotoArr = newSelectedPhotoArr;
+    photoPreviewVc.backButtonClickBlock = ^(BOOL isSelectOriginalPhoto) {
         _isSelectOriginalPhoto = isSelectOriginalPhoto;
+        [self checkSelectedModels];
         [_collectionView reloadData];
         [self refreshBottomToolBarStatus];
     };
-    photoPreviewVc.okButtonClickBlock = ^(NSMutableArray *newSelectedPhotoArr,BOOL isSelectOriginalPhoto){
-        _selectedPhotoArr = newSelectedPhotoArr;
+    photoPreviewVc.okButtonClickBlock = ^(BOOL isSelectOriginalPhoto){
         _isSelectOriginalPhoto = isSelectOriginalPhoto;
         [self okButtonClick];
     };
@@ -340,7 +413,8 @@ static CGSize AssetGridThumbnailSize;
 }
 
 - (void)getSelectedPhotoBytes {
-    [[TZImageManager manager] getPhotosBytesWithArray:_selectedPhotoArr completion:^(NSString *totalBytes) {
+    TZImagePickerController *imagePickerVc = (TZImagePickerController *)self.navigationController;
+    [[TZImageManager manager] getPhotosBytesWithArray:imagePickerVc.selectedModels completion:^(NSString *totalBytes) {
         _originalPhotoLable.text = [NSString stringWithFormat:@"(%@)",totalBytes];
     }];
 }
@@ -354,6 +428,75 @@ static CGSize AssetGridThumbnailSize;
     return newImage;
 }
 
+- (void)scrollCollectionViewToBottom {
+    if (_shouldScrollToBottom && _photoArr.count > 0) {
+        NSInteger item = _photoArr.count - 1;
+        if ([_model.name isEqualToString:@"相机胶卷"] || [_model.name isEqualToString:@"Camera Roll"]) {
+            if (_tzImagePickerVc.allowPickingImage) {
+                item += 1;
+            }
+        }
+        [_collectionView scrollToItemAtIndexPath:[NSIndexPath indexPathForItem:item inSection:0] atScrollPosition:UICollectionViewScrollPositionBottom animated:NO];
+        _shouldScrollToBottom = NO;
+    }
+}
+
+- (void)checkSelectedModels {
+    for (TZAssetModel *model in _photoArr) {
+        model.isSelected = NO;
+        NSMutableArray *selectedAssets = [NSMutableArray array];
+        for (TZAssetModel *model in _tzImagePickerVc.selectedModels) {
+            [selectedAssets addObject:model.asset];
+        }
+        if ([selectedAssets containsObject:model.asset]) {
+            model.isSelected = YES;
+        }
+    }
+}
+
+#pragma mark - UIImagePickerControllerDelegate
+
+- (void)imagePickerController:(UIImagePickerController*)picker didFinishPickingMediaWithInfo:(NSDictionary *)info {
+    [picker dismissViewControllerAnimated:YES completion:nil];
+    NSString *type = [info objectForKey:UIImagePickerControllerMediaType];
+    if ([type isEqualToString:@"public.image"]) {
+        TZImagePickerController *imagePickerVc = (TZImagePickerController *)self.navigationController;
+        [imagePickerVc showProgressHUD];
+        UIImage *image = [info objectForKey:UIImagePickerControllerEditedImage];
+        UIImageWriteToSavedPhotosAlbum(image, self, @selector(image:didFinishSavingWithError:contextInfo:), nil);
+    }
+}
+
+- (void)image:(UIImage *)image didFinishSavingWithError:(NSError *)error contextInfo:(void *)contextInfo {
+    if (error) {
+        [_tzImagePickerVc hideProgressHUD];
+        [_tzImagePickerVc showAlertWithTitle:error.localizedDescription];
+    } else {
+        [[TZImageManager manager] getCameraRollAlbum:_tzImagePickerVc.allowPickingVideo allowPickingImage:_tzImagePickerVc.allowPickingImage completion:^(TZAlbumModel *model) {
+            _model = model;
+            [[TZImageManager manager] getAssetsFromFetchResult:_model.result allowPickingVideo:_tzImagePickerVc.allowPickingVideo allowPickingImage:_tzImagePickerVc.allowPickingImage completion:^(NSArray<TZAssetModel *> *models) {
+                [_tzImagePickerVc hideProgressHUD];
+            
+                TZAssetModel *model = [models lastObject];
+                [_photoArr addObject:model];
+                if (_tzImagePickerVc.selectedModels.count < _tzImagePickerVc.maxImagesCount) {
+                    model.isSelected = YES;
+                    [_tzImagePickerVc.selectedModels addObject:model];
+                    [self refreshBottomToolBarStatus];
+                }
+                [_collectionView reloadData];
+                
+                _shouldScrollToBottom = YES;
+                [self scrollCollectionViewToBottom];
+            }];
+        }];
+    }
+}
+
+- (void)imagePickerControllerDidCancel:(UIImagePickerController *)picker {
+    [picker dismissViewControllerAnimated:YES completion:nil];
+}
+
 #pragma mark - Asset Caching
 
 - (void)resetCachedAssets {

TZImagePickerController/TZImagePickerController/TZPhotoPreviewController.h

@@ -11,12 +11,12 @@
 @interface TZPhotoPreviewController : UIViewController
 
 @property (nonatomic, strong) NSArray *photoArr;                ///< All photos / 所有图片的数组
-@property (nonatomic, strong) NSMutableArray *selectedPhotoArr; ///< Current selected photos / 当前选中的图片数组
+// @property (nonatomic, strong) NSMutableArray *selectedPhotoArr; ///< Current selected photos / 当前选中的图片数组
 @property (nonatomic, assign) NSInteger currentIndex;           ///< Index of the photo user click / 用户点击的图片的索引
 @property (nonatomic, assign) BOOL isSelectOriginalPhoto;       ///< If YES,return original photo / 是否返回原图
 
 /// Return the new selected photos / 返回最新的选中图片数组
-@property (nonatomic, copy) void (^returnNewSelectedPhotoArrBlock)(NSMutableArray *newSeletedPhotoArr, BOOL isSelectOriginalPhoto);
-@property (nonatomic, copy) void (^okButtonClickBlock)(NSMutableArray *newSeletedPhotoArr, BOOL isSelectOriginalPhoto);
+@property (nonatomic, copy) void (^backButtonClickBlock)(BOOL isSelectOriginalPhoto);
+@property (nonatomic, copy) void (^okButtonClickBlock)(BOOL isSelectOriginalPhoto);
 
 @end

TZImagePickerController/TZImagePickerController/TZPhotoPreviewController.m

@@ -28,18 +28,15 @@
     UIButton *_originalPhotoButton;
     UILabel *_originalPhotoLable;
 }
-
+@property (nonatomic, strong) TZImagePickerController *tzImagePickerVc;
 @end
 
 @implementation TZPhotoPreviewController
 
-- (NSMutableArray *)selectedPhotoArr {
-    if (_selectedPhotoArr == nil) _selectedPhotoArr = [[NSMutableArray alloc] init];
-    return _selectedPhotoArr;
-}
-
 - (void)viewDidLoad {
     [super viewDidLoad];
+    __weak typeof(self) weakSelf = self;
+    _tzImagePickerVc = (TZImagePickerController *)weakSelf.navigationController;
     [self configCollectionView];
     [self configCustomNaviBar];
     [self configBottomToolBar];
@@ -85,8 +82,7 @@
     _toolBar.backgroundColor = [UIColor colorWithRed:rgb green:rgb blue:rgb alpha:1.0];
     _toolBar.alpha = 0.7;
     
-    TZImagePickerController *imagePickerVc = (TZImagePickerController *)self.navigationController;
-    if (imagePickerVc.allowPickingOriginalPhoto) {
+    if (_tzImagePickerVc.allowPickingOriginalPhoto) {
         _originalPhotoButton = [UIButton buttonWithType:UIButtonTypeCustom];
         _originalPhotoButton.frame = CGRectMake(5, 0, 120, 44);
         _originalPhotoButton.imageEdgeInsets = UIEdgeInsetsMake(0, -8, 0, 0);
@@ -115,20 +111,20 @@
     _okButton.titleLabel.font = [UIFont systemFontOfSize:16];
     [_okButton addTarget:self action:@selector(okButtonClick) forControlEvents:UIControlEventTouchUpInside];
     [_okButton setTitle:@"确定" forState:UIControlStateNormal];
-    [_okButton setTitleColor:imagePickerVc.oKButtonTitleColorNormal forState:UIControlStateNormal];
+    [_okButton setTitleColor:_tzImagePickerVc.oKButtonTitleColorNormal forState:UIControlStateNormal];
     
     _numberImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamedFromMyBundle:@"photo_number_icon.png"]];
     _numberImageView.backgroundColor = [UIColor clearColor];
     _numberImageView.frame = CGRectMake(self.view.tz_width - 56 - 24, 9, 26, 26);
-    _numberImageView.hidden = _selectedPhotoArr.count <= 0;
+    _numberImageView.hidden = _tzImagePickerVc.selectedModels.count <= 0;
     
     _numberLable = [[UILabel alloc] init];
     _numberLable.frame = _numberImageView.frame;
     _numberLable.font = [UIFont systemFontOfSize:16];
     _numberLable.textColor = [UIColor whiteColor];
     _numberLable.textAlignment = NSTextAlignmentCenter;
-    _numberLable.text = [NSString stringWithFormat:@"%zd",_selectedPhotoArr.count];
-    _numberLable.hidden = _selectedPhotoArr.count <= 0;
+    _numberLable.text = [NSString stringWithFormat:@"%zd",_tzImagePickerVc.selectedModels.count];
+    _numberLable.hidden = _tzImagePickerVc.selectedModels.count <= 0;
     _numberLable.backgroundColor = [UIColor clearColor];
 
     [_originalPhotoButton addSubview:_originalPhotoLable];
@@ -164,20 +160,23 @@
     TZAssetModel *model = _photoArr[_currentIndex];
     if (!selectButton.isSelected) {
         // 1. select:check if over the maxImagesCount / 选择照片,检查是否超过了最大个数的限制
-        TZImagePickerController *imagePickerVc = (TZImagePickerController *)self.navigationController;
-        if (self.selectedPhotoArr.count >= imagePickerVc.maxImagesCount) {
-            [imagePickerVc showAlertWithTitle:[NSString stringWithFormat:@"你最多只能选择%zd张照片",imagePickerVc.maxImagesCount]];
+        if (_tzImagePickerVc.selectedModels.count >= _tzImagePickerVc.maxImagesCount) {
+            [_tzImagePickerVc showAlertWithTitle:[NSString stringWithFormat:@"你最多只能选择%zd张照片",_tzImagePickerVc.maxImagesCount]];
             return;
         // 2. if not over the maxImagesCount / 如果没有超过最大个数限制
         } else {
-            [self.selectedPhotoArr addObject:model];
+            [_tzImagePickerVc.selectedModels addObject:model];
             if (model.type == TZAssetModelMediaTypeVideo) {
-                TZImagePickerController *imagePickerVc = (TZImagePickerController *)self.navigationController;
-                [imagePickerVc showAlertWithTitle:@"多选状态下选择视频，默认将视频当图片发送"];
+                [_tzImagePickerVc showAlertWithTitle:@"多选状态下选择视频，默认将视频当图片发送"];
             }
         }
     } else {
-        [self.selectedPhotoArr removeObject:model];
+        NSArray *selectedModels = [NSArray arrayWithArray:self.tzImagePickerVc.selectedModels];
+        for (TZAssetModel *model_item in selectedModels) {
+            if ([model.asset isEqual:model_item.asset]) {
+                [self.tzImagePickerVc.selectedModels removeObject:model_item];
+            }
+        }
     }
     model.isSelected = !selectButton.isSelected;
     [self refreshNaviBarAndBottomBarState];
@@ -189,18 +188,18 @@
 
 - (void)back {
     [self.navigationController popViewControllerAnimated:YES];
-    if (self.returnNewSelectedPhotoArrBlock) {
-        self.returnNewSelectedPhotoArrBlock(self.selectedPhotoArr,_isSelectOriginalPhoto);
+    if (self.backButtonClickBlock) {
+        self.backButtonClickBlock(_isSelectOriginalPhoto);
     }
 }
 
 - (void)okButtonClick {
-    if (_selectedPhotoArr.count == 0) {
+    if (_tzImagePickerVc.selectedModels.count == 0) {
         TZAssetModel *model = _photoArr[_currentIndex];
-        [_selectedPhotoArr addObject:model];
+        [_tzImagePickerVc.selectedModels addObject:model];
     }
     if (self.okButtonClickBlock) {
-        self.okButtonClickBlock(self.selectedPhotoArr,_isSelectOriginalPhoto);
+        self.okButtonClickBlock(_isSelectOriginalPhoto);
     }
 }
 
@@ -218,10 +217,7 @@
 
 - (void)scrollViewDidScroll:(UIScrollView *)scrollView {
     CGPoint offSet = scrollView.contentOffset;
-    _currentIndex = offSet.x / self.view.tz_width;
-}
-
-- (void)scrollViewDidEndDecelerating:(UIScrollView *)scrollView {
+    _currentIndex = (offSet.x + (self.view.tz_width * 0.5)) / self.view.tz_width;
     [self refreshNaviBarAndBottomBarState];
 }
 
@@ -254,9 +250,9 @@
 - (void)refreshNaviBarAndBottomBarState {
     TZAssetModel *model = _photoArr[_currentIndex];
     _selectButton.selected = model.isSelected;
-    _numberLable.text = [NSString stringWithFormat:@"%zd",_selectedPhotoArr.count];
-    _numberImageView.hidden = (_selectedPhotoArr.count <= 0 || _isHideNaviBar);
-    _numberLable.hidden = (_selectedPhotoArr.count <= 0 || _isHideNaviBar);
+    _numberLable.text = [NSString stringWithFormat:@"%zd",_tzImagePickerVc.selectedModels.count];
+    _numberImageView.hidden = (_tzImagePickerVc.selectedModels.count <= 0 || _isHideNaviBar);
+    _numberLable.hidden = (_tzImagePickerVc.selectedModels.count <= 0 || _isHideNaviBar);
     
     _originalPhotoButton.selected = _isSelectOriginalPhoto;
     _originalPhotoLable.hidden = !_originalPhotoButton.isSelected;

TZImagePickerController/ViewController.m

@@ -73,10 +73,11 @@
 
 - (IBAction)pickPhotoButtonClick:(UIButton *)sender {
     TZImagePickerController *imagePickerVc = [[TZImagePickerController alloc] initWithMaxImagesCount:9 delegate:self];
+    imagePickerVc.selectedAssets = _selectedAssets; // optional, 可选的
     
     // You can get the photos by block, the same as by delegate.
     // 你可以通过block或者代理，来得到用户选择的照片.
-    [imagePickerVc setDidFinishPickingPhotosHandle:^(NSArray<UIImage *> *photos, NSArray *assets) {
+    [imagePickerVc setDidFinishPickingPhotosHandle:^(NSArray<UIImage *> *photos, NSArray *assets, BOOL isSelectOriginalPhoto) {
     
     }];
     
@@ -105,8 +106,9 @@
 
 /// User finish picking photo，if assets are not empty, user picking original photo.
 /// 用户选择好了图片，如果assets非空，则用户选择了原图。
-- (void)imagePickerController:(TZImagePickerController *)picker didFinishPickingPhotos:(NSArray *)photos sourceAssets:(NSArray *)assets{
-    [_selectedPhotos addObjectsFromArray:photos];
+- (void)imagePickerController:(TZImagePickerController *)picker didFinishPickingPhotos:(NSArray *)photos sourceAssets:(NSArray *)assets isSelectOriginalPhoto:(BOOL)isSelectOriginalPhoto {
+    _selectedPhotos = [NSMutableArray arrayWithArray:photos];
+    _selectedAssets = [NSMutableArray arrayWithArray:assets];
     [_collectionView reloadData];
     _collectionView.contentSize = CGSizeMake(0, ((_selectedPhotos.count + 2) / 3 ) * (_margin + _itemWH));
 }