Skip to content

GitLab

D
dz_TZImagePickerController
Commit cd23cfaa authored by yuzheng.tz's avatar yuzheng.tz
Browse files
Options

修复特定条件下拍摄一个视频后走到照片回调的问题，发布2.2.5版本

parent 8288f1ca
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 15 deletions
README.md
View file @ cd23cfaa
......@@ -10,7 +10,7 @@
## 重要提示2：issue未说明下面必要情况的不予处理：1、我的demo是否正常？ 2、你用的什么版本？ 3、你的初始化TZImagePicker的代码 4、你是pod安装还是源码导入的？是否有改动TZImagePicker内部代码？
## 重要提示3：1.9.0版本后移除了"prefs:root="的调用，这个API已经被列为私有API，请大家尽快升级。目前最新版本2.2.4
## 重要提示3：1.9.0版本后移除了"prefs:root="的调用，这个API已经被列为私有API，请大家尽快升级。目前最新版本2.2.5
关于升级iOS10和Xcdoe8的提示:
在Xcode8环境下将项目运行在iOS10的设备/模拟器中，访问相册和相机需要额外配置info.plist文件。分别是Privacy - Photo Library Usage Description和Privacy - Camera Usage Description字段，详见Demo中info.plist中的设置。
......@@ -114,7 +114,7 @@ A：是否有集成GKNavigationBarViewController？需要升级到2.0.4及以上
## 六. Release Notes 最近更新
2.2.4 修复minPhotoWidthSelectable不生效的问题， 使用@available消除警告
2.2.5 修复minPhotoWidthSelectable不生效的问题， 使用@available消除警告
2.1.8 优化gif图播放的体验，加入iCloud同步进度条；新增notScaleImage属性，设置为YES时内部不去缩放图片
2.1.6 新增allowCameraLocation属性，默认为YES，置为NO时不会在照相/摄像时定位，修复一个序号紊乱的bug
2.1.5 修复开启showSelectedIndex后照片列表页iCloud图片进度条紊乱的bug
......
TZImagePickerController.podspec
View file @ cd23cfaa
Pod::Spec.new do |s|
s.name = "TZImagePickerController"
s.version = "2.2.4"
s.version = "2.2.5"
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 => "2.2.4" }
s.source = { :git => "https://github.com/banchichen/TZImagePickerController.git", :tag => "2.2.5" }
s.requires_arc = true
s.resources = "TZImagePickerController/TZImagePickerController/*.{png,bundle}"
s.source_files = "TZImagePickerController/TZImagePickerController/*.{h,m}"
......
TZImagePickerController/Info.plist
View file @ cd23cfaa
......@@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>2.2.4</string>
<string>2.2.5</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
......
TZImagePickerController/TZImagePickerController/TZImageManager.h
View file @ cd23cfaa
......@@ -114,6 +114,9 @@
/// 缩放图片至新尺寸
- (UIImage *)scaleImage:(UIImage *)image toSize:(CGSize)size;
/// 判断asset是否是视频
- (BOOL)isVideo:(id)asset;
@end
//@interface TZSortDescriptor : NSSortDescriptor
......
TZImagePickerController/TZImagePickerController/TZImageManager.m
View file @ cd23cfaa
......@@ -1047,6 +1047,18 @@ static dispatch_once_t onceToken;
}
}
/// 判断asset是否是视频
- (BOOL)isVideo:(id)asset {
if (iOS8Later) {
PHAsset *phAsset = asset;
return phAsset.mediaType == PHAssetMediaTypeVideo;
} else {
ALAsset *alAsset = asset;
NSString *alAssetType = [[alAsset valueForProperty:ALAssetPropertyType] stringValue];
return [alAssetType isEqualToString:ALAssetTypeVideo];
}
}
- (ALAssetOrientation)orientationFromImage:(UIImage *)image {
NSInteger orientation = image.imageOrientation;
return orientation;
......
TZImagePickerController/TZImagePickerController/TZImagePickerController.h
View file @ cd23cfaa
......@@ -4,7 +4,7 @@
//
// Created by 谭真 on 15/12/24.
// Copyright © 2015年 谭真. All rights reserved.
// version 2.2.4 - 2018.08.03
// version 2.2.5 - 2018.08.10
// 更多信息，请前往项目的github地址：https://github.com/banchichen/TZImagePickerController
/*
......
TZImagePickerController/TZImagePickerController/TZImagePickerController.m
View file @ cd23cfaa
......@@ -4,7 +4,7 @@
//
// Created by 谭真 on 15/12/24.
// Copyright © 2015年 谭真. All rights reserved.
// version 2.2.4 - 2018.08.03
// version 2.2.5 - 2018.08.10
// 更多信息，请前往项目的github地址：https://github.com/banchichen/TZImagePickerController
#import "TZImagePickerController.h"
......
TZImagePickerController/TZImagePickerController/TZPhotoPickerController.m
View file @ cd23cfaa
......@@ -436,14 +436,16 @@ static CGFloat itemMargin = 5;
- (void)callDelegateMethodWithPhotos:(NSArray *)photos assets:(NSArray *)assets infoArr:(NSArray *)infoArr {
TZImagePickerController *tzImagePickerVc = (TZImagePickerController *)self.navigationController;
if (!tzImagePickerVc.allowPickingImage && tzImagePickerVc.allowPickingVideo && tzImagePickerVc.maxImagesCount == 1) {
if ([tzImagePickerVc.pickerDelegate respondsToSelector:@selector(imagePickerController:didFinishPickingVideo:sourceAssets:)]) {
[tzImagePickerVc.pickerDelegate imagePickerController:tzImagePickerVc didFinishPickingVideo:[photos firstObject] sourceAssets:[assets firstObject]];
}
if (tzImagePickerVc.didFinishPickingVideoHandle) {
tzImagePickerVc.didFinishPickingVideoHandle([photos firstObject], [assets firstObject]);
if (tzImagePickerVc.allowPickingVideo && tzImagePickerVc.maxImagesCount == 1) {
if ([[TZImageManager manager] isVideo:[assets firstObject]]) {
if ([tzImagePickerVc.pickerDelegate respondsToSelector:@selector(imagePickerController:didFinishPickingVideo:sourceAssets:)]) {
[tzImagePickerVc.pickerDelegate imagePickerController:tzImagePickerVc didFinishPickingVideo:[photos firstObject] sourceAssets:[assets firstObject]];
}
if (tzImagePickerVc.didFinishPickingVideoHandle) {
tzImagePickerVc.didFinishPickingVideoHandle([photos firstObject], [assets firstObject]);
}
return;
}
return;
}
if ([tzImagePickerVc.pickerDelegate respondsToSelector:@selector(imagePickerController:didFinishPickingPhotos:sourceAssets:isSelectOriginalPhoto:)]) {
......
TZImagePickerControllerFramework/Info.plist
View file @ cd23cfaa
......@@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>2.2.4</string>
<string>2.2.5</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSPrincipalClass</key>
......
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