Commit 4563ebd9 authored by banchichen's avatar banchichen

优化裁剪状态下,拍照的逻辑

parent e7829894
...@@ -454,7 +454,6 @@ static CGSize AssetGridThumbnailSize; ...@@ -454,7 +454,6 @@ static CGSize AssetGridThumbnailSize;
if(iOS8Later) { if(iOS8Later) {
_imagePickerVc.modalPresentationStyle = UIModalPresentationOverCurrentContext; _imagePickerVc.modalPresentationStyle = UIModalPresentationOverCurrentContext;
} }
self.imagePickerVc.allowsEditing = tzImagePickerVc.allowCrop;
[self presentViewController:_imagePickerVc animated:YES completion:nil]; [self presentViewController:_imagePickerVc animated:YES completion:nil];
} else { } else {
NSLog(@"模拟器中无法打开照相机,请在真机中使用"); NSLog(@"模拟器中无法打开照相机,请在真机中使用");
...@@ -571,12 +570,7 @@ static CGSize AssetGridThumbnailSize; ...@@ -571,12 +570,7 @@ static CGSize AssetGridThumbnailSize;
if ([type isEqualToString:@"public.image"]) { if ([type isEqualToString:@"public.image"]) {
TZImagePickerController *imagePickerVc = (TZImagePickerController *)self.navigationController; TZImagePickerController *imagePickerVc = (TZImagePickerController *)self.navigationController;
[imagePickerVc showProgressHUD]; [imagePickerVc showProgressHUD];
UIImage *image; UIImage *image = [info objectForKey:UIImagePickerControllerOriginalImage];
if (imagePickerVc.allowCrop) {
image = [info objectForKey:UIImagePickerControllerEditedImage];
} else {
image = [info objectForKey:UIImagePickerControllerOriginalImage];
}
if (image) { if (image) {
[[TZImageManager manager] savePhotoWithImage:image completion:^(NSError *error){ [[TZImageManager manager] savePhotoWithImage:image completion:^(NSError *error){
if (!error) { if (!error) {
...@@ -604,8 +598,16 @@ static CGSize AssetGridThumbnailSize; ...@@ -604,8 +598,16 @@ static CGSize AssetGridThumbnailSize;
} }
if (tzImagePickerVc.maxImagesCount <= 1) { if (tzImagePickerVc.maxImagesCount <= 1) {
if (tzImagePickerVc.allowCrop) {
TZPhotoPreviewController *photoPreviewVc = [[TZPhotoPreviewController alloc] init];
photoPreviewVc.currentIndex = _models.count - 1;
photoPreviewVc.models = _models;
[self pushPhotoPrevireViewController:photoPreviewVc];
} else {
[tzImagePickerVc.selectedModels addObject:assetModel]; [tzImagePickerVc.selectedModels addObject:assetModel];
[self doneButtonClick]; return; [self doneButtonClick];
}
return;
} }
if (tzImagePickerVc.selectedModels.count < tzImagePickerVc.maxImagesCount) { if (tzImagePickerVc.selectedModels.count < tzImagePickerVc.maxImagesCount) {
......
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