2.7.3

Author: MoLice

QMUIKit.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "QMUIKit"
-  s.version          = "2.7.2"
+  s.version          = "2.7.3"
   s.summary          = "致力于提高项目 UI 开发效率的解决方案"
   s.description      = <<-DESC
                        QMUI iOS 是一个致力于提高项目 UI 开发效率的解决方案，其设计目的是用于辅助快速搭建一个具备基本设计还原效果的 iOS 项目，同时利用自身提供的丰富控件及兼容处理， 让开发者能专注于业务需求而无需耗费精力在基础代码的设计上。不管是新项目的创建，或是已有项目的维护，均可使开发效率和项目质量得到大幅度提升。

QMUIKit/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.7.2</string>
+	<string>2.7.3</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>

QMUIKit/QMUIComponents/AssetLibrary/QMUIAsset.m

@@ -139,7 +139,7 @@ - (NSInteger)requestPreviewImageWithCompletion:(void (^)(UIImage *result, NSDict
     PHImageRequestOptions *imageRequestOptions = [[PHImageRequestOptions alloc] init];
     imageRequestOptions.networkAccessAllowed = YES; // 允许访问网络
     imageRequestOptions.progressHandler = phProgressHandler;
-    return [[[QMUIAssetsManager sharedInstance] phCachingImageManager] requestImageForAsset:_phAsset targetSize:CGSizeMake(SCREEN_WIDTH, SCREEN_HEIGHT) contentMode:PHImageContentModeAspectFill options:imageRequestOptions resultHandler:^(UIImage *result, NSDictionary *info) {
+    return [[[QMUIAssetsManager sharedInstance] phCachingImageManager] requestImageForAsset:_phAsset targetSize:PHImageManagerMaximumSize contentMode:PHImageContentModeAspectFill options:imageRequestOptions resultHandler:^(UIImage *result, NSDictionary *info) {
         if (completion) {
             completion(result, info);
         }

QMUIKit/QMUIComponents/ImagePickerLibrary/QMUIImagePickerPreviewViewController.m

@@ -210,7 +210,11 @@ - (void)zoomImageView:(QMUIZoomImageView *)imageView didHideVideoToolbar:(BOOL)d
 #pragma mark - 按钮点击回调
 
 - (void)handleCancelPreviewImage:(QMUIButton *)button {
-    [self.navigationController popViewControllerAnimated:YES];
+    if (self.navigationController) {
+        [self.navigationController popViewControllerAnimated:YES];
+    } else {
+        [self exitPreviewAutomatically];
+    }
     if (self.delegate && [self.delegate respondsToSelector:@selector(imagePickerPreviewViewControllerDidCancel:)]) {
         [self.delegate imagePickerPreviewViewControllerDidCancel:self];
     }
@@ -365,7 +369,7 @@ - (void)requestImageForZoomImageView:(QMUIZoomImageView *)zoomImageView withInde
             }];
         } else {
             imageView.tag = -1;
-            imageAsset.requestID = [imageAsset requestPreviewImageWithCompletion:^void(UIImage *result, NSDictionary *info) {
+            imageAsset.requestID = [imageAsset requestOriginImageWithCompletion:^void(UIImage *result, NSDictionary *info) {
                 // 这里可能因为 imageView 复用，导致前面的请求得到的结果显示到别的 imageView 上，
                 // 因此判断如果是新请求（无复用问题）或者是当前的请求才把获得的图片结果展示出来
                 dispatch_async(dispatch_get_main_queue(), ^{

QMUIKit/QMUIComponents/ImagePickerLibrary/QMUIImagePickerViewController.m

@@ -275,6 +275,20 @@ - (void)initPreviewViewControllerIfNeeded {
         self.imagePickerPreviewViewController = [self.imagePickerViewControllerDelegate imagePickerPreviewViewControllerForImagePickerViewController:self];
         self.imagePickerPreviewViewController.maximumSelectImageCount = self.maximumSelectImageCount;
         self.imagePickerPreviewViewController.minimumSelectImageCount = self.minimumSelectImageCount;
+        if (!self.imagePickerPreviewViewController.customGestureExitBlock) {
+            __weak __typeof(self)weakSelf = self;
+            self.imagePickerPreviewViewController.customGestureExitBlock = ^(QMUIImagePreviewViewController *aImagePreviewViewController, QMUIZoomImageView *currentZoomImageView) {
+                NSInteger index = [aImagePreviewViewController.imagePreviewView indexForZoomImageView:currentZoomImageView];
+                NSIndexPath *indexPath = [NSIndexPath indexPathForItem:index inSection:0];
+                if ([weakSelf.collectionView.indexPathsForVisibleItems containsObject:indexPath]) {
+                    CGRect rect = [weakSelf.collectionViewLayout layoutAttributesForItemAtIndexPath:indexPath].frame;
+                    rect = [weakSelf.collectionView convertRect:rect toView:nil];
+                    [aImagePreviewViewController exitPreviewToRectInScreenCoordinate:rect];
+                } else {
+                    [aImagePreviewViewController exitPreviewByFadeOut];
+                }
+            };
+        }
     }
 }
 
@@ -383,7 +397,10 @@ - (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPa
                                                                               currentImageIndex:indexPath.item
                                                                                 singleCheckMode:NO];
         }
-        [self.navigationController pushViewController:self.imagePickerPreviewViewController animated:YES];
+        
+        CGRect frame = [self.collectionViewLayout layoutAttributesForItemAtIndexPath:indexPath].frame;
+        frame = [self.collectionView convertRect:frame toView:nil];
+        [self.imagePickerPreviewViewController startPreviewFromRectInScreenCoordinate:frame];
     }
 }
 
@@ -496,7 +513,7 @@ - (void)requestImageWithIndexPath:(NSIndexPath *)indexPath {
     // 发出请求获取大图，如果图片在 iCloud，则会发出网络请求下载图片。这里同时保存请求 id，供取消请求使用
     QMUIAsset *imageAsset = [self.imagesAssetArray objectAtIndex:indexPath.item];
     QMUIImagePickerCollectionViewCell *cell = (QMUIImagePickerCollectionViewCell *)[self.collectionView cellForItemAtIndexPath:indexPath];
-    imageAsset.requestID = [imageAsset requestPreviewImageWithCompletion:^(UIImage *result, NSDictionary *info) {
+    imageAsset.requestID = [imageAsset requestOriginImageWithCompletion:^(UIImage *result, NSDictionary *info) {
 
         BOOL downloadSucceed = (result && !info) || (![[info objectForKey:PHImageCancelledKey] boolValue] && ![info objectForKey:PHImageErrorKey] && ![[info objectForKey:PHImageResultIsDegradedKey] boolValue]);
 

QMUIKit/QMUIComponents/QMUIAlertController.h

@@ -77,7 +77,13 @@ typedef NS_ENUM(NSInteger, QMUIAlertControllerStyle) {
 /**
  *  `QMUIAlertController`是模仿系统`UIAlertController`的控件，所以系统有的功能在QMUIAlertController里面基本都有。同时`QMUIAlertController`还提供了一些扩展功能，例如：它的每个 button 都是开放出来的，可以对默认的按钮进行二次处理（比如加一个图片）；可以通过 appearance 在 app 启动的时候修改整个`QMUIAlertController`的主题样式。
  */
-@interface QMUIAlertController : UIViewController<QMUIModalPresentationComponentProtocol>
+@interface QMUIAlertController : UIViewController<QMUIModalPresentationComponentProtocol> {
+    UIView          *_containerView;    // 弹窗的主体容器
+    UIView          *_scrollWrapView;   // 包含上下两个 scrollView 的容器
+    UIScrollView    *_headerScrollView; // 上半部分的内容的 scrollView，例如 title、message
+    UIScrollView    *_buttonScrollView; // 所有按钮的容器，特别的，actionSheet 下的取消按钮不放在这里面，因为它不参与滚动
+    UIControl       *_maskView;         // 背后占满整个屏幕的半透明黑色遮罩
+}
 
 /// alert距离屏幕四边的间距，默认UIEdgeInsetsMake(0, 0, 0, 0)。alert的宽度最终是通过屏幕宽度减去水平的 alertContentMargin 和 alertContentMaximumWidth 决定的。
 @property(nonatomic, assign) UIEdgeInsets alertContentMargin UI_APPEARANCE_SELECTOR;

QMUIKit/QMUIComponents/QMUIDialogViewController.h

@@ -62,11 +62,65 @@
 @property(nonatomic, strong, readonly) QMUIButton *submitButton;
 @property(nonatomic, strong, readonly) CALayer *buttonSeparatorLayer;
 
+/**
+ 添加位于左下角的取消按钮，取消按钮点击时默认会自动 hide 弹窗，无需自己在 block 里调用 hide。
+ 
+ 同一时间只能存在一个取消按钮，所以每次添加都会移除上一个取消按钮。
+
+ @param buttonText 按钮文字
+ @param block 按钮点击后的事件。取消按钮会自动 hide 弹窗，无需在 block 里调用 hide
+ */
 - (void)addCancelButtonWithText:(NSString *)buttonText block:(void (^)(__kindof QMUIDialogViewController *aDialogViewController))block;
+
+/**
+ 移除当前的取消按钮
+ */
+- (void)removeCancelButton;
+
+/**
+ 添加位于右下角的提交按钮
+ 
+ 同一时间只能存在一个提交按钮，所以每次添加都会移除上一个提交按钮
+
+ @param buttonText 按钮文字
+ @param block 按钮点击后的事件，如果需要在点击后关闭浮层，需要在 block 里自行调用 hide
+ */
 - (void)addSubmitButtonWithText:(NSString *)buttonText block:(void (^)(__kindof QMUIDialogViewController *aDialogViewController))block;
+
+/**
+ 移除提交按钮
+ */
+- (void)removeSubmitButton;
+
+/**
+ 用于展示 dialog 的 modalPresentationViewController
+ */
+@property(nonatomic, strong) QMUIModalPresentationViewController *modalPresentationViewController;
+
+/**
+ 以动画形式显示弹窗，等同于 [self showWithAnimated:YES completion:nil]
+ */
 - (void)show;
+
+/**
+ 显示弹窗
+
+ @param animated 是否用动画的形式
+ @param completion 弹窗显示出来后的回调
+ */
 - (void)showWithAnimated:(BOOL)animated completion:(void (^)(BOOL finished))completion;
+
+/**
+ 以动画形式隐藏弹窗，等同于 [self hideWithAnimated:YES completion:nil]
+ */
 - (void)hide;
+
+/**
+ 隐藏弹窗
+
+ @param animated 是否用动画的形式
+ @param completion 弹窗隐藏后的回调
+ */
 - (void)hideWithAnimated:(BOOL)animated completion:(void (^)(BOOL finished))completion;
 
 @end