Commit 63b2cced authored by yuzheng.tz's avatar yuzheng.tz

优化对showPhotoCannotSelectLayer配置的支持

parent 514b8aae
......@@ -79,8 +79,8 @@
}
if (model.needOscillatoryAnimation) {
[UIView showOscillatoryAnimationWithLayer:self.selectImageView.layer type:TZOscillatoryAnimationToBigger];
model.needOscillatoryAnimation = NO;
}
model.needOscillatoryAnimation = NO;
[self setNeedsLayout];
}
......@@ -132,7 +132,7 @@
}
self.selectImageView.image = sender.isSelected ? self.photoSelImage : self.photoDefImage;
if (sender.isSelected) {
if (![TZImagePickerConfig sharedInstance].showSelectedIndex) {
if (![TZImagePickerConfig sharedInstance].showSelectedIndex && ![TZImagePickerConfig sharedInstance].showPhotoCannotSelectLayer) {
[UIView showOscillatoryAnimationWithLayer:_selectImageView.layer type:TZOscillatoryAnimationToBigger];
}
// 用户选中了该图片,提前获取一下大图
......
......@@ -311,4 +311,5 @@
/// 默认是200,如果一个GIF过大,里面图片个数可能超过1000,会导致内存飙升而崩溃
@property (assign, nonatomic) NSInteger gifPreviewMaxImagesCount;
@property (assign, nonatomic) BOOL showSelectedIndex;
@property (assign, nonatomic) BOOL showPhotoCannotSelectLayer;
@end
......@@ -353,6 +353,11 @@
[TZImagePickerConfig sharedInstance].showSelectedIndex = showSelectedIndex;
}
- (void)setShowPhotoCannotSelectLayer:(BOOL)showPhotoCannotSelectLayer {
_showPhotoCannotSelectLayer = showPhotoCannotSelectLayer;
[TZImagePickerConfig sharedInstance].showPhotoCannotSelectLayer = showPhotoCannotSelectLayer;
}
- (void)observeAuthrizationStatusChange {
[_timer invalidate];
_timer = nil;
......
......@@ -519,7 +519,7 @@ static CGFloat itemMargin = 5;
}
}
[strongSelf refreshBottomToolBarStatus];
if (tzImagePickerVc.showSelectedIndex) {
if (tzImagePickerVc.showSelectedIndex || tzImagePickerVc.showPhotoCannotSelectLayer) {
[strongSelf setUseCachedImageAndReloadData];
}
[UIView showOscillatoryAnimationWithLayer:strongLayer type:TZOscillatoryAnimationToSmaller];
......@@ -528,7 +528,7 @@ static CGFloat itemMargin = 5;
if (tzImagePickerVc.selectedModels.count < tzImagePickerVc.maxImagesCount) {
strongCell.selectPhotoButton.selected = YES;
model.isSelected = YES;
if (tzImagePickerVc.showSelectedIndex) {
if (tzImagePickerVc.showSelectedIndex || tzImagePickerVc.showPhotoCannotSelectLayer) {
model.needOscillatoryAnimation = YES;
[strongSelf setUseCachedImageAndReloadData];
}
......@@ -540,9 +540,6 @@ static CGFloat itemMargin = 5;
[tzImagePickerVc showAlertWithTitle:title];
}
}
if (tzImagePickerVc.showPhotoCannotSelectLayer && !tzImagePickerVc.showSelectedIndex) {
[strongSelf.collectionView reloadData];
}
};
return cell;
}
......@@ -598,7 +595,7 @@ static CGFloat itemMargin = 5;
- (void)setUseCachedImageAndReloadData {
self.useCachedImage = YES;
[self.collectionView reloadData];
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
self.useCachedImage = NO;
});
}
......
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