MOD: 拆分图片预览与图片剪切功能

曾庆松 · 曾庆松 · commit 4114b1478002 · 2020-06-05T18:33:24.000+08:00
diff --git a/MYImagePicker/Classes/Feature/CropImage/MYImagePickerCropImageViewController.h b/MYImagePicker/Classes/Feature/CropImage/MYImagePickerCropImageViewController.h
@@ -28,6 +28,8 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, assign) NSInteger circleCropRadius;
 /// 是否图片等比缩放填充cropRect区域
 @property (nonatomic, assign) BOOL scaleAspectFillCrop;
+/// 裁剪回调
+@property (nonatomic, copy) void (^doneButtonClickBlockCropMode)(UIImage *cropedImage, id asset);
 
 - (instancetype)initWithModel:(MYAsset *)model;
 
diff --git a/MYImagePicker/Classes/Feature/CropImage/MYImagePickerCropImageViewController.m b/MYImagePicker/Classes/Feature/CropImage/MYImagePickerCropImageViewController.m
@@ -7,6 +7,8 @@
 
 #import "MYImagePickerCropImageViewController.h"
 
+#import "MYAsset.h"
+
 #import "MYImagePickerConfig.h"
 
 #import "MYImagePickerMacro.h"
@@ -15,6 +17,8 @@
 #import "UIView+MYImagePickerCrop.h"
 #import "UIViewController+MYImagePickerHUD.h"
 
+#import "MYImagePickerCropManager.h"
+
 #import "MYImagePickerPhotoPreviewView.h"
 #import "MYImagePickerViewController.h"
 
@@ -194,7 +198,18 @@ - (void)configCropView
 //MARK: - 事件响应
 - (void)onConfirmBtnClick:(UIButton *)sender
 {
+    sender.enabled = NO;
+    [self myp_showProgressHUD];
+    UIImage *cropedImage = [MYImagePickerCropManager cropImageView:self.previewView.imageView toRect:self.cropRect zoomScale:self.previewView.scrollView.zoomScale containerView:self.view];
+    if (self.needCircleCrop) {
+        cropedImage = [MYImagePickerCropManager circularClipImage:cropedImage];
+    }
     
+    sender.enabled = YES;
+    [self myp_hideProgressHUD];
+    if (self.doneButtonClickBlockCropMode) {
+        self.doneButtonClickBlockCropMode(cropedImage, self.model.asset);
+    }
 }
 
 //MARK: - 方法重载
diff --git a/MYImagePicker/Classes/Feature/ImageBrowser/View/MYImagePickerAssetPreviewCell.h b/MYImagePicker/Classes/Feature/ImageBrowser/View/MYImagePickerAssetPreviewCell.h
@@ -22,9 +22,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property (nonatomic, strong) MYAsset *model;
 @property (nonatomic, assign) NSInteger index;
-@property (nonatomic, assign) BOOL allowCrop;
-@property (nonatomic, assign) CGRect cropRect;
-@property (nonatomic, assign) BOOL scaleAspectFillCrop;
 
 - (void)updateSelectedStatus;
 
