|
@@ -396,8 +396,10 @@
|
|
|
//[weakSelf setRecordBodyDataFunBy:arr1];
|
|
|
|
|
|
//weakSelf.leftTableView.curDataArr = Arr[0];
|
|
|
- weakSelf.leftTableView.outSideDataArr = Arr;
|
|
|
- [weakSelf.leftTableView reloadDataFun];
|
|
|
+ mainBlock(^{
|
|
|
+ weakSelf.leftTableView.outSideDataArr = Arr;
|
|
|
+ [weakSelf handleUploadingRightButFun:YES];
|
|
|
+ });
|
|
|
|
|
|
}];
|
|
|
}
|
|
@@ -425,12 +427,7 @@
|
|
|
|
|
|
mainBlock(^{
|
|
|
weakSelf.leftTableView.outSideDataArr = Arr;
|
|
|
- [weakSelf.leftTableView reloadDataFun];
|
|
|
-
|
|
|
-// weakSelf.midTableView.curDataArr = Arr[1];
|
|
|
-// [weakSelf.midTableView reloadDataFun];
|
|
|
-
|
|
|
- [weakSelf handleUploadingRightButFun];
|
|
|
+ [weakSelf handleUploadingRightButFun:NO];
|
|
|
});
|
|
|
}];
|
|
|
|
|
@@ -477,7 +474,7 @@
|
|
|
|
|
|
|
|
|
#pragma mark 处理上传中的 全部暂停等
|
|
|
-- (void)handleUploadingRightButFun
|
|
|
+- (void)handleUploadingRightButFun:(BOOL)isUserUploadIngType
|
|
|
{
|
|
|
if(_leftTableView.uploadingArr.count == 0){
|
|
|
//不处理
|
|
@@ -486,7 +483,8 @@
|
|
|
NSMutableArray *upLoadingArr = [uploadFileManager shareInstance].fileModelDataArr;
|
|
|
BOOL isUploadIngType = [uploadFileManager shareInstance].isUploadIngType;
|
|
|
|
|
|
- if(!upLoadingArr ||upLoadingArr.count == 0 || !isUploadIngType){//不是上传状态
|
|
|
+ if(!isUserUploadIngType
|
|
|
+ &&(!upLoadingArr ||upLoadingArr.count == 0 || !isUploadIngType)){//不是上传状态
|
|
|
_leftTableView.uploadingHeadView.rightButton.selected = YES;
|
|
|
}
|
|
|
else if(upLoadingArr.count == _leftTableView.uploadingArr.count){
|
|
@@ -549,8 +547,7 @@
|
|
|
|
|
|
mainBlock(^{
|
|
|
weakSelf.leftTableView.outSideDataArr = Arr;
|
|
|
- [weakSelf.leftTableView RefreshAllDataFun];
|
|
|
-
|
|
|
+ //[weakSelf handleUploadingRightButFun];
|
|
|
});
|
|
|
}];
|
|
|
}
|