1.7.7 支持GIF图片

TZImagePickerController.podspec

 Pod::Spec.new do |s|
   s.name         = "TZImagePickerController"
-  s.version      = "1.7.6"
+  s.version      = "1.7.7"
   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.6" }
+  s.source       = { :git => "https://github.com/banchichen/TZImagePickerController.git", :tag => "1.7.7" }
   s.requires_arc = true
   s.resources    = "TZImagePickerController/TZImagePickerController/*.{png,xib,nib,bundle}"
   s.source_files = "TZImagePickerController/TZImagePickerController/*.{h,m}"

TZImagePickerController.xcodeproj/project.pbxproj

@@ -304,6 +304,7 @@
 					900E657B1C2BB8D5003D9A9E = {
 						CreatedOnToolsVersion = 7.2;
 						DevelopmentTeam = ZH74J4ERQH;
+						ProvisioningStyle = Automatic;
 					};
 					900E65941C2BB8D5003D9A9E = {
 						CreatedOnToolsVersion = 7.2;

TZImagePickerController/Info.plist

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

TZImagePickerController/TZImagePickerController/TZGifPhotoPreviewController.m

@@ -11,6 +11,7 @@
 #import "TZAssetModel.h"
 #import "UIView+Layout.h"
 #import "TZPhotoPreviewCell.h"
+#import "TZImageManager.h"
 
 @interface TZGifPhotoPreviewController () {
     UIView *_toolBar;
@@ -18,6 +19,8 @@
     UIProgressView *_progress;
     
     TZPhotoPreviewView *_previewView;
+    
+    UIStatusBarStyle _originStatusBarStyle;
 }
 @end
 
@@ -27,11 +30,24 @@
     [super viewDidLoad];
     self.view.backgroundColor = [UIColor blackColor];
     TZImagePickerController *tzImagePickerVc = (TZImagePickerController *)self.navigationController;
-    self.navigationItem.title = [NSString stringWithFormat:@"GIF%@",tzImagePickerVc.previewBtnTitleStr];
+    if (tzImagePickerVc) {
+        self.navigationItem.title = [NSString stringWithFormat:@"GIF %@",tzImagePickerVc.previewBtnTitleStr];
+    }
     [self configPreviewView];
     [self configBottomToolBar];
 }
 
