From 66d9e0565fb04a9940de8b830fb0dde69663a0c9 Mon Sep 17 00:00:00 2001 From: "yuzheng.tz" Date: Wed, 30 Aug 2017 12:34:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=85=A7=E7=89=87=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E9=A1=B5=E5=88=9D=E6=AC=A1=E6=89=93=E5=BC=80=E6=97=B6?= =?UTF-8?q?=E7=9A=84=E9=97=AA=E7=83=81;=E5=8F=91=E5=B8=831.9.0=E7=89=88?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- TZImagePickerController.podspec | 4 ++-- TZImagePickerController/Info.plist | 2 +- .../TZImagePickerController/TZImagePickerController.h | 2 +- .../TZImagePickerController/TZImagePickerController.m | 2 +- .../TZImagePickerController/TZPhotoPickerController.m | 5 +++++ 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/TZImagePickerController.podspec b/TZImagePickerController.podspec index bd26939b..e8b004ff 100644 --- a/TZImagePickerController.podspec +++ b/TZImagePickerController.podspec @@ -1,13 +1,13 @@ Pod::Spec.new do |s| s.name = "TZImagePickerController" - s.version = "1.8.9" + s.version = "1.9.0" 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.8.9" } + s.source = { :git => "https://github.com/banchichen/TZImagePickerController.git", :tag => "1.9.0" } s.requires_arc = true s.resources = "TZImagePickerController/TZImagePickerController/*.{png,bundle}" s.source_files = "TZImagePickerController/TZImagePickerController/*.{h,m}" diff --git a/TZImagePickerController/Info.plist b/TZImagePickerController/Info.plist index 96dcfbf1..d83a9c6d 100644 --- a/TZImagePickerController/Info.plist +++ b/TZImagePickerController/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.8.9 + 1.9.0 CFBundleSignature ???? CFBundleVersion diff --git a/TZImagePickerController/TZImagePickerController/TZImagePickerController.h b/TZImagePickerController/TZImagePickerController/TZImagePickerController.h index 60abd10b..d4b08ed1 100644 --- a/TZImagePickerController/TZImagePickerController/TZImagePickerController.h +++ b/TZImagePickerController/TZImagePickerController/TZImagePickerController.h @@ -4,7 +4,7 @@ // // Created by 谭真 on 15/12/24. // Copyright © 2015年 谭真. All rights reserved. -// version 1.8.9 - 2017.08.16 +// version 1.9.0 - 2017.08.30 // 更多信息,请前往项目的github地址:https://github.com/banchichen/TZImagePickerController /* diff --git a/TZImagePickerController/TZImagePickerController/TZImagePickerController.m b/TZImagePickerController/TZImagePickerController/TZImagePickerController.m index 0270ec9a..11b6278a 100644 --- a/TZImagePickerController/TZImagePickerController/TZImagePickerController.m +++ b/TZImagePickerController/TZImagePickerController/TZImagePickerController.m @@ -4,7 +4,7 @@ // // Created by 谭真 on 15/12/24. // Copyright © 2015年 谭真. All rights reserved. -// version 1.8.9 - 2017.08.16 +// version 1.9.0 - 2017.08.30 // 更多信息,请前往项目的github地址:https://github.com/banchichen/TZImagePickerController #import "TZImagePickerController.h" diff --git a/TZImagePickerController/TZImagePickerController/TZPhotoPickerController.m b/TZImagePickerController/TZImagePickerController/TZPhotoPickerController.m index 84cb7f18..996eefa8 100644 --- a/TZImagePickerController/TZImagePickerController/TZPhotoPickerController.m +++ b/TZImagePickerController/TZImagePickerController/TZPhotoPickerController.m @@ -116,6 +116,7 @@ - (void)initSubviews { [self checkSelectedModels]; [self configCollectionView]; + _collectionView.hidden = YES; [self configBottomToolBar]; [self scrollCollectionViewToBottom]; @@ -652,7 +653,10 @@ - (void)scrollCollectionViewToBottom { dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.01 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ [_collectionView scrollToItemAtIndexPath:[NSIndexPath indexPathForItem:item inSection:0] atScrollPosition:UICollectionViewScrollPositionBottom animated:NO]; _shouldScrollToBottom = NO; + _collectionView.hidden = NO; }); + } else { + _collectionView.hidden = NO; } } @@ -738,6 +742,7 @@ - (void)reloadPhotoArray { [tzImagePickerVc.selectedModels addObject:assetModel]; [self refreshBottomToolBarStatus]; } + _collectionView.hidden = YES; [_collectionView reloadData]; _shouldScrollToBottom = YES;