|
@@ -507,112 +507,97 @@
|
|
|
uploadFileDataMod.curTimeInterval = [[NSDate date] timeIntervalSince1970];
|
|
|
|
|
|
//UI和数据还没准备好
|
|
|
-// if(!_leftTableView
|
|
|
-// && (uploadFileDataMod.curUploadStateType == uploadStateFail
|
|
|
-// ||uploadFileDataMod.curUploadStateType == uploadStateDone)){
|
|
|
-// dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
|
|
|
-// [[NSNotificationCenter defaultCenter] postNotificationName:uploadFileRefreshNotification object:uploadFileDataMod];
|
|
|
-// });
|
|
|
-//
|
|
|
-// return;
|
|
|
-// }
|
|
|
-//
|
|
|
-// if(_leftTableView && [uploadFileDataMod isKindOfClass:[uploadFileDataModel class]] ){
|
|
|
-//
|
|
|
-// NSMutableArray *curArr = _leftTableView.curDataArr;
|
|
|
-//
|
|
|
-// NSInteger index = 0;
|
|
|
-// for (uploadFileDataModel*mod in curArr) {
|
|
|
-// //HLog(@"%@ bg_id:%@ ?=? %@",mod.filename,mod.bg_id,uploadFileDataMod.bg_id);
|
|
|
-//
|
|
|
-// if(mod.bg_id.integerValue == uploadFileDataMod.bg_id.integerValue){
|
|
|
-//
|
|
|
-// if(uploadFileDataMod.curUploadStateType == uploadStateDone){
|
|
|
-// [curArr removeObject:mod];
|
|
|
-//
|
|
|
-// NSMutableArray *doneArr = _midTableView.curDataArr;
|
|
|
-// [doneArr insertObject:uploadFileDataMod atIndex:0];
|
|
|
-//
|
|
|
-// //全部上传了
|
|
|
-// if(curArr.count == 0){
|
|
|
-//
|
|
|
-// }
|
|
|
-// }
|
|
|
-// else if(uploadFileDataMod.curUploadStateType == uploadStateFail){
|
|
|
-// [curArr removeObject:mod];
|
|
|
-//
|
|
|
-//// NSMutableArray *failArr = _rightTableView.curDataArr;
|
|
|
-//// [failArr insertObject:uploadFileDataMod atIndex:0];
|
|
|
-// }
|
|
|
-// else{
|
|
|
-// [curArr replaceObjectAtIndex:index withObject:uploadFileDataMod];
|
|
|
-// }
|
|
|
-//
|
|
|
-// break;
|
|
|
-// }
|
|
|
-//
|
|
|
-// index++;
|
|
|
-// }
|
|
|
-//
|
|
|
-// //精准刷新
|
|
|
-// if(uploadFileDataMod.curUploadStateType == uploadStateDone){
|
|
|
-// //[self.uploadFileRecordBodyV RefreshDataWithUploadingArr:_allDataArr[0] withDoneArr:_allDataArr[1] withfailArr:nil];
|
|
|
-//
|
|
|
-// [self.leftTableView reloadDataFun];
|
|
|
-//
|
|
|
-// [self.midTableView reloadDataFun];
|
|
|
-// }
|
|
|
-// else if(uploadFileDataMod.curUploadStateType == uploadStateFail){
|
|
|
-// //[self.uploadFileRecordBodyV RefreshDataWithUploadingArr:_allDataArr[0] withDoneArr:nil withfailArr:_allDataArr[2]];
|
|
|
-//
|
|
|
-// [self.leftTableView reloadDataFun];
|
|
|
-//
|
|
|
-// [self.rightTableView reloadDataFun];
|
|
|
-// }
|
|
|
-// else{
|
|
|
-// //[self.uploadFileRecordBodyV RefreshDataWithUploadingArr:_allDataArr[0] withDoneArr:nil withfailArr:nil];
|
|
|
-//
|
|
|
-// [self.leftTableView reloadDataFun];
|
|
|
-//
|
|
|
-// }
|
|
|
-// }
|
|
|
-//
|
|
|
-}
|
|
|
-
|
|
|
-- (void)uploadFileDeteleFun:(NSNotification*)not
|
|
|
-{
|
|
|
- uploadFileDataModel *uploadFileDataMod = [not object];
|
|
|
- //HLog(@"%@",uploadFileDataMod);
|
|
|
-
|
|
|
- //UI和数据还没准备好
|
|
|
- if(!_leftTableView.outSideDataArr || _leftTableView.outSideDataArr.count !=3){
|
|
|
+ if(!_leftTableView
|
|
|
+ && (uploadFileDataMod.curUploadStateType == uploadStateFail
|
|
|
+ ||uploadFileDataMod.curUploadStateType == uploadStateDone)){
|
|
|
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
|
|
|
- [[NSNotificationCenter defaultCenter] postNotificationName:uploadFileDeteleNotification object:uploadFileDataMod];
|
|
|
+ [[NSNotificationCenter defaultCenter] postNotificationName:uploadFileRefreshNotification object:uploadFileDataMod];
|
|
|
});
|
|
|
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
- if([uploadFileDataMod isKindOfClass:[uploadFileDataModel class]] ){
|
|
|
+ if(_leftTableView && [uploadFileDataMod isKindOfClass:[uploadFileDataModel class]] ){
|
|
|
|
|
|
- NSMutableArray *curArr = _leftTableView.outSideDataArr[0];
|
|
|
+ NSMutableArray *curArr = _leftTableView.uploadingArr;
|
|
|
|
|
|
NSInteger index = 0;
|
|
|
for (uploadFileDataModel*mod in curArr) {
|
|
|
- HLog(@"bg_id:%@ ?=? %@",mod.bg_id,uploadFileDataMod.bg_id);
|
|
|
+ //HLog(@"%@ bg_id:%@ ?=? %@",mod.filename,mod.bg_id,uploadFileDataMod.bg_id);
|
|
|
|
|
|
if(mod.bg_id.integerValue == uploadFileDataMod.bg_id.integerValue){
|
|
|
- [curArr removeObject:mod];
|
|
|
+
|
|
|
+ if(uploadFileDataMod.curUploadStateType == uploadStateDone){
|
|
|
+ [curArr removeObject:mod];
|
|
|
+
|
|
|
+ NSMutableArray *doneArr = _leftTableView.uploadDoneArr;
|
|
|
+
|
|
|
+ if(!doneArr){
|
|
|
+ doneArr = [NSMutableArray new];
|
|
|
+ }
|
|
|
+
|
|
|
+ [doneArr insertObject:uploadFileDataMod atIndex:0];
|
|
|
+
|
|
|
+ //全部上传了
|
|
|
+ if(curArr.count == 0){
|
|
|
+
|
|
|
+ }
|
|
|
+ }
|
|
|
+ else if(uploadFileDataMod.curUploadStateType == uploadStateFail){
|
|
|
+ [curArr removeObject:mod];
|
|
|
+
|
|
|
+ NSMutableArray *failArr = _leftTableView.uploadfailArr;
|
|
|
+ if(!failArr){
|
|
|
+ failArr = [NSMutableArray new];
|
|
|
+ }
|
|
|
+ [failArr insertObject:uploadFileDataMod atIndex:0];
|
|
|
+ }
|
|
|
+ else{
|
|
|
+ [curArr replaceObjectAtIndex:index withObject:uploadFileDataMod];
|
|
|
+ }
|
|
|
+
|
|
|
break;
|
|
|
}
|
|
|
|
|
|
index++;
|
|
|
}
|
|
|
|
|
|
- //精准刷新
|
|
|
- //[self.uploadFileRecordBodyV RefreshDataWithUploadingArr:_allDataArr[0] withDoneArr:nil withfailArr:nil];
|
|
|
- [self.leftTableView reloadDataFun];
|
|
|
+ [self.leftTableView RefreshAllDataFun];
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+}
|
|
|
+
|
|
|
+- (void)uploadFileDeteleFun:(NSNotification*)not
|
|
|
+{
|
|
|
+ uploadFileDataModel *uploadFileDataMod = [not object];
|
|
|
+ //HLog(@"%@",uploadFileDataMod);
|
|
|
+
|
|
|
+ //UI和数据还没准备好
|
|
|
+ if(!_leftTableView.outSideDataArr || _leftTableView.outSideDataArr.count !=3){
|
|
|
+ dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
|
|
|
+ [[NSNotificationCenter defaultCenter] postNotificationName:uploadFileDeteleNotification object:uploadFileDataMod];
|
|
|
+ });
|
|
|
+
|
|
|
+ return;
|
|
|
}
|
|
|
+
|
|
|
+ KWeakSelf
|
|
|
+ [[uploadFileManager shareInstance] getDataInDatabaseFun:NO complete:^(NSMutableArray * _Nonnull Arr) {
|
|
|
+
|
|
|
+ if(!Arr ||Arr.count != 3){
|
|
|
+ HLog(@"数据库出错\n\n\n");
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
+ NSMutableArray *curLoadIngArr = Arr[0];
|
|
|
+
|
|
|
+ mainBlock(^{
|
|
|
+ weakSelf.leftTableView.uploadingArr = curLoadIngArr;
|
|
|
+ [weakSelf.leftTableView RefreshAllDataFun];
|
|
|
+
|
|
|
+ });
|
|
|
+ }];
|
|
|
|
|
|
}
|
|
|
|