|
|
@@ -168,9 +168,22 @@
|
|
|
if(but.selected){
|
|
|
[self.indexPathsForSelectedItems removeAllObjects];
|
|
|
|
|
|
- for (TZAssetModel *model in self.assets) {
|
|
|
- [self didSelectModel:model];
|
|
|
+ [self showNewIndicatorWithCanBack:YES canTouch:NO];
|
|
|
+
|
|
|
+ for (int i= 0; i<self.assets.count; i++) {
|
|
|
+ TZAssetModel *model = self.assets[i];
|
|
|
+
|
|
|
+ if(i == self.assets.count -1){
|
|
|
+ [self didSelectModel:model isLastModel:YES];
|
|
|
+ }
|
|
|
+ else{
|
|
|
+ [self didSelectModel:model isLastModel:NO];
|
|
|
+ }
|
|
|
}
|
|
|
+
|
|
|
+// for (TZAssetModel *model in self.assets) {
|
|
|
+// [self didSelectModel:model isLastModel:NO];
|
|
|
+// }
|
|
|
}
|
|
|
else{
|
|
|
for (TZAssetModel *model in self.assets) {
|
|
|
@@ -475,7 +488,7 @@
|
|
|
}
|
|
|
else
|
|
|
{//选中
|
|
|
- [self didSelectModel:model];
|
|
|
+ [self didSelectModel:model isLastModel:NO];
|
|
|
[cell isSelected:YES];
|
|
|
}
|
|
|
|
|
|
@@ -483,7 +496,7 @@
|
|
|
}
|
|
|
|
|
|
#pragma mark 选中某个cell
|
|
|
-- (void)didSelectModel:(TZAssetModel *)model
|
|
|
+- (void)didSelectModel:(TZAssetModel *)model isLastModel:(BOOL)isLast
|
|
|
{//选中
|
|
|
[self.indexPathsForSelectedItems addObject:model];
|
|
|
model.isSelected = YES;
|
|
|
@@ -499,6 +512,12 @@
|
|
|
if(model.type != TZAssetModelMediaTypeVideo){
|
|
|
[self setDataToBottomViewFun];
|
|
|
}
|
|
|
+
|
|
|
+ if(isLast){
|
|
|
+ mainBlock(^{
|
|
|
+ [self removeNewIndicator];
|
|
|
+ });
|
|
|
+ }
|
|
|
}];
|
|
|
|
|
|
if(model.type == TZAssetModelMediaTypeVideo){
|
|
|
@@ -520,6 +539,12 @@
|
|
|
//model.totalBytes = [videoData length];
|
|
|
model.totalBytes = size.longLongValue;
|
|
|
[self setDataToBottomViewFun];
|
|
|
+
|
|
|
+ if(isLast){
|
|
|
+ mainBlock(^{
|
|
|
+ [self removeNewIndicator];
|
|
|
+ });
|
|
|
+ }
|
|
|
}
|
|
|
}];
|
|
|
|
|
|
@@ -637,6 +662,7 @@
|
|
|
KWeakSelf
|
|
|
vc.didChangeSavePathFun = ^{
|
|
|
[weakSelf.uploadFileBottomV setSavePathDataFun];
|
|
|
+ [weakSelf handelAfterGetBaseInfoModelData];
|
|
|
};
|
|
|
}
|
|
|
@end
|