Merge pull request #1102 from DCLoveNobody/master

UPDATE 裁剪图片图片能等比自适应填充满裁剪区域

TZImagePickerController/TZImagePickerController/TZImagePickerController.h

@@ -159,6 +159,7 @@
 /// 单选模式,maxImagesCount为1时才生效
 @property (nonatomic, assign) BOOL showSelectBtn;        ///< 在单选模式下，照片列表页中，显示选择按钮,默认为NO
 @property (nonatomic, assign) BOOL allowCrop;            ///< 允许裁剪,默认为YES，showSelectBtn为NO才生效
+@property (nonatomic, assign) BOOL scaleAspectFillCrop;  ///< 是否图片等比缩放填充cropRect区域
 @property (nonatomic, assign) CGRect cropRect;           ///< 裁剪框的尺寸
 @property (nonatomic, assign) CGRect cropRectPortrait;   ///< 裁剪框的尺寸(竖屏)
 @property (nonatomic, assign) CGRect cropRectLandscape;  ///< 裁剪框的尺寸(横屏)

TZImagePickerController/TZImagePickerController/TZPhotoPreviewCell.h

@@ -26,6 +26,7 @@
 
 @property (nonatomic, assign) BOOL allowCrop;
 @property (nonatomic, assign) CGRect cropRect;
+@property (nonatomic, assign) BOOL scaleAspectFillCrop;
 
 - (void)recoverSubviews;
 
@@ -40,7 +41,7 @@
 
 @property (nonatomic, assign) BOOL allowCrop;
 @property (nonatomic, assign) CGRect cropRect;
-
+@property (nonatomic, assign) BOOL scaleAspectFillCrop;
 @property (nonatomic, strong) TZAssetModel *model;
 @property (nonatomic, strong) id asset;
 @property (nonatomic, copy) void (^singleTapGestureBlock)(void);

TZImagePickerController/TZImagePickerController/TZPhotoPreviewCell.m

@@ -78,6 +78,11 @@
     _previewView.allowCrop = allowCrop;
 }
 
+- (void)setScaleAspectFillCrop:(BOOL)scaleAspectFillCrop {
+    _scaleAspectFillCrop = scaleAspectFillCrop;
+    _previewView.scaleAspectFillCrop = scaleAspectFillCrop;
+}
+
 - (void)setCropRect:(CGRect)cropRect {
     _cropRect = cropRect;
     _previewView.cropRect = cropRect;
@@ -201,7 +206,14 @@
     self.imageRequestID = [[TZImageManager manager] getPhotoWithAsset:asset completion:^(UIImage *photo, NSDictionary *info, BOOL isDegraded) {
         if (![asset isEqual:self->_asset]) return;
         self.imageView.image = photo;
+        CGFloat scale = MAX(self.cropRect.size.width / self.imageView.tz_width, self.cropRect.size.height / self.imageView.tz_height);
         [self resizeSubviews];
+        if (self.scaleAspectFillCrop && scale > 1) { // 如果设置图片缩放裁剪并且图片需要缩放
+            self.scrollView.minimumZoomScale = scale;
+            self.scrollView.maximumZoomScale = scale * 2;
+            [self.scrollView setZoomScale:scale animated:YES];
+        }
+
         self->_progressView.hidden = YES;
         if (self.imageProgressUpdateBlock) {
             self.imageProgressUpdateBlock(1);
@@ -229,7 +241,7 @@
 }
 
 - (void)recoverSubviews {
-    [_scrollView setZoomScale:1.0 animated:NO];
+    [_scrollView setZoomScale:_scrollView.minimumZoomScale animated:NO];
     [self resizeSubviews];
 }
 
@@ -305,9 +317,9 @@
 #pragma mark - UITapGestureRecognizer Event
 
 - (void)doubleTap:(UITapGestureRecognizer *)tap {
-    if (_scrollView.zoomScale > 1.0) {
+    if (_scrollView.zoomScale > _scrollView.minimumZoomScale) {
         _scrollView.contentInset = UIEdgeInsetsZero;
-        [_scrollView setZoomScale:1.0 animated:YES];
+        [_scrollView setZoomScale:_scrollView.minimumZoomScale animated:YES];
     } else {
         CGPoint touchPoint = [tap locationInView:self.imageView];
         CGFloat newZoomScale = _scrollView.maximumZoomScale;

TZImagePickerController/TZImagePickerController/TZPhotoPreviewController.m

@@ -464,6 +464,7 @@
         TZPhotoPreviewCell *photoPreviewCell = (TZPhotoPreviewCell *)cell;
         photoPreviewCell.cropRect = _tzImagePickerVc.cropRect;
         photoPreviewCell.allowCrop = _tzImagePickerVc.allowCrop;
+        photoPreviewCell.scaleAspectFillCrop = _tzImagePickerVc.scaleAspectFillCrop;
         __weak typeof(_tzImagePickerVc) weakTzImagePickerVc = _tzImagePickerVc;
         __weak typeof(_collectionView) weakCollectionView = _collectionView;
         __weak typeof(photoPreviewCell) weakCell = photoPreviewCell;