Commit c2328cdc authored by shuijing's avatar shuijing

【feat】图片交互修改 ui验收修改

【影响范围】js
【风险评估】低
【是否自测】是
parent 316b5ef2
...@@ -40,7 +40,6 @@ typedef enum : NSUInteger { ...@@ -40,7 +40,6 @@ typedef enum : NSUInteger {
@property (nonatomic, assign) BOOL showSelectBtn; @property (nonatomic, assign) BOOL showSelectBtn;
@property (assign, nonatomic) BOOL allowPreview; @property (assign, nonatomic) BOOL allowPreview;
@property (nonatomic, assign) BOOL hiddenSelectView; /// 图片满x张后 是否展示选择视图
@property (nonatomic, assign) TZImagePickerTheme pickerTheme; @property (nonatomic, assign) TZImagePickerTheme pickerTheme;
......
...@@ -99,13 +99,6 @@ ...@@ -99,13 +99,6 @@
} }
} }
- (void)setHiddenSelectView:(BOOL)hiddenSelectView {
_hiddenSelectView = hiddenSelectView;
if (_pickerTheme == TZImagePickerTheme_New) {
self.selectImageView.hidden = hiddenSelectView;
}
}
- (void)setType:(TZAssetCellType)type { - (void)setType:(TZAssetCellType)type {
_type = type; _type = type;
if (type == TZAssetCellTypePhoto || type == TZAssetCellTypeLivePhoto || (type == TZAssetCellTypePhotoGif && !self.allowPickingGif) || self.allowPickingMultipleVideo) { if (type == TZAssetCellTypePhoto || type == TZAssetCellTypeLivePhoto || (type == TZAssetCellTypePhotoGif && !self.allowPickingGif) || self.allowPickingMultipleVideo) {
...@@ -250,10 +243,8 @@ ...@@ -250,10 +243,8 @@
if (notSelectable && tzImagePickerVc.showPhotoCannotSelectLayer && !self.model.isSelected) { if (notSelectable && tzImagePickerVc.showPhotoCannotSelectLayer && !self.model.isSelected) {
self.cannotSelectLayerButton.backgroundColor = tzImagePickerVc.cannotSelectLayerColor; self.cannotSelectLayerButton.backgroundColor = tzImagePickerVc.cannotSelectLayerColor;
self.cannotSelectLayerButton.hidden = NO; self.cannotSelectLayerButton.hidden = NO;
self.hiddenSelectView = YES;
} else { } else {
self.cannotSelectLayerButton.hidden = YES; self.cannotSelectLayerButton.hidden = YES;
self.hiddenSelectView = NO;
} }
if (self.model.isSelected && tzImagePickerVc.iconThemeColor && tzImagePickerVc.showSelectedIndex) { if (self.model.isSelected && tzImagePickerVc.iconThemeColor && tzImagePickerVc.showSelectedIndex) {
......
...@@ -606,10 +606,8 @@ static CGFloat itemMargin = 5; ...@@ -606,10 +606,8 @@ static CGFloat itemMargin = 5;
if (notSelectable && tzImagePickerVc.showPhotoCannotSelectLayer && !model.isSelected) { if (notSelectable && tzImagePickerVc.showPhotoCannotSelectLayer && !model.isSelected) {
cell.cannotSelectLayerButton.backgroundColor = tzImagePickerVc.cannotSelectLayerColor; cell.cannotSelectLayerButton.backgroundColor = tzImagePickerVc.cannotSelectLayerColor;
cell.cannotSelectLayerButton.hidden = NO; cell.cannotSelectLayerButton.hidden = NO;
cell.hiddenSelectView = YES;
} else { } else {
cell.cannotSelectLayerButton.hidden = YES; cell.cannotSelectLayerButton.hidden = YES;
cell.hiddenSelectView = NO;
} }
if (model.isSelected && tzImagePickerVc.iconThemeColor && tzImagePickerVc.showSelectedIndex) { if (model.isSelected && tzImagePickerVc.iconThemeColor && tzImagePickerVc.showSelectedIndex) {
......
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