From a27e99019e757cebe47b9d0a68d6790b3c17112f Mon Sep 17 00:00:00 2001 From: lianzhipeng Date: Wed, 13 Jun 2018 21:26:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=B8=AA=E5=BE=AE?= =?UTF-8?q?=E4=BF=A1=E5=AF=B9=E9=A2=84=E8=A7=88=E7=95=8C=E9=9D=A2done?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E7=9A=84=E7=BB=86=E8=8A=82=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 增加当从预览按钮进入预览界面时,如果取消选择所有图片,done按钮无法点击的交互方式 --- .../TZPhotoPickerController.m | 1 + .../TZPhotoPreviewController.h | 1 + .../TZPhotoPreviewController.m | 23 +++++++++++++++++++ 3 files changed, 25 insertions(+) diff --git a/TZImagePickerController/TZImagePickerController/TZPhotoPickerController.m b/TZImagePickerController/TZImagePickerController/TZPhotoPickerController.m index 49b1f4f3..bebf23da 100755 --- a/TZImagePickerController/TZImagePickerController/TZPhotoPickerController.m +++ b/TZImagePickerController/TZImagePickerController/TZPhotoPickerController.m @@ -343,6 +343,7 @@ - (void)navLeftBarButtonClick{ } - (void)previewButtonClick { TZPhotoPreviewController *photoPreviewVc = [[TZPhotoPreviewController alloc] init]; + photoPreviewVc.enableDoneWhenNoneSelect = NO; [self pushPhotoPrevireViewController:photoPreviewVc needCheckSelectedModels:YES]; } diff --git a/TZImagePickerController/TZImagePickerController/TZPhotoPreviewController.h b/TZImagePickerController/TZImagePickerController/TZPhotoPreviewController.h index 2d5d677c..3026c892 100644 --- a/TZImagePickerController/TZImagePickerController/TZPhotoPreviewController.h +++ b/TZImagePickerController/TZImagePickerController/TZPhotoPreviewController.h @@ -15,6 +15,7 @@ @property (nonatomic, assign) NSInteger currentIndex; ///< Index of the photo user click / 用户点击的图片的索引 @property (nonatomic, assign) BOOL isSelectOriginalPhoto; ///< If YES,return original photo / 是否返回原图 @property (nonatomic, assign) BOOL isCropImage; +@property (nonatomic, assign) BOOL enableDoneWhenNoneSelect; ///< default is YES. If YES,return When no photos are selected, can you click the done button / 没有选择任何照片时,是否可以点击done按钮 /// Return the new selected photos / 返回最新的选中图片数组 @property (nonatomic, copy) void (^backButtonClickBlock)(BOOL isSelectOriginalPhoto); diff --git a/TZImagePickerController/TZImagePickerController/TZPhotoPreviewController.m b/TZImagePickerController/TZImagePickerController/TZPhotoPreviewController.m index b41e7100..008ab41a 100644 --- a/TZImagePickerController/TZImagePickerController/TZPhotoPreviewController.m +++ b/TZImagePickerController/TZImagePickerController/TZPhotoPreviewController.m @@ -44,6 +44,15 @@ @interface TZPhotoPreviewController ()