Commit fb2980d2 authored by yuzheng.tz's avatar yuzheng.tz

不能多选视频的情况下,不选中拍摄的视频,发布2.1.0.3版本

parent 37dc1af9
...@@ -93,7 +93,7 @@ A:1.8.4版本已支持 ...@@ -93,7 +93,7 @@ A:1.8.4版本已支持
A:考虑下,优先级低 A:考虑下,优先级低
最近更新 最近更新
2.1.0.2 新增拍摄视频功能,优化一些细节 2.1.0.3 新增拍摄视频功能,优化一些细节
2.0.1 修复一些bug 2.0.1 修复一些bug
2.0.0.6 优化自定义languageBundle的支持,加入使用示例 2.0.0.6 优化自定义languageBundle的支持,加入使用示例
2.0.0.5 优化性能,提高选择器打开速度,新增越南语支持 2.0.0.5 优化性能,提高选择器打开速度,新增越南语支持
......
Pod::Spec.new do |s| Pod::Spec.new do |s|
s.name = "TZImagePickerController" s.name = "TZImagePickerController"
s.version = "2.1.0.2" s.version = "2.1.0.3"
s.summary = "A clone of UIImagePickerController, support picking multiple photos、original photo and video" s.summary = "A clone of UIImagePickerController, support picking multiple photos、original photo and video"
s.homepage = "https://github.com/banchichen/TZImagePickerController" s.homepage = "https://github.com/banchichen/TZImagePickerController"
s.license = "MIT" s.license = "MIT"
s.author = { "banchichen" => "tanzhenios@foxmail.com" } s.author = { "banchichen" => "tanzhenios@foxmail.com" }
s.platform = :ios s.platform = :ios
s.ios.deployment_target = "6.0" s.ios.deployment_target = "6.0"
s.source = { :git => "https://github.com/banchichen/TZImagePickerController.git", :tag => "2.1.0.2" } s.source = { :git => "https://github.com/banchichen/TZImagePickerController.git", :tag => "2.1.0.3" }
s.requires_arc = true s.requires_arc = true
s.resources = "TZImagePickerController/TZImagePickerController/*.{png,bundle}" s.resources = "TZImagePickerController/TZImagePickerController/*.{png,bundle}"
s.source_files = "TZImagePickerController/TZImagePickerController/*.{h,m}" s.source_files = "TZImagePickerController/TZImagePickerController/*.{h,m}"
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
// //
// Created by 谭真 on 15/12/24. // Created by 谭真 on 15/12/24.
// Copyright © 2015年 谭真. All rights reserved. // Copyright © 2015年 谭真. All rights reserved.
// version 2.1.0.2 - 2018.04.25 // version 2.1.0.3 - 2018.05.01
// 更多信息,请前往项目的github地址:https://github.com/banchichen/TZImagePickerController // 更多信息,请前往项目的github地址:https://github.com/banchichen/TZImagePickerController
/* /*
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
// //
// Created by 谭真 on 15/12/24. // Created by 谭真 on 15/12/24.
// Copyright © 2015年 谭真. All rights reserved. // Copyright © 2015年 谭真. All rights reserved.
// version 2.1.0.2 - 2018.04.25 // version 2.1.0.3 - 2018.05.01
// 更多信息,请前往项目的github地址:https://github.com/banchichen/TZImagePickerController // 更多信息,请前往项目的github地址:https://github.com/banchichen/TZImagePickerController
#import "TZImagePickerController.h" #import "TZImagePickerController.h"
......
...@@ -741,7 +741,7 @@ static CGFloat itemMargin = 5; ...@@ -741,7 +741,7 @@ static CGFloat itemMargin = 5;
if (photo) { if (photo) {
[[TZImageManager manager] savePhotoWithImage:photo location:self.location completion:^(NSError *error){ [[TZImageManager manager] savePhotoWithImage:photo location:self.location completion:^(NSError *error){
if (!error) { if (!error) {
[self reloadPhotoArray]; [self reloadPhotoArrayWithMediaType:type];
} }
}]; }];
self.location = nil; self.location = nil;
...@@ -753,7 +753,7 @@ static CGFloat itemMargin = 5; ...@@ -753,7 +753,7 @@ static CGFloat itemMargin = 5;
if (videoUrl) { if (videoUrl) {
[[TZImageManager manager] saveVideoWithUrl:videoUrl location:self.location completion:^(NSError *error) { [[TZImageManager manager] saveVideoWithUrl:videoUrl location:self.location completion:^(NSError *error) {
if (!error) { if (!error) {
[self reloadPhotoArray]; [self reloadPhotoArrayWithMediaType:type];
} }
}]; }];
self.location = nil; self.location = nil;
...@@ -761,7 +761,7 @@ static CGFloat itemMargin = 5; ...@@ -761,7 +761,7 @@ static CGFloat itemMargin = 5;
} }
} }
- (void)reloadPhotoArray { - (void)reloadPhotoArrayWithMediaType:(NSString *)mediaType {
TZImagePickerController *tzImagePickerVc = (TZImagePickerController *)self.navigationController; TZImagePickerController *tzImagePickerVc = (TZImagePickerController *)self.navigationController;
[[TZImageManager manager] getCameraRollAlbum:tzImagePickerVc.allowPickingVideo allowPickingImage:tzImagePickerVc.allowPickingImage needFetchAssets:NO completion:^(TZAlbumModel *model) { [[TZImageManager manager] getCameraRollAlbum:tzImagePickerVc.allowPickingVideo allowPickingImage:tzImagePickerVc.allowPickingImage needFetchAssets:NO completion:^(TZAlbumModel *model) {
self->_model = model; self->_model = model;
...@@ -795,10 +795,14 @@ static CGFloat itemMargin = 5; ...@@ -795,10 +795,14 @@ static CGFloat itemMargin = 5;
} }
if (tzImagePickerVc.selectedModels.count < tzImagePickerVc.maxImagesCount) { if (tzImagePickerVc.selectedModels.count < tzImagePickerVc.maxImagesCount) {
if ([mediaType isEqualToString:@"public.movie"] && !tzImagePickerVc.allowPickingMultipleVideo) {
// 不能多选视频的情况下,不选中拍摄的视频
} else {
assetModel.isSelected = YES; assetModel.isSelected = YES;
[tzImagePickerVc.selectedModels addObject:assetModel]; [tzImagePickerVc.selectedModels addObject:assetModel];
[self refreshBottomToolBarStatus]; [self refreshBottomToolBarStatus];
} }
}
self->_collectionView.hidden = YES; self->_collectionView.hidden = YES;
[self->_collectionView reloadData]; [self->_collectionView reloadData];
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>FMWK</string> <string>FMWK</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>2.1.0.2</string> <string>2.1.0.3</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string> <string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSPrincipalClass</key> <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