Commit f6b7b543 authored by yuzheng's avatar yuzheng

尝试修复iOS15偶现照片列表未滚动到底部的问题,release 3.7.1

parent 4f682ae6
......@@ -128,7 +128,7 @@ A:不要去拿PHImageFileURLKey,没用的,只有通过Photos框架才能
## 六. Release Notes 最近更新
**3.7.0 修复iOS15.2下初次授权相册权限时的长时间卡顿&白屏问题** [#1547](https://github.com/banchichen/TZImagePickerController/issues/1547)
**3.7.1 修复iOS15.2下初次授权相册权限时的长时间卡顿&白屏问题** [#1547](https://github.com/banchichen/TZImagePickerController/issues/1547)
**3.6.7 修复Xcode13&iOS15下导航栏颜色异常问题**
3.6.2 新增allowEditVideo,单选视频时支持裁剪
3.6.0 修复iOS14下iCloud视频导出失败问题
......
Pod::Spec.new do |s|
s.name = "TZImagePickerController"
s.version = "3.7.0"
s.version = "3.7.1"
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 = "8.0"
s.source = { :git => "https://github.com/banchichen/TZImagePickerController.git", :tag => "3.7.0" }
s.source = { :git => "https://github.com/banchichen/TZImagePickerController.git", :tag => "3.7.1" }
s.requires_arc = true
s.resources = "TZImagePickerController/TZImagePickerController/*.{png,bundle}"
s.source_files = "TZImagePickerController/TZImagePickerController/*.{h,m}"
......
......@@ -823,7 +823,7 @@
INFOPLIST_FILE = TZImagePickerController/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 3.7.0;
MARKETING_VERSION = 3.7.1;
PRODUCT_BUNDLE_IDENTIFIER = tanzhenios2021.TZImagePickerController.www;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
......@@ -847,7 +847,7 @@
INFOPLIST_FILE = TZImagePickerController/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 3.7.0;
MARKETING_VERSION = 3.7.1;
PRODUCT_BUNDLE_IDENTIFIER = tanzhenios2021.TZImagePickerController.www;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
......@@ -934,7 +934,7 @@
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MARKETING_VERSION = 3.7.0;
MARKETING_VERSION = 3.7.1;
OTHER_LDFLAGS = "-all_load";
PRODUCT_BUNDLE_IDENTIFIER = tanzhen.TZImagePickerControllerFramework;
PRODUCT_NAME = TZImagePickerController;
......@@ -975,7 +975,7 @@
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MARKETING_VERSION = 3.7.0;
MARKETING_VERSION = 3.7.1;
OTHER_LDFLAGS = "-all_load";
PRODUCT_BUNDLE_IDENTIFIER = tanzhen.TZImagePickerControllerFramework;
PRODUCT_NAME = TZImagePickerController;
......
......@@ -4,7 +4,7 @@
//
// Created by 谭真 on 15/12/24.
// Copyright © 2015年 谭真. All rights reserved.
// version 3.7.0 - 2021.12.27
// version 3.7.1 - 2022.01.07
// 更多信息,请前往项目的github地址:https://github.com/banchichen/TZImagePickerController
/*
......
......@@ -4,7 +4,7 @@
//
// Created by 谭真 on 15/12/24.
// Copyright © 2015年 谭真. All rights reserved.
// version 3.7.0 - 2021.12.27
// version 3.7.1 - 2022.01.07
// 更多信息,请前往项目的github地址:https://github.com/banchichen/TZImagePickerController
#import "TZImagePickerController.h"
......
......@@ -148,7 +148,7 @@ static CGFloat itemMargin = 5;
self->_collectionView.hidden = YES;
[self configBottomToolBar];
[self scrollCollectionViewToBottom];
[self prepareScrollCollectionViewToBottom];
});
}
......@@ -841,9 +841,25 @@ static CGFloat itemMargin = 5;
}];
}
- (void)prepareScrollCollectionViewToBottom {
if (_shouldScrollToBottom && _models.count > 0) {
// try fix #1562:https://github.com/banchichen/TZImagePickerController/issues/1562
if (@available(iOS 15.0, *)) {
[_collectionView performBatchUpdates:^{} completion:^(BOOL finished) {
[self scrollCollectionViewToBottom];
}];
} else {
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.01 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
[self scrollCollectionViewToBottom];
});
}
} else {
_collectionView.hidden = NO;
}
}
- (void)scrollCollectionViewToBottom {
TZImagePickerController *tzImagePickerVc = (TZImagePickerController *)self.navigationController;
if (_shouldScrollToBottom && _models.count > 0) {
NSInteger item = 0;
if (tzImagePickerVc.sortAscendingByModificationDate) {
item = _models.count - 1;
......@@ -851,14 +867,9 @@ static CGFloat itemMargin = 5;
item += 1;
}
}
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.01 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
[self->_collectionView scrollToItemAtIndexPath:[NSIndexPath indexPathForItem:item inSection:0] atScrollPosition:UICollectionViewScrollPositionBottom animated:NO];
self->_shouldScrollToBottom = NO;
self->_collectionView.hidden = NO;
});
} else {
_collectionView.hidden = NO;
}
}
- (void)checkSelectedModels {
......@@ -990,7 +1001,7 @@ static CGFloat itemMargin = 5;
[_collectionView reloadData];
_shouldScrollToBottom = YES;
[self scrollCollectionViewToBottom];
[self prepareScrollCollectionViewToBottom];
}
- (void)imagePickerControllerDidCancel:(UIImagePickerController *)picker {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment