Skip to content

merge #1716

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

merge #1716

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
58ae487
fix
Dwinter-S Nov 28, 2022
f775425
添加单张图片自动选中
173216242 Dec 21, 2022
10cd19c
bug修复
173216242 Jan 3, 2023
b9a4e7c
优化内存使用
Dwinter-S Aug 8, 2023
2f4ac81
Merge branch 'master' of https://github.com/banchichen/TZImagePickerC…
173216242 Feb 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 39 additions & 0 deletions TZImagePickerController/TZImagePickerController/TZPhotoPickerController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,45 @@ - (void)fetchAssetModels {
}];
} else if (self->_showTakePhotoBtn || self->_isFirstAppear || !self.model.models || systemVersion >= 14.0) {
[[TZImageManager manager] getAssetsFromFetchResult:self->_model.result completion:^(NSArray<TZAssetModel *> *models) {
NSMutableArray<TZAssetModel *> *newModels = [NSMutableArray array];
if (!self->_isFirstAppear) {
for (TZAssetModel *model in models) {
BOOL isNew = YES;
for (TZAssetModel *preModel in self->_models) {
@autoreleasepool {
if ([model.asset.localIdentifier isEqualToString: preModel.asset.localIdentifier]) {
isNew = NO;
break;
}
}
}
if (isNew) {
[newModels addObject:model];
}
}
for (int i = 0; i < tzImagePickerVc.selectedModels.count; i++) {
BOOL isRemoved = YES;
TZAssetModel *selectedModel = tzImagePickerVc.selectedModels[i];
for (TZAssetModel *model in models) {
if ([selectedModel.asset.localIdentifier isEqualToString: model.asset.localIdentifier]) {
isRemoved = NO;
break;
}
}
if (isRemoved) {
[tzImagePickerVc removeSelectedModel:selectedModel];
}
}
}
if (newModels.count == 1 && tzImagePickerVc.selectedModels.count == 0) {
[tzImagePickerVc addSelectedModel:newModels[0]];
}
self->_models = [NSMutableArray arrayWithArray:models];
[self initSubviews];
dispatch_async(dispatch_get_main_queue(), ^{
[self refreshBottomToolBarStatus];
});

}];
} else {
self->_models = [NSMutableArray arrayWithArray:self->_model.models];
Expand Down Expand Up @@ -203,6 +240,8 @@ - (void)configCollectionView {

_collectionView.contentSize = CGSizeMake(self.view.tz_width, (([self getAllCellCount] + self.columnNumber - 1) / self.columnNumber) * self.view.tz_width);
if (_models.count == 0) {
[_noDataLabel removeFromSuperview];
_noDataLabel = [UILabel new];
[_collectionView addSubview:self.noDataLabel];
} else if (_noDataLabel) {
[_noDataLabel removeFromSuperview];
Expand Down