Commit 3e9b3de2 authored by tanzhen's avatar tanzhen

新增照片列表和预览页UI完成自定义支持

parent 83b8f6b2
...@@ -161,8 +161,15 @@ ...@@ -161,8 +161,15 @@
@property (nonatomic, assign) BOOL needCircleCrop; ///< 需要圆形裁剪框 @property (nonatomic, assign) BOOL needCircleCrop; ///< 需要圆形裁剪框
@property (nonatomic, assign) NSInteger circleCropRadius; ///< 圆形裁剪框半径大小 @property (nonatomic, assign) NSInteger circleCropRadius; ///< 圆形裁剪框半径大小
@property (nonatomic, copy) void (^cropViewSettingBlock)(UIView *cropView); ///< 自定义裁剪框的其他属性 @property (nonatomic, copy) void (^cropViewSettingBlock)(UIView *cropView); ///< 自定义裁剪框的其他属性
@property (nonatomic, copy) void (^navLeftBarButtonSettingBlock)(UIButton *leftButton); ///< 自定义返回按钮样式及其属性 @property (nonatomic, copy) void (^navLeftBarButtonSettingBlock)(UIButton *leftButton); ///< 自定义返回按钮样式及其属性
/// 【自定义照片列表页的样式】在界面初始化完成后调用,允许外界修改样式等
@property (nonatomic, copy) void (^photoPickerPageUIConfigBlock)(UICollectionView *collectionView, UIView *bottomToolBar, UIButton *previewButton, UIButton *originalPhotoButton, UILabel *originalPhotoLabel, UIButton *doneButton, UIImageView *numberImageView, UILabel *numberLabel, UIView *divideLine);
/// 【自定义照片列表页的尺寸】在界面viewDidLayoutSubviews后调用,允许外界修改尺寸等
@property (nonatomic, copy) void (^photoPickerPageDidLayoutSubviewsBlock)(UICollectionView *collectionView, UIView *bottomToolBar, UIButton *previewButton, UIButton *originalPhotoButton, UILabel *originalPhotoLabel, UIButton *doneButton, UIImageView *numberImageView, UILabel *numberLabel, UIView *divideLine);
/// 【自定义照片预览页的样式】在界面初始化完成后调用,允许外界修改样式等
@property (nonatomic, copy) void (^photoPreviewPageUIConfigBlock)(UICollectionView *collectionView, UIView *naviBar, UIButton *backButton, UIButton *selectButton, UILabel *indexLabel, UIView *toolBar, UIButton *originalPhotoButton, UILabel *originalPhotoLabel, UIButton *doneButton, UIImageView *numberImageView, UILabel *numberLabel);
/// 【自定义照片预览页的尺寸】在界面viewDidLayoutSubviews后调用,允许外界修改尺寸等
@property (nonatomic, copy) void (^photoPreviewPageDidLayoutSubviewsBlock)(UICollectionView *collectionView, UIView *naviBar, UIButton *backButton, UIButton *selectButton, UILabel *indexLabel, UIView *toolBar, UIButton *originalPhotoButton, UILabel *originalPhotoLabel, UIButton *doneButton, UIImageView *numberImageView, UILabel *numberLabel);
#pragma mark - #pragma mark -
- (id)showAlertWithTitle:(NSString *)title; - (id)showAlertWithTitle:(NSString *)title;
......
...@@ -260,6 +260,10 @@ static CGFloat itemMargin = 5; ...@@ -260,6 +260,10 @@ static CGFloat itemMargin = 5;
[_bottomToolBar addSubview:_originalPhotoButton]; [_bottomToolBar addSubview:_originalPhotoButton];
[self.view addSubview:_bottomToolBar]; [self.view addSubview:_bottomToolBar];
[_originalPhotoButton addSubview:_originalPhotoLabel]; [_originalPhotoButton addSubview:_originalPhotoLabel];
if (tzImagePickerVc.photoPickerPageUIConfigBlock) {
tzImagePickerVc.photoPickerPageUIConfigBlock(_collectionView, _bottomToolBar, _previewButton, _originalPhotoButton, _originalPhotoLabel, _doneButton, _numberImageView, _numberLabel, _divideLine);
}
} }
#pragma mark - Layout #pragma mark - Layout
...@@ -320,6 +324,10 @@ static CGFloat itemMargin = 5; ...@@ -320,6 +324,10 @@ static CGFloat itemMargin = 5;
[TZImageManager manager].columnNumber = [TZImageManager manager].columnNumber; [TZImageManager manager].columnNumber = [TZImageManager manager].columnNumber;
[self.collectionView reloadData]; [self.collectionView reloadData];
if (tzImagePickerVc.photoPickerPageDidLayoutSubviewsBlock) {
tzImagePickerVc.photoPickerPageDidLayoutSubviewsBlock(_collectionView, _bottomToolBar, _previewButton, _originalPhotoButton, _originalPhotoLabel, _doneButton, _numberImageView, _numberLabel, _divideLine);
}
} }
#pragma mark - Notification #pragma mark - Notification
......
...@@ -171,6 +171,10 @@ ...@@ -171,6 +171,10 @@
[_toolBar addSubview:_numberImageView]; [_toolBar addSubview:_numberImageView];
[_toolBar addSubview:_numberLabel]; [_toolBar addSubview:_numberLabel];
[self.view addSubview:_toolBar]; [self.view addSubview:_toolBar];
if (_tzImagePickerVc.photoPreviewPageUIConfigBlock) {
_tzImagePickerVc.photoPreviewPageUIConfigBlock(_collectionView, _naviBar, _backButton, _selectButton, _indexLabel, _toolBar, _originalPhotoButton, _originalPhotoLabel, _doneButton, _numberImageView, _numberLabel);
}
} }
- (void)configCollectionView { - (void)configCollectionView {
...@@ -265,6 +269,10 @@ ...@@ -265,6 +269,10 @@
_numberLabel.frame = _numberImageView.frame; _numberLabel.frame = _numberImageView.frame;
[self configCropView]; [self configCropView];
if (_tzImagePickerVc.photoPreviewPageDidLayoutSubviewsBlock) {
_tzImagePickerVc.photoPreviewPageDidLayoutSubviewsBlock(_collectionView, _naviBar, _backButton, _selectButton, _indexLabel, _toolBar, _originalPhotoButton, _originalPhotoLabel, _doneButton, _numberImageView, _numberLabel);
}
} }
#pragma mark - Notification #pragma mark - Notification
......
...@@ -256,6 +256,9 @@ ...@@ -256,6 +256,9 @@
imagePickerVc.iconThemeColor = [UIColor colorWithRed:31 / 255.0 green:185 / 255.0 blue:34 / 255.0 alpha:1.0]; imagePickerVc.iconThemeColor = [UIColor colorWithRed:31 / 255.0 green:185 / 255.0 blue:34 / 255.0 alpha:1.0];
imagePickerVc.showPhotoCannotSelectLayer = YES; imagePickerVc.showPhotoCannotSelectLayer = YES;
imagePickerVc.cannotSelectLayerColor = [[UIColor whiteColor] colorWithAlphaComponent:0.8]; imagePickerVc.cannotSelectLayerColor = [[UIColor whiteColor] colorWithAlphaComponent:0.8];
[imagePickerVc setPhotoPickerPageUIConfigBlock:^(UICollectionView *collectionView, UIView *bottomToolBar, UIButton *previewButton, UIButton *originalPhotoButton, UILabel *originalPhotoLabel, UIButton *doneButton, UIImageView *numberImageView, UILabel *numberLabel, UIView *divideLine) {
[doneButton setTitleColor:[UIColor redColor] forState:UIControlStateNormal];
}];
// 3. Set allow picking video & photo & originalPhoto or not // 3. Set allow picking video & photo & originalPhoto or not
// 3. 设置是否可以选择视频/图片/原图 // 3. 设置是否可以选择视频/图片/原图
......
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