Skip to content

GitLab

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

优化保存照片、视频的方法，发布3.0.2版本

parent 82742827
Hide whitespace changes
Inline Side-by-side
Showing with 98 additions and 104 deletions
README.md
View file @ 8d9198ed
......@@ -120,7 +120,8 @@ A：视频导出分两步，第一步是通过PHAsset获取AVURLAsset，如是iC
## 六. Release Notes 最近更新
3.0.1 新增对[TZImagePreviewController](https://github.com/banchichen/TZImagePreviewController)库的支持，允许预览UIImage、NSURL、PHAsset对象。
3.0.2 优化保存照片、视频的方法
3.0.1 新增对[TZImagePreviewController](https://github.com/banchichen/TZImagePreviewController)库的支持，允许预览UIImage、NSURL、PHAsset对象
**3.0.0 去除iOS6和7的适配代码，更轻量，最低支持iOS8**
2.2.6 新增needFixComposition属性，默认为NO，不再主动修正视频转向，防止部分安卓拍的视频导出失败（**最后一个支持iOS6和7的版本**）
2.1.5 修复开启showSelectedIndex后照片列表页iCloud图片进度条紊乱的bug
......
TZImagePickerController.podspec
View file @ 8d9198ed
Pod::Spec.new do |s|
s.name = "TZImagePickerController"
s.version = "3.0.1"
s.version = "3.0.2"
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.0.1" }
s.source = { :git => "https://github.com/banchichen/TZImagePickerController.git", :tag => "3.0.2" }
s.requires_arc = true
s.resources = "TZImagePickerController/TZImagePickerController/*.{png,bundle}"
s.source_files = "TZImagePickerController/TZImagePickerController/*.{h,m}"
......
TZImagePickerController/Info.plist
View file @ 8d9198ed
......@@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>3.0.1</string>
<string>3.0.2</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
......
TZImagePickerController/TZImagePickerController/TZImageManager.h
View file @ 8d9198ed
......@@ -75,12 +75,12 @@
- (void)getOriginalPhotoDataWithAsset:(PHAsset *)asset progressHandler:(void (^)(double progress, NSError *error, BOOL *stop, NSDictionary *info))progressHandler completion:(void (^)(NSData *data,NSDictionary *info,BOOL isDegraded))completion;
/// Save photo 保存照片
- (void)savePhotoWithImage:(UIImage *)image completion:(void (^)(NSError *error))completion;
- (void)savePhotoWithImage:(UIImage *)image location:(CLLocation *)location completion:(void (^)(NSError *error))completion;
- (void)savePhotoWithImage:(UIImage *)image completion:(void (^)(PHAsset *asset, NSError *error))completion;
- (void)savePhotoWithImage:(UIImage *)image location:(CLLocation *)location completion:(void (^)(PHAsset *asset, NSError *error))completion;
/// Save video 保存视频
- (void)saveVideoWithUrl:(NSURL *)url completion:(void (^)(NSError *error))completion;
- (void)saveVideoWithUrl:(NSURL *)url location:(CLLocation *)location completion:(void (^)(NSError *error))completion;
- (void)saveVideoWithUrl:(NSURL *)url completion:(void (^)(PHAsset *asset, NSError *error))completion;
- (void)saveVideoWithUrl:(NSURL *)url location:(CLLocation *)location completion:(void (^)(PHAsset *asset, NSError *error))completion;
/// Get video 获得视频
- (void)getVideoWithAsset:(PHAsset *)asset completion:(void (^)(AVPlayerItem * playerItem, NSDictionary * info))completion;
......@@ -114,6 +114,8 @@
/// for TZImagePreviewController
- (NSString *)getNewTimeFromDurationSecond:(NSInteger)duration;
- (TZAssetModel *)createModelWithAsset:(PHAsset *)asset;
@end
//@interface TZSortDescriptor : NSSortDescriptor
......
TZImagePickerController/TZImagePickerController/TZImageManager.m
View file @ 8d9198ed
......@@ -457,17 +457,19 @@ static dispatch_once_t onceToken;
#pragma mark - Save photo
- (void)savePhotoWithImage:(UIImage *)image completion:(void (^)(NSError *error))completion {
- (void)savePhotoWithImage:(UIImage *)image completion:(void (^)(PHAsset *asset, NSError *error))completion {
[self savePhotoWithImage:image location:nil completion:completion];
}
- (void)savePhotoWithImage:(UIImage *)image location:(CLLocation *)location completion:(void (^)(NSError *error))completion {
- (void)savePhotoWithImage:(UIImage *)image location:(CLLocation *)location completion:(void (^)(PHAsset *asset, NSError *error))completion {
__block NSString *localIdentifier = nil;
[[PHPhotoLibrary sharedPhotoLibrary] performChanges:^{
if (@available(iOS 9, *)) {
NSData *data = UIImageJPEGRepresentation(image, 0.9);
PHAssetResourceCreationOptions *options = [[PHAssetResourceCreationOptions alloc] init];
options.shouldMoveFile = YES;
PHAssetCreationRequest *request = [PHAssetCreationRequest creationRequestForAsset];
localIdentifier = request.placeholderForCreatedAsset.localIdentifier;
[request addResourceWithType:PHAssetResourceTypePhoto data:data options:options];
if (location) {
request.location = location;
......@@ -475,6 +477,7 @@ static dispatch_once_t onceToken;
request.creationDate = [NSDate date];
} else {
PHAssetChangeRequest *request = [PHAssetChangeRequest creationRequestForAssetFromImage:image];
localIdentifier = request.placeholderForCreatedAsset.localIdentifier;
if (location) {
request.location = location;
}
......@@ -483,11 +486,12 @@ static dispatch_once_t onceToken;
} completionHandler:^(BOOL success, NSError *error) {
dispatch_async(dispatch_get_main_queue(), ^{
if (success && completion) {
completion(nil);
PHAsset *asset = [[PHAsset fetchAssetsWithLocalIdentifiers:@[localIdentifier] options:nil] firstObject];
completion(asset, nil);
} else if (error) {
NSLog(@"保存照片出错:%@",error.localizedDescription);
if (completion) {
completion(error);
completion(nil, error);
}
}
});
......@@ -496,16 +500,18 @@ static dispatch_once_t onceToken;
#pragma mark - Save video
- (void)saveVideoWithUrl:(NSURL *)url completion:(void (^)(NSError *error))completion {
- (void)saveVideoWithUrl:(NSURL *)url completion:(void (^)(PHAsset *asset, NSError *error))completion {
[self saveVideoWithUrl:url location:nil completion:completion];
}
- (void)saveVideoWithUrl:(NSURL *)url location:(CLLocation *)location completion:(void (^)(NSError *error))completion {
- (void)saveVideoWithUrl:(NSURL *)url location:(CLLocation *)location completion:(void (^)(PHAsset *asset, NSError *error))completion {
__block NSString *localIdentifier = nil;
[[PHPhotoLibrary sharedPhotoLibrary] performChanges:^{
if (@available(iOS 9, *)) {
PHAssetResourceCreationOptions *options = [[PHAssetResourceCreationOptions alloc] init];
options.shouldMoveFile = YES;
PHAssetCreationRequest *request = [PHAssetCreationRequest creationRequestForAsset];
localIdentifier = request.placeholderForCreatedAsset.localIdentifier;
[request addResourceWithType:PHAssetResourceTypeVideo fileURL:url options:options];
if (location) {
request.location = location;
......@@ -513,6 +519,7 @@ static dispatch_once_t onceToken;
request.creationDate = [NSDate date];
} else {
PHAssetChangeRequest *request = [PHAssetChangeRequest creationRequestForAssetFromVideoAtFileURL:url];
localIdentifier = request.placeholderForCreatedAsset.localIdentifier;
if (location) {
request.location = location;
}
......@@ -521,11 +528,12 @@ static dispatch_once_t onceToken;
} completionHandler:^(BOOL success, NSError *error) {
dispatch_async(dispatch_get_main_queue(), ^{
if (success && completion) {
completion(nil);
PHAsset *asset = [[PHAsset fetchAssetsWithLocalIdentifiers:@[localIdentifier] options:nil] firstObject];
completion(asset, nil);
} else if (error) {
NSLog(@"保存视频出错:%@",error.localizedDescription);
if (completion) {
completion(error);
completion(nil, error);
}
}
});
......@@ -734,6 +742,14 @@ static dispatch_once_t onceToken;
return asset.mediaType == PHAssetMediaTypeVideo;
}
- (TZAssetModel *)createModelWithAsset:(PHAsset *)asset {
TZAssetModelMediaType type = [[TZImageManager manager] getAssetType:asset];
NSString *timeLength = type == TZAssetModelMediaTypeVideo ? [NSString stringWithFormat:@"%0.0f",asset.duration] : @"";
timeLength = [[TZImageManager manager] getNewTimeFromDurationSecond:timeLength.integerValue];
TZAssetModel *model = [TZAssetModel modelWithAsset:asset type:type timeLength:timeLength];
return model;
}
/// 获取优化后的视频转向信息
- (AVMutableVideoComposition *)fixedCompositionWithAsset:(AVAsset *)videoAsset {
AVMutableVideoComposition *videoComposition = [AVMutableVideoComposition videoComposition];
......
TZImagePickerController/TZImagePickerController/TZImagePickerController.h
View file @ 8d9198ed
......@@ -4,7 +4,7 @@
//
// Created by 谭真 on 15/12/24.
// Copyright © 2015年 谭真. All rights reserved.
// version 3.0.1 - 2018.08.27
// version 3.0.2 - 2018.08.28
// 更多信息，请前往项目的github地址：https://github.com/banchichen/TZImagePickerController
/*
......
TZImagePickerController/TZImagePickerController/TZImagePickerController.m
View file @ 8d9198ed
......@@ -4,7 +4,7 @@
//
// Created by 谭真 on 15/12/24.
// Copyright © 2015年 谭真. All rights reserved.
// version 3.0.1 - 2018.08.27
// version 3.0.2 - 2018.08.28
// 更多信息，请前往项目的github地址：https://github.com/banchichen/TZImagePickerController
#import "TZImagePickerController.h"
......
TZImagePickerController/TZImagePickerController/TZPhotoPickerController.m
View file @ 8d9198ed
......@@ -787,9 +787,9 @@ static CGFloat itemMargin = 5;
[imagePickerVc showProgressHUD];
UIImage *photo = [info objectForKey:UIImagePickerControllerOriginalImage];
if (photo) {
[[TZImageManager manager] savePhotoWithImage:photo location:self.location completion:^(NSError *error){
[[TZImageManager manager] savePhotoWithImage:photo location:self.location completion:^(PHAsset *asset, NSError *error){
if (!error) {
[self reloadPhotoArrayWithMediaType:type];
[self addPHAsset:asset];
}
}];
self.location = nil;
......@@ -799,9 +799,9 @@ static CGFloat itemMargin = 5;
[imagePickerVc showProgressHUD];
NSURL *videoUrl = [info objectForKey:UIImagePickerControllerMediaURL];
if (videoUrl) {
[[TZImageManager manager] saveVideoWithUrl:videoUrl location:self.location completion:^(NSError *error) {
[[TZImageManager manager] saveVideoWithUrl:videoUrl location:self.location completion:^(PHAsset *asset, NSError *error) {
if (!error) {
[self reloadPhotoArrayWithMediaType:type];
[self addPHAsset:asset];
}
}];
self.location = nil;
......@@ -809,55 +809,47 @@ static CGFloat itemMargin = 5;
}
}
- (void)reloadPhotoArrayWithMediaType:(NSString *)mediaType {
- (void)addPHAsset:(PHAsset *)asset {
TZAssetModel *assetModel = [[TZImageManager manager] createModelWithAsset:asset];
TZImagePickerController *tzImagePickerVc = (TZImagePickerController *)self.navigationController;
[[TZImageManager manager] getCameraRollAlbum:tzImagePickerVc.allowPickingVideo allowPickingImage:tzImagePickerVc.allowPickingImage needFetchAssets:NO completion:^(TZAlbumModel *model) {
self->_model = model;
[[TZImageManager manager] getAssetsFromFetchResult:self->_model.result completion:^(NSArray<TZAssetModel *> *models) {
[tzImagePickerVc hideProgressHUD];
TZAssetModel *assetModel;
[tzImagePickerVc hideProgressHUD];
if (tzImagePickerVc.sortAscendingByModificationDate) {
[_models addObject:assetModel];
} else {
[_models insertObject:assetModel atIndex:0];
}
if (tzImagePickerVc.maxImagesCount <= 1) {
if (tzImagePickerVc.allowCrop && asset.mediaType == PHAssetMediaTypeImage) {
TZPhotoPreviewController *photoPreviewVc = [[TZPhotoPreviewController alloc] init];
if (tzImagePickerVc.sortAscendingByModificationDate) {
assetModel = [models lastObject];
[self->_models addObject:assetModel];
photoPreviewVc.currentIndex = _models.count - 1;
} else {
assetModel = [models firstObject];
[self->_models insertObject:assetModel atIndex:0];
photoPreviewVc.currentIndex = 0;
}
if (tzImagePickerVc.maxImagesCount <= 1) {
if (tzImagePickerVc.allowCrop) {
TZPhotoPreviewController *photoPreviewVc = [[TZPhotoPreviewController alloc] init];
if (tzImagePickerVc.sortAscendingByModificationDate) {
photoPreviewVc.currentIndex = self->_models.count - 1;
} else {
photoPreviewVc.currentIndex = 0;
}
photoPreviewVc.models = self->_models;
[self pushPhotoPrevireViewController:photoPreviewVc];
} else {
[tzImagePickerVc addSelectedModel:assetModel];
[self doneButtonClick];
}
return;
}
if (tzImagePickerVc.selectedModels.count < tzImagePickerVc.maxImagesCount) {
if ([mediaType isEqualToString:@"public.movie"] && !tzImagePickerVc.allowPickingMultipleVideo) {
// 不能多选视频的情况下，不选中拍摄的视频
} else {
assetModel.isSelected = YES;
[tzImagePickerVc addSelectedModel:assetModel];
[self refreshBottomToolBarStatus];
}
}
self->_collectionView.hidden = YES;
[self->_collectionView reloadData];
self->_shouldScrollToBottom = YES;
[self scrollCollectionViewToBottom];
}];
}];
photoPreviewVc.models = _models;
[self pushPhotoPrevireViewController:photoPreviewVc];
} else {
[tzImagePickerVc addSelectedModel:assetModel];
[self doneButtonClick];
}
return;
}
if (tzImagePickerVc.selectedModels.count < tzImagePickerVc.maxImagesCount) {
if (assetModel.type == TZAssetModelMediaTypeVideo && !tzImagePickerVc.allowPickingMultipleVideo) {
// 不能多选视频的情况下，不选中拍摄的视频
} else {
assetModel.isSelected = YES;
[tzImagePickerVc addSelectedModel:assetModel];
[self refreshBottomToolBarStatus];
}
}
_collectionView.hidden = YES;
[_collectionView reloadData];
_shouldScrollToBottom = YES;
[self scrollCollectionViewToBottom];
}
- (void)imagePickerControllerDidCancel:(UIImagePickerController *)picker {
......
TZImagePickerController/ViewController.m
View file @ 8d9198ed
......@@ -443,53 +443,36 @@
UIImage *image = [info objectForKey:UIImagePickerControllerOriginalImage];
// save photo and get asset / 保存图片，获取到asset
[[TZImageManager manager] savePhotoWithImage:image location:self.location completion:^(NSError *error){
[[TZImageManager manager] savePhotoWithImage:image location:self.location completion:^(PHAsset *asset, NSError *error){
[tzImagePickerVc hideProgressHUD];
if (error) {
[tzImagePickerVc hideProgressHUD];
NSLog(@"图片保存失败 %@",error);
} else {
[[TZImageManager manager] getCameraRollAlbum:NO allowPickingImage:YES needFetchAssets:NO completion:^(TZAlbumModel *model) {
[[TZImageManager manager] getAssetsFromFetchResult:model.result allowPickingVideo:NO allowPickingImage:YES completion:^(NSArray<TZAssetModel *> *models) {
[tzImagePickerVc hideProgressHUD];
TZAssetModel *assetModel = [models firstObject];
if (tzImagePickerVc.sortAscendingByModificationDate) {
assetModel = [models lastObject];
}
if (self.allowCropSwitch.isOn) { // 允许裁剪,去裁剪
TZImagePickerController *imagePicker = [[TZImagePickerController alloc] initCropTypeWithAsset:assetModel.asset photo:image completion:^(UIImage *cropImage, id asset) {
[self refreshCollectionViewWithAddedAsset:asset image:cropImage];
}];
imagePicker.needCircleCrop = self.needCircleCropSwitch.isOn;
imagePicker.circleCropRadius = 100;
[self presentViewController:imagePicker animated:YES completion:nil];
} else {
[self refreshCollectionViewWithAddedAsset:assetModel.asset image:image];
}
TZAssetModel *assetModel = [[TZImageManager manager] createModelWithAsset:asset];
if (self.allowCropSwitch.isOn) { // 允许裁剪,去裁剪
TZImagePickerController *imagePicker = [[TZImagePickerController alloc] initCropTypeWithAsset:assetModel.asset photo:image completion:^(UIImage *cropImage, id asset) {
[self refreshCollectionViewWithAddedAsset:asset image:cropImage];
}];
}];
imagePicker.needCircleCrop = self.needCircleCropSwitch.isOn;
imagePicker.circleCropRadius = 100;
[self presentViewController:imagePicker animated:YES completion:nil];
} else {
[self refreshCollectionViewWithAddedAsset:assetModel.asset image:image];
}
}
}];
} else if ([type isEqualToString:@"public.movie"]) {
NSURL *videoUrl = [info objectForKey:UIImagePickerControllerMediaURL];
if (videoUrl) {
[[TZImageManager manager] saveVideoWithUrl:videoUrl location:self.location completion:^(NSError *error) {
[[TZImageManager manager] saveVideoWithUrl:videoUrl location:self.location completion:^(PHAsset *asset, NSError *error) {
[tzImagePickerVc hideProgressHUD];
if (!error) {
[[TZImageManager manager] getCameraRollAlbum:YES allowPickingImage:NO needFetchAssets:NO completion:^(TZAlbumModel *model) {
[[TZImageManager manager] getAssetsFromFetchResult:model.result allowPickingVideo:YES allowPickingImage:NO completion:^(NSArray<TZAssetModel *> *models) {
[tzImagePickerVc hideProgressHUD];
TZAssetModel *assetModel = [models firstObject];
if (tzImagePickerVc.sortAscendingByModificationDate) {
assetModel = [models lastObject];
}
[[TZImageManager manager] getPhotoWithAsset:assetModel.asset completion:^(UIImage *photo, NSDictionary *info, BOOL isDegraded) {
if (!isDegraded && photo) {
[self refreshCollectionViewWithAddedAsset:assetModel.asset image:photo];
}
}];
}];
TZAssetModel *assetModel = [[TZImageManager manager] createModelWithAsset:asset];
[[TZImageManager manager] getPhotoWithAsset:assetModel.asset completion:^(UIImage *photo, NSDictionary *info, BOOL isDegraded) {
if (!isDegraded && photo) {
[self refreshCollectionViewWithAddedAsset:assetModel.asset image:photo];
}
}];
} else {
[tzImagePickerVc hideProgressHUD];
}
}];
}
......
TZImagePickerControllerFramework/Info.plist
View file @ 8d9198ed
......@@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>3.0.1</string>
<string>3.0.2</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