+- (void)viewWillAppear:(BOOL)animated {
+    [super viewWillAppear:animated];
+    _originStatusBarStyle = [UIApplication sharedApplication].statusBarStyle;
+    [UIApplication sharedApplication].statusBarStyle = iOS7Later ? UIStatusBarStyleLightContent : UIStatusBarStyleBlackOpaque;
+}
+
+- (void)viewWillDisappear:(BOOL)animated {
+    [super viewWillDisappear:animated];
+    [UIApplication sharedApplication].statusBarStyle = _originStatusBarStyle;
+}
+
 - (void)configPreviewView {
     _previewView = [[TZPhotoPreviewView alloc] initWithFrame:self.view.bounds];
     _previewView.scrollView.frame = self.view.bounds;
@@ -46,19 +62,31 @@
 - (void)configBottomToolBar {
     _toolBar = [[UIView alloc] initWithFrame:CGRectMake(0, self.view.tz_height - 44, self.view.tz_width, 44)];
     CGFloat rgb = 34 / 255.0;
-    _toolBar.backgroundColor = [UIColor colorWithRed:rgb green:rgb blue:rgb alpha:1.0];
-    _toolBar.alpha = 0.7;
+    _toolBar.backgroundColor = [UIColor colorWithRed:rgb green:rgb blue:rgb alpha:0.7];
     
     _doneButton = [UIButton buttonWithType:UIButtonTypeCustom];
     _doneButton.frame = CGRectMake(self.view.tz_width - 44 - 12, 0, 44, 44);
     _doneButton.titleLabel.font = [UIFont systemFontOfSize:16];
     [_doneButton addTarget:self action:@selector(doneButtonClick) forControlEvents:UIControlEventTouchUpInside];
     TZImagePickerController *tzImagePickerVc = (TZImagePickerController *)self.navigationController;
+    if (tzImagePickerVc) {
         [_doneButton setTitle:tzImagePickerVc.doneBtnTitleStr forState:UIControlStateNormal];
-    TZImagePickerController *imagePickerVc = (TZImagePickerController *)self.navigationController;
-    [_doneButton setTitleColor:imagePickerVc.oKButtonTitleColorNormal forState:UIControlStateNormal];
-    
+        [_doneButton setTitleColor:tzImagePickerVc.oKButtonTitleColorNormal forState:UIControlStateNormal];
+    } else {
+        [_doneButton setTitle:[NSBundle tz_localizedStringForKey:@"Done"] forState:UIControlStateNormal];
+        [_doneButton setTitleColor:[UIColor colorWithRed:(83/255.0) green:(179/255.0) blue:(17/255.0) alpha:1.0] forState:UIControlStateNormal];
+    }
     [_toolBar addSubview:_doneButton];
+    
+    UILabel *byteLable = [[UILabel alloc] init];
+    byteLable.textColor = [UIColor whiteColor];
+    byteLable.font = [UIFont systemFontOfSize:13];
+    byteLable.frame = CGRectMake(10, 0, 100, 44);
+    [[TZImageManager manager] getPhotosBytesWithArray:@[_model] completion:^(NSString *totalBytes) {
+        byteLable.text = totalBytes;
+    }];
+    [_toolBar addSubview:byteLable];
+    
     [self.view addSubview:_toolBar];
 }
 

TZImagePickerController/TZImagePickerController/TZImageCropManager.h

@@ -30,10 +30,10 @@
 @end
 
 
+/// 该分类的代码来自SDWebImage:https://github.com/rs/SDWebImage
+/// 为了防止冲突，我将分类名字和方法名字做了修改
 @interface UIImage (TZGif)
 
-- (UIImage *)sd_tz_animatedImageByScalingAndCroppingToSize:(CGSize)size;
-
 + (UIImage *)sd_tz_animatedGIFWithData:(NSData *)data;
 
 @end

TZImagePickerController/TZImagePickerController/TZImageCropManager.m

@@ -114,43 +114,6 @@
 
 @implementation UIImage (TZGif)
 
-- (UIImage *)sd_tz_animatedImageByScalingAndCroppingToSize:(CGSize)size {
-    if (CGSizeEqualToSize(self.size, size) || CGSizeEqualToSize(size, CGSizeZero)) {
-        return self;
-    }
-    
-    CGSize scaledSize = size;
-    CGPoint thumbnailPoint = CGPointZero;
-    
-    CGFloat widthFactor = size.width / self.size.width;
-    CGFloat heightFactor = size.height / self.size.height;
-    CGFloat scaleFactor = (widthFactor > heightFactor) ? widthFactor : heightFactor;
-    scaledSize.width = self.size.width * scaleFactor;
-    scaledSize.height = self.size.height * scaleFactor;
-    
-    if (widthFactor > heightFactor) {
-        thumbnailPoint.y = (size.height - scaledSize.height) * 0.5;
-    }
-    else if (widthFactor < heightFactor) {
-        thumbnailPoint.x = (size.width - scaledSize.width) * 0.5;
-    }
-    
-    NSMutableArray *scaledImages = [NSMutableArray array];
-    
-    for (UIImage *image in self.images) {
-        UIGraphicsBeginImageContextWithOptions(size, NO, 0.0);
-        
-        [image drawInRect:CGRectMake(thumbnailPoint.x, thumbnailPoint.y, scaledSize.width, scaledSize.height)];
-        UIImage *newImage = UIGraphicsGetImageFromCurrentImageContext();
-        
-        [scaledImages addObject:newImage];
-        
-        UIGraphicsEndImageContext();
-    }
-    
-    return [UIImage animatedImageWithImages:scaledImages duration:self.duration];
-}
-
 + (UIImage *)sd_tz_animatedGIFWithData:(NSData *)data {
     if (!data) {
         return nil;

TZImagePickerController/TZImagePickerController/TZImageManager.m

@@ -524,7 +524,7 @@ static CGFloat TZScreenScale;
 
 - (void)savePhotoWithImage:(UIImage *)image completion:(void (^)(NSError *error))completion {
     NSData *data = UIImageJPEGRepresentation(image, 0.9);
-    if (iOS9Later) { // 这里有坑... iOS8系统下这个方法保存图片会失败
+    if (iOS9Later) { // 这里有坑... iOS8系统下这个方法保存图片会失败 原来是因为PHAssetResourceType是iOS9之后的...
         [[PHPhotoLibrary sharedPhotoLibrary] performChanges:^{
             PHAssetResourceCreationOptions *options = [[PHAssetResourceCreationOptions alloc] init];
             options.shouldMoveFile = YES;

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.7.6 - 2016.12.8
+//  version 1.7.7 - 2016.12.13
 
 /*
  经过测试，比起xib的方式，把TZAssetCell改用纯代码的方式来写，滑动帧数明显提高了（约提高10帧左右）

TZImagePickerController/TZImagePickerController/TZImagePickerController.m

@@ -4,7 +4,7 @@
 //
 //  Created by 谭真 on 15/12/24.
 //  Copyright © 2015年 谭真. All rights reserved.
-//  version 1.7.6 - 2016.12.8
+//  version 1.7.7 - 2016.12.13
 
 #import "TZImagePickerController.h"
 #import "TZPhotoPickerController.h"
@@ -322,8 +322,9 @@
 
 - (void)setAllowCrop:(BOOL)allowCrop {
     _allowCrop = _maxImagesCount > 1 ? NO : allowCrop;
-    if (allowCrop) { // 允许裁剪的时候，不能选原图
+    if (allowCrop) { // 允许裁剪的时候，不能选原图和GIF
         self.allowPickingOriginalPhoto = NO;
+        self.allowPickingGif = NO;
     }
 }
 

TZImagePickerController/TZImagePickerController/TZPhotoPickerController.m

@@ -427,10 +427,15 @@ static CGSize AssetGridThumbnailSize;
             videoPlayerVc.model = model;
             [self.navigationController pushViewController:videoPlayerVc animated:YES];
         }
-    } else if (model.type == TZAssetModelMediaTypePhotoGif) {
+    } else if (model.type == TZAssetModelMediaTypePhotoGif && tzImagePickerVc.allowPickingGif) {
+        if (tzImagePickerVc.selectedModels.count > 0) {
+            TZImagePickerController *imagePickerVc = (TZImagePickerController *)self.navigationController;
+            [imagePickerVc showAlertWithTitle:[NSBundle tz_localizedStringForKey:@"Can not choose both photo and GIF"]];
+        } else {
             TZGifPhotoPreviewController *gifPreviewVc = [[TZGifPhotoPreviewController alloc] init];
             gifPreviewVc.model = model;
             [self.navigationController pushViewController:gifPreviewVc animated:YES];
+        }
     } else {
         TZPhotoPreviewController *photoPreviewVc = [[TZPhotoPreviewController alloc] init];
         photoPreviewVc.currentIndex = index;

TZImagePickerController/TZImagePickerController/TZPhotoPreviewCell.h

@@ -35,6 +35,7 @@
 @property (nonatomic, assign) CGRect cropRect;
 
 @property (nonatomic, strong) TZAssetModel *model;
+@property (nonatomic, strong) id asset;
 @property (nonatomic, copy) void (^singleTapGestureBlock)();
 @property (nonatomic, copy) void (^imageProgressUpdateBlock)(double progress);
 

TZImagePickerController/TZImagePickerController/TZPhotoPreviewCell.m

@@ -41,7 +41,7 @@
 
 - (void)setModel:(TZAssetModel *)model {
     _model = model;
-    _previewView.model = model;
+    _previewView.asset = model.asset;
 }
 
 - (void)recoverSubviews {
@@ -130,7 +130,13 @@
             }
         }];
     } else {
-        [[TZImageManager manager] getPhotoWithAsset:model.asset completion:^(UIImage *photo, NSDictionary *info, BOOL isDegraded) {
+        self.asset = model.asset;
+    }
+}
+
+- (void)setAsset:(id)asset {
+    _asset = asset;
+    [[TZImageManager manager] getPhotoWithAsset:asset completion:^(UIImage *photo, NSDictionary *info, BOOL isDegraded) {
         self.imageView.image = photo;
         [self resizeSubviews];
         _progressView.hidden = YES;
@@ -146,7 +152,6 @@
             self.imageProgressUpdateBlock(progress);
         }
     } networkAccessAllowed:YES];
-    }
 }
 
 - (void)recoverSubviews {

TZImagePickerController/TZImagePickerController/TZVideoPlayerController.m

@@ -22,6 +22,8 @@
     UIView *_toolBar;
     UIButton *_doneButton;
     UIProgressView *_progress;
+    
+    UIStatusBarStyle _originStatusBarStyle;
 }
 @end
 
@@ -31,10 +33,23 @@
     [super viewDidLoad];
     self.view.backgroundColor = [UIColor blackColor];
     TZImagePickerController *tzImagePickerVc = (TZImagePickerController *)self.navigationController;
+    if (tzImagePickerVc) {
         self.navigationItem.title = tzImagePickerVc.previewBtnTitleStr;
+    }
     [self configMoviePlayer];
 }
 
+- (void)viewWillAppear:(BOOL)animated {
+    [super viewWillAppear:animated];
+    _originStatusBarStyle = [UIApplication sharedApplication].statusBarStyle;
+    [UIApplication sharedApplication].statusBarStyle = iOS7Later ? UIStatusBarStyleLightContent : UIStatusBarStyleBlackOpaque;
+}
+
+- (void)viewWillDisappear:(BOOL)animated {
+    [super viewWillDisappear:animated];
+    [UIApplication sharedApplication].statusBarStyle = _originStatusBarStyle;
+}
+
 - (void)configMoviePlayer {
     [[TZImageManager manager] getPhotoWithAsset:_model.asset completion:^(UIImage *photo, NSDictionary *info, BOOL isDegraded) {
         _cover = photo;
@@ -78,18 +93,20 @@
 - (void)configBottomToolBar {
     _toolBar = [[UIView alloc] initWithFrame:CGRectMake(0, self.view.tz_height - 44, self.view.tz_width, 44)];
     CGFloat rgb = 34 / 255.0;
-    _toolBar.backgroundColor = [UIColor colorWithRed:rgb green:rgb blue:rgb alpha:1.0];
-    _toolBar.alpha = 0.7;
+    _toolBar.backgroundColor = [UIColor colorWithRed:rgb green:rgb blue:rgb alpha:0.7];
     
     _doneButton = [UIButton buttonWithType:UIButtonTypeCustom];
     _doneButton.frame = CGRectMake(self.view.tz_width - 44 - 12, 0, 44, 44);
     _doneButton.titleLabel.font = [UIFont systemFontOfSize:16];
     [_doneButton addTarget:self action:@selector(doneButtonClick) forControlEvents:UIControlEventTouchUpInside];
     TZImagePickerController *tzImagePickerVc = (TZImagePickerController *)self.navigationController;
+    if (tzImagePickerVc) {
         [_doneButton setTitle:tzImagePickerVc.doneBtnTitleStr forState:UIControlStateNormal];
-    TZImagePickerController *imagePickerVc = (TZImagePickerController *)self.navigationController;
-    [_doneButton setTitleColor:imagePickerVc.oKButtonTitleColorNormal forState:UIControlStateNormal];
-    
+        [_doneButton setTitleColor:tzImagePickerVc.oKButtonTitleColorNormal forState:UIControlStateNormal];
+    } else {
+        [_doneButton setTitle:[NSBundle tz_localizedStringForKey:@"Done"] forState:UIControlStateNormal];
+        [_doneButton setTitleColor:[UIColor colorWithRed:(83/255.0) green:(179/255.0) blue:(17/255.0) alpha:1.0] forState:UIControlStateNormal];
+    }
     [_toolBar addSubview:_doneButton];
     [self.view addSubview:_toolBar];
 }

TZImagePickerController/TZTestCell.m

@@ -42,8 +42,8 @@
         _gifLable.textColor = [UIColor whiteColor];
         _gifLable.backgroundColor = [UIColor colorWithRed:0 green:0 blue:0 alpha:0.8];
         _gifLable.textAlignment = NSTextAlignmentCenter;
-        _gifLable.font = [UIFont systemFontOfSize:13];
-        _gifLable.frame = CGRectMake(self.tz_width - 25, self.tz_height - 12, 25, 12);
+        _gifLable.font = [UIFont systemFontOfSize:10];
+        _gifLable.frame = CGRectMake(self.tz_width - 25, self.tz_height - 14, 25, 14);
         [self addSubview:_gifLable];
     }
     return self;

TZImagePickerController/ViewController.m

@@ -33,6 +33,7 @@
 @property (weak, nonatomic) IBOutlet UISwitch *sortAscendingSwitch;     ///< 照片排列按修改时间升序
 @property (weak, nonatomic) IBOutlet UISwitch *allowPickingVideoSwitch; ///< 允许选择视频
 @property (weak, nonatomic) IBOutlet UISwitch *allowPickingImageSwitch; ///< 允许选择图片
+@property (weak, nonatomic) IBOutlet UISwitch *allowPickingGifSwitch;
 @property (weak, nonatomic) IBOutlet UISwitch *allowPickingOriginalPhotoSwitch; ///< 允许选择原图
 @property (weak, nonatomic) IBOutlet UISwitch *showSheetSwitch; ///< 显示一个sheet,把拍照按钮放在外面
 @property (weak, nonatomic) IBOutlet UITextField *maxCountTF;  ///< 照片最大可选张数，设置为1即为单选模式
@@ -86,7 +87,7 @@
     layout.itemSize = CGSizeMake(_itemWH, _itemWH);
     layout.minimumInteritemSpacing = _margin;
     layout.minimumLineSpacing = _margin;
-    _collectionView = [[UICollectionView alloc] initWithFrame:CGRectMake(0, 374, self.view.tz_width, self.view.tz_height - 374) collectionViewLayout:layout];
+    _collectionView = [[UICollectionView alloc] initWithFrame:CGRectMake(0, 409, self.view.tz_width, self.view.tz_height - 409) collectionViewLayout:layout];
     CGFloat rgb = 244 / 255.0;
     _collectionView.alwaysBounceVertical = YES;
     _collectionView.backgroundColor = [UIColor colorWithRed:rgb green:rgb blue:rgb alpha:1.0];
@@ -116,6 +117,9 @@
         cell.asset = _selectedAssets[indexPath.row];
         cell.deleteBtn.hidden = NO;
     }
+    if (!self.allowPickingGifSwitch.isOn) {
+        cell.gifLable.hidden = YES;
+    }
     cell.deleteBtn.tag = indexPath.row;
     [cell.deleteBtn addTarget:self action:@selector(deleteBtnClik:) forControlEvents:UIControlEventTouchUpInside];
     return cell;
@@ -140,7 +144,7 @@
             ALAsset *alAsset = asset;
             isVideo = [[alAsset valueForProperty:ALAssetPropertyType] isEqualToString:ALAssetTypeVideo];
         }
-        if ([[asset valueForKey:@"filename"] containsString:@"GIF"]) {
+        if ([[asset valueForKey:@"filename"] containsString:@"GIF"] && self.allowPickingGifSwitch.isOn) {
             TZGifPhotoPreviewController *vc = [[TZGifPhotoPreviewController alloc] init];
             TZAssetModel *model = [TZAssetModel modelWithAsset:asset type:TZAssetModelMediaTypePhotoGif timeLength:@""];
             vc.model = model;
@@ -219,7 +223,7 @@
     imagePickerVc.allowPickingVideo = self.allowPickingVideoSwitch.isOn;
     imagePickerVc.allowPickingImage = self.allowPickingImageSwitch.isOn;
     imagePickerVc.allowPickingOriginalPhoto = self.allowPickingOriginalPhotoSwitch.isOn;
-    imagePickerVc.allowPickingGif = YES;
+    imagePickerVc.allowPickingGif = self.allowPickingGifSwitch.isOn;
     
     // 4. 照片排列按修改时间升序
     imagePickerVc.sortAscendingByModificationDate = self.sortAscendingSwitch.isOn;
@@ -465,6 +469,10 @@
     }
 }
 
+- (IBAction)allowPickingGifSwitchClick:(UISwitch *)sender {
+    
+}
+
 - (IBAction)allowPickingVideoSwitchClick:(UISwitch *)sender {
     if (!sender.isOn) {
         [_allowPickingImageSwitch setOn:YES animated:YES];