diff --git a/MYImagePicker/Classes/Feature/ImageBrowser/View/MYImagePickerAssetPreviewCell.m b/MYImagePicker/Classes/Feature/ImageBrowser/View/MYImagePickerAssetPreviewCell.m
@@ -39,6 +39,7 @@ - (void)layoutSubviews {
 
 - (void)configSubviews {
     self.previewView = [[MYImagePickerPhotoPreviewView alloc] initWithFrame:CGRectZero];
+    self.previewView.allowCrop = NO;
     [self.previewView setShowSelectBtn:YES];
     __weak typeof(self) weakSelf = self;
     [self.previewView setSingleTapGestureBlock:^{
@@ -73,21 +74,6 @@ - (void)recoverSubviews {
     [_previewView recoverSubviews];
 }
 
-- (void)setAllowCrop:(BOOL)allowCrop {
-    _allowCrop = allowCrop;
-    _previewView.allowCrop = allowCrop;
-}
-
-- (void)setScaleAspectFillCrop:(BOOL)scaleAspectFillCrop {
-    _scaleAspectFillCrop = scaleAspectFillCrop;
-    _previewView.scaleAspectFillCrop = scaleAspectFillCrop;
-}
-
-- (void)setCropRect:(CGRect)cropRect {
-    _cropRect = cropRect;
-    _previewView.cropRect = cropRect;
-}
-
 - (void)setIndex:(NSInteger)index
 {
     _index = index;
diff --git a/MYImagePicker/Classes/Feature/ImageBrowser/ViewController/MYImagePickerPhotoPreviewViewController.h b/MYImagePicker/Classes/Feature/ImageBrowser/ViewController/MYImagePickerPhotoPreviewViewController.h
@@ -26,22 +26,8 @@ NS_ASSUME_NONNULL_BEGIN
 /// 是否返回原图
 @property (nonatomic, assign) BOOL isSelectOriginalPhoto;
 
-/// 允许裁剪,默认为YES
-@property (nonatomic, assign) BOOL allowCrop;
-// 裁剪框的尺寸
-@property (nonatomic, assign) CGRect cropRect;
-/// 需要圆角裁剪框
-@property (nonatomic, assign) BOOL needCircleCrop;
-/// 圆角裁剪框半径大小
-@property (nonatomic, assign) NSInteger circleCropRadius;
-/// 是否图片等比缩放填充cropRect区域
-@property (nonatomic, assign) BOOL scaleAspectFillCrop;
-
 /// 返回最新的选中图片数组
 @property (nonatomic, copy) void (^backButtonClickBlock)(BOOL isSelectOriginalPhoto);
-/// 裁剪回调
-@property (nonatomic, copy) void (^doneButtonClickBlockCropMode)(UIImage *cropedImage, id asset);
-
 
 @end
 
diff --git a/MYImagePicker/Classes/Feature/ImageBrowser/ViewController/MYImagePickerPhotoPreviewViewController.m b/MYImagePicker/Classes/Feature/ImageBrowser/ViewController/MYImagePickerPhotoPreviewViewController.m
@@ -43,8 +43,6 @@ @interface MYImagePickerPhotoPreviewViewController ()<UICollectionViewDelegate,
 
 @implementation MYImagePickerPhotoPreviewViewController
 
-@synthesize cropRect = _cropRect;
-
 //MARK: - 生命周期
 - (instancetype)init
 {
@@ -78,8 +76,6 @@ - (void)viewDidLayoutSubviews
     _flowLayout.minimumLineSpacing = 0;
     _collectionView.frame = CGRectMake(-10, MY_IMG_Navigation_H, self.view.myp_width + 20, height);
     [_collectionView setCollectionViewLayout:_flowLayout];
-    
-    [self configCropView];
 }
 
 //MARK: - getter && setter
@@ -146,54 +142,13 @@ - (UIView *)cropBgView
     return _cropBgView;
 }
 
-- (CGRect)cropRect
-{
-    CGFloat screenHeight = [UIScreen mainScreen].bounds.size.height;
-    BOOL isFullScreen = self.view.myp_height == screenHeight;
-    if (isFullScreen) {
-        return _cropRect;
-    } else {
-        CGRect newCropRect = _cropRect;
-        newCropRect.origin.y -= ((screenHeight - self.view.myp_height) / 2);
-        return newCropRect;
-    }
-}
-
 //MARK: - 视图更新
 - (void)setupUI
 {
     [self.view addSubview:self.naviBar];
     [self.view addSubview:self.collectionView];
 }
 
-- (void)configCropView
-{
-    MYImagePickerConfig *config = self.imagePickerVC.config;
-    if (config.maxImagesCount <= 1 && config.allowCrop) {
-        if (self.circleCropRadius > 0) {
-            self.cropRect = CGRectMake(self.view.myp_width / 2 - _circleCropRadius, self.view.myp_height / 2 - _circleCropRadius, _circleCropRadius * 2, _circleCropRadius * 2);
-        }
-        
-        [self.cropView removeFromSuperview];
-        [self.cropBgView removeFromSuperview];
-        
-        [self.cropBgView setFrame:self.view.bounds];
-        [self.view addSubview:self.cropBgView];
-        [UIView my_overlayClippingWithView:self.cropBgView
-                                  cropRect:self.cropRect
-                             containerView:self.view
-                            needCircleCrop:self.needCircleCrop];
-        
-        [self.cropView setFrame:self.cropRect];
-        [self.view addSubview:self.cropView];
-        if (self.needCircleCrop) {
-            self.cropView.layer.cornerRadius = self.cropRect.size.width / 2;
-            [self.cropView setClipsToBounds:YES];
-        }
-        
-        [self.view bringSubviewToFront:self.naviBar];
-    }
-}
 
 //MARK: - UIScrollViewDelegate
 - (void)scrollViewDidScroll:(UIScrollView *)scrollView
@@ -222,9 +177,6 @@ - (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collection
 {
     MYAsset *model = [self.models objectAtIndex:indexPath.item];
     MYImagePickerAssetPreviewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:MYImagePickerPreviewPohotoReuseCellIdentifier forIndexPath:indexPath];
-    cell.allowCrop = self.allowCrop;
-    cell.cropRect = self.cropRect;
-    cell.scaleAspectFillCrop = self.scaleAspectFillCrop;
     [cell setIndex:[self.imagePickerVC.selectedAssetIds indexOfObject:model.asset.localIdentifier] + 1];
     __weak typeof(_imagePickerVC) weakImagePickerVC = _imagePickerVC;
     __weak typeof(cell) weakCell = cell;
@@ -279,13 +231,8 @@ - (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collection
 //MARK:  - 私有方法
 - (void)refershAssetSelectedStatus
 {
-    if (self.allowCrop && self.imagePickerVC.config.maxImagesCount <= 1) {
-        [self.naviBar.nextButton setHidden:NO];
-        [self.naviBar.nextButton setTitle:@"下一步" forState:UIControlStateNormal];
-    } else {
-        self.naviBar.nextButton.hidden = self.imagePickerVC.selectedModels.count <= 0;
-        [self.naviBar.nextButton setTitle:[NSString stringWithFormat:@"下一步(%zd)", self.imagePickerVC.selectedModels.count] forState:UIControlStateNormal];
-    }
+    self.naviBar.nextButton.hidden = self.imagePickerVC.selectedModels.count <= 0;
+    [self.naviBar.nextButton setTitle:[NSString stringWithFormat:@"下一步(%zd)", self.imagePickerVC.selectedModels.count] forState:UIControlStateNormal];
 }
 
 //MARK: - 弹窗
@@ -309,27 +256,8 @@ - (void)onBackButtonClick
 
 - (void)onDoneButtonClick:(UIButton *)sender
 {
-    //图片裁剪
-    NSIndexPath *indexPath = [NSIndexPath indexPathForItem:self.currentIndex inSection:0];
-    MYImagePickerAssetPreviewCell *cell = (MYImagePickerAssetPreviewCell *)[_collectionView cellForItemAtIndexPath:indexPath];
-    if (self.allowCrop && [cell isKindOfClass:[MYImagePickerAssetPreviewCell class]]) {
+    if ([self.imagePickerVC handleDoneButtonClick]) {
         sender.enabled = NO;
-        [self myp_showProgressHUD];
-        UIImage *cropedImage = [MYImagePickerCropManager cropImageView:cell.previewView.imageView toRect:self.cropRect zoomScale:cell.previewView.scrollView.zoomScale containerView:self.view];
-        if (self.needCircleCrop) {
-            cropedImage = [MYImagePickerCropManager circularClipImage:cropedImage];
-        }
-        
-        sender.enabled = YES;
-        [self myp_hideProgressHUD];
-        if (self.doneButtonClickBlockCropMode) {
-            MYAsset *model = self.models[self.currentIndex];
-            self.doneButtonClickBlockCropMode(cropedImage, model.asset);
-        }
-    } else {
-        if ([self.imagePickerVC handleDoneButtonClick]) {
-            sender.enabled = NO;
-        }
     }
 }
 
diff --git a/MYImagePicker/Classes/Feature/ImagePicker/Asset/MYImagePickerAssetViewController.m b/MYImagePicker/Classes/Feature/ImagePicker/Asset/MYImagePickerAssetViewController.m
@@ -215,6 +215,7 @@ - (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPa
 {
     NSInteger index = indexPath.item;
     if (self.assetPickerVC.config.allowCrop) {
+        __weak typeof(self) weakSelf = self;
         MYAsset *model = [self.albumModel.models objectAtIndex:index];
         MYImagePickerCropImageViewController *cropImageVC = [[MYImagePickerCropImageViewController alloc] initWithModel:model];
         [cropImageVC setImagePickerVC:self.assetPickerVC];
@@ -223,6 +224,10 @@ - (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPa
         [cropImageVC setNeedCircleCrop:self.assetPickerVC.config.needCircleCrop];
         [cropImageVC setAllowCrop:self.assetPickerVC.config.allowCrop];
         [cropImageVC setScaleAspectFillCrop:self.assetPickerVC.config.scaleAspectFillCrop];
+        [cropImageVC setDoneButtonClickBlockCropMode:^(UIImage * cropedImage, id asset) {
+            __strong typeof(weakSelf) strongSelf = weakSelf;
+            [strongSelf handlerOnCropImage:cropedImage asset:asset];
+        }];
         [self.navigationController pushViewController:cropImageVC animated:YES];
     } else {
         MYImagePickerPhotoPreviewViewController *previewVC = [[MYImagePickerPhotoPreviewViewController alloc] init];
@@ -237,12 +242,6 @@ - (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPa
             [strongSelf.collectionView reloadData];
             [strongSelf.assetPickerVC refershAssetSelectedStatus];
         }];
-        
-        [previewVC setDoneButtonClickBlockCropMode:^(UIImage * cropedImage, id asset) {
-            __strong typeof(weakSelf) strongSelf = weakSelf;
-            [strongSelf handlerOnCropImage:cropedImage asset:asset];
-        }];
-        
         [self.navigationController pushViewController:previewVC animated:YES];
     }
 }
diff --git a/MYImagePicker/Classes/Feature/ImagePicker/Video/MYImagePickerVideoViewController.h b/MYImagePicker/Classes/Feature/ImagePicker/Video/MYImagePickerVideoViewController.h
@@ -16,6 +16,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property (nonatomic, weak) MYImagePickerViewController *assetPickerVC;
 
+- (void)reload;
+
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/MYImagePicker/Classes/Feature/ImagePicker/Video/MYImagePickerVideoViewController.m b/MYImagePicker/Classes/Feature/ImagePicker/Video/MYImagePickerVideoViewController.m
@@ -26,6 +26,7 @@
 
 #import "MYImagePickerManager.h"
 #import "MYImagePickerManager+Queue.h"
+#import "MYImagePickerManager+Authorization.h"
 
 static NSString *const MYImagePickerVideoCellReuseIdentifier = @"MYImagePickerVideoCellReuseIdentifier";
 
@@ -105,30 +106,39 @@ - (void)setupUI
     }];
 }
 
+//MARK: - 公开方法
+- (void)reload
+{
+    [self handlerUpdateAbumModels];
+}
+
+//MARK: - 私有方法
 - (void)handlerUpdateAbumModels
 {
-    dispatch_async(dispatch_get_global_queue(0, 0), ^{
-        @autoreleasepool {
-            [[MYImagePickerManager shared] getAllAlbums:YES allowPickingImage:NO needFetchAssets:YES completion:^(NSArray<MYAlbum *> * _Nonnull models) {
-                if ([models count] > 0) {
-                    self->_albumModels = models;
-                    for (MYAlbum *album in self->_albumModels) {
-                        if ([album.models count] > 0) {
-                            [self.assetModels addObjectsFromArray:album.models];
+    if ([[MYImagePickerManager shared] authorizationStatusAuthorized]) {
+        dispatch_async(dispatch_get_global_queue(0, 0), ^{
+            @autoreleasepool {
+                [[MYImagePickerManager shared] getAllAlbums:YES allowPickingImage:NO needFetchAssets:YES completion:^(NSArray<MYAlbum *> * _Nonnull models) {
+                    if ([models count] > 0) {
+                        self->_albumModels = models;
+                        for (MYAlbum *album in self->_albumModels) {
+                            if ([album.models count] > 0) {
+                                [self.assetModels addObjectsFromArray:album.models];
+                            }
                         }
                     }
-                }
-            }];
-        }
-        
-        dispatch_async(dispatch_get_main_queue(), ^{
-            if ([self.assetModels count] > 0) {
-                [self.collectionView reloadData];
-            } else {
-                [self.tipsLabel setHidden:NO];
+                }];
             }
+            
+            dispatch_async(dispatch_get_main_queue(), ^{
+                if ([self.assetModels count] > 0) {
+                    [self.collectionView reloadData];
+                } else {
+                    [self.tipsLabel setHidden:NO];
+                }
+            });
         });
-    });
+    }
 }
 
 //MARK: - UICollectionViewDelegate && UICollectionViewDataSource
diff --git a/MYImagePicker/Classes/Feature/ImagePicker/ViewController/MYImagePickerViewController.m b/MYImagePicker/Classes/Feature/ImagePicker/ViewController/MYImagePickerViewController.m
@@ -408,6 +408,7 @@ - (void)observeAuthrizationStatusChange {
     if ([[MYImagePickerManager shared] authorizationStatusAuthorized]) {
         [self.authorizationTipsView removeFromSuperview];
         [self handlerFetchAlbumData];
+        [self.videoChildVC reload];
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -408,6 +408,7 @@ - (void)observeAuthrizationStatusChange {`
`408`	`408`	`if ([[MYImagePickerManager shared] authorizationStatusAuthorized]) {`
`409`	`409`	`[self.authorizationTipsView removeFromSuperview];`
`410`	`410`	`[self handlerFetchAlbumData];`
	`411`	`+ [self.videoChildVC reload];`
`411`	`412`	`}`
`412`	`413`	`}`
`413`	`414`