Skip to content

Commit 3dc59e8

Browse files
committed
修复loading可能不消失的问题,release 3.5.0
1 parent 844a4e6 commit 3dc59e8

File tree

6 files changed

+13
-11
lines changed

6 files changed

+13
-11
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
## 重要提示1:提issue前,请先对照Demo、常见问题自查!Demo正常说明你可以升级下新版试试。
1010

11-
## 重要提示2:3.4.9版本适配了iOS14、iPhone12,修复2个严重问题,强烈建议尽快更新
11+
## 重要提示2:3.5.0版本适配了iOS14、iPhone12,修复2个严重问题,强烈建议尽快更新
1212
关于iOS14模拟器的问题
1313
PHAuthorizationStatusLimited授权模式下,iOS14模拟器有bug,未授权照片无法显示,真机正常,暂可忽略:https://github.com/banchichen/TZImagePickerController/issues/1347
1414

@@ -124,7 +124,7 @@ A:不要去拿PHImageFileURLKey,没用的,只有通过Photos框架才能
124124

125125
## 六. Release Notes 最近更新
126126

127-
**3.4.9 适配iPhone12系列设备**
127+
**3.5.0 适配iPhone12系列设备**
128128
3.4.4 支持Dark Mode
129129
**3.4.2 适配iOS14,若干问题修复**
130130
3.3.2 适配iOS13,若干问题修复

TZImagePickerController.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
Pod::Spec.new do |s|
22
s.name = "TZImagePickerController"
3-
s.version = "3.4.9"
3+
s.version = "3.5.0"
44
s.summary = "A clone of UIImagePickerController, support picking multiple photos、original photo and video"
55
s.homepage = "https://github.com/banchichen/TZImagePickerController"
66
s.license = "MIT"
77
s.author = { "banchichen" => "[email protected]" }
88
s.platform = :ios
99
s.ios.deployment_target = "8.0"
10-
s.source = { :git => "https://github.com/banchichen/TZImagePickerController.git", :tag => "3.4.9" }
10+
s.source = { :git => "https://github.com/banchichen/TZImagePickerController.git", :tag => "3.5.0" }
1111
s.requires_arc = true
1212
s.resources = "TZImagePickerController/TZImagePickerController/*.{png,bundle}"
1313
s.source_files = "TZImagePickerController/TZImagePickerController/*.{h,m}"

TZImagePickerController.xcodeproj/project.pbxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -807,7 +807,7 @@
807807
INFOPLIST_FILE = TZImagePickerController/Info.plist;
808808
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
809809
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
810-
MARKETING_VERSION = 3.4.9;
810+
MARKETING_VERSION = 3.5.0;
811811
PRODUCT_BUNDLE_IDENTIFIER = tanzhenios2019.TZImagePickerController.www;
812812
PRODUCT_NAME = "$(TARGET_NAME)";
813813
PROVISIONING_PROFILE = "";
@@ -831,7 +831,7 @@
831831
INFOPLIST_FILE = TZImagePickerController/Info.plist;
832832
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
833833
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
834-
MARKETING_VERSION = 3.4.9;
834+
MARKETING_VERSION = 3.5.0;
835835
PRODUCT_BUNDLE_IDENTIFIER = tanzhenios2019.TZImagePickerController.www;
836836
PRODUCT_NAME = "$(TARGET_NAME)";
837837
PROVISIONING_PROFILE = "";
@@ -918,7 +918,7 @@
918918
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
919919
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
920920
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
921-
MARKETING_VERSION = 3.4.9;
921+
MARKETING_VERSION = 3.5.0;
922922
OTHER_LDFLAGS = "-all_load";
923923
PRODUCT_BUNDLE_IDENTIFIER = tanzhen.TZImagePickerControllerFramework;
924924
PRODUCT_NAME = TZImagePickerController;
@@ -959,7 +959,7 @@
959959
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
960960
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
961961
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
962-
MARKETING_VERSION = 3.4.9;
962+
MARKETING_VERSION = 3.5.0;
963963
OTHER_LDFLAGS = "-all_load";
964964
PRODUCT_BUNDLE_IDENTIFIER = tanzhen.TZImagePickerControllerFramework;
965965
PRODUCT_NAME = TZImagePickerController;

TZImagePickerController/TZImagePickerController/TZImagePickerController.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
//
55
// Created by 谭真 on 15/12/24.
66
// Copyright © 2015年 谭真. All rights reserved.
7-
// version 3.4.9 - 2020.10.28
7+
// version 3.5.0 - 2020.10.28
88
// 更多信息,请前往项目的github地址:https://github.com/banchichen/TZImagePickerController
99

1010
/*

TZImagePickerController/TZImagePickerController/TZImagePickerController.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
//
55
// Created by 谭真 on 15/12/24.
66
// Copyright © 2015年 谭真. All rights reserved.
7-
// version 3.4.9 - 2020.10.28
7+
// version 3.5.0 - 2020.10.28
88
// 更多信息,请前往项目的github地址:https://github.com/banchichen/TZImagePickerController
99

1010
#import "TZImagePickerController.h"

TZImagePickerController/TZImagePickerController/TZPhotoPickerController.m

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -471,11 +471,13 @@ - (void)doneButtonClick {
471471

472472
for (id item in photos) { if ([item isKindOfClass:[NSNumber class]]) return; }
473473

474-
if (havenotShowAlert) {
474+
if (havenotShowAlert && alertView) {
475475
[alertView dismissViewControllerAnimated:YES completion:^{
476476
alertView = nil;
477477
[self didGetAllPhotos:photos assets:assets infoArr:infoArr];
478478
}];
479+
} else {
480+
[self didGetAllPhotos:photos assets:assets infoArr:infoArr];
479481
}
480482
} progressHandler:^(double progress, NSError * _Nonnull error, BOOL * _Nonnull stop, NSDictionary * _Nonnull info) {
481483
// 如果图片正在从iCloud同步中,提醒用户

0 commit comments

Comments
 (0)