|
@@ -131,6 +131,10 @@
|
|
|
_leftTableView.didLongPressClick = ^{
|
|
|
weakSelf.isEditType = YES;
|
|
|
};
|
|
|
+
|
|
|
+ _leftTableView.didClickSectionHeadViewRightButton = ^(NSInteger section) {
|
|
|
+ [weakSelf didClikRightButInUploadTableVieFunBy:section];
|
|
|
+ };
|
|
|
|
|
|
_midTableView = [[uploadFileRecordTableView alloc] init];
|
|
|
_midTableView.tag = 101;
|
|
@@ -162,10 +166,7 @@
|
|
|
// weakSelf.isEditType = YES;
|
|
|
};
|
|
|
|
|
|
- _rightTableView.didClickReUploadBlock = ^(photosBackupsTaskModel* _Nonnull model) {
|
|
|
- // [weakSelf didClickReUploadFun:model];
|
|
|
- };
|
|
|
-
|
|
|
+
|
|
|
_uploadFileRecordBgScorllV.contentSize = CGSizeMake(SCREEN_W*3.0, curHeight);
|
|
|
|
|
|
// _leftHeadView = [[uploadFileRecordTableViewHeadView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_W, 40)];
|
|
@@ -318,6 +319,20 @@
|
|
|
_selectIndex = index;
|
|
|
}
|
|
|
|
|
|
+#pragma mark 1.3版本UI修改后 上传文件列表的内容点击时间
|
|
|
+- (void)didClikRightButInUploadTableVieFunBy:(NSInteger)section
|
|
|
+{
|
|
|
+ if(section == 0){
|
|
|
+ [self didClickAllSuspendInLoadingFun];
|
|
|
+ }
|
|
|
+ else if(section == 1){//成功
|
|
|
+ [self didClickClearRecordInDoneFun];
|
|
|
+ }
|
|
|
+ else if(section == 2){//失败
|
|
|
+ [self didClickClearRecordInFailFun];
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
#pragma mark 背景滚动代理
|
|
|
- (void)scrollViewDidEndDecelerating:(UIScrollView *)scrollView
|
|
|
{
|
|
@@ -517,55 +532,28 @@
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
- if(_leftTableView && [uploadFileDataMod isKindOfClass:[uploadFileDataModel class]] ){
|
|
|
-
|
|
|
- NSMutableArray *curArr = _leftTableView.uploadingArr;
|
|
|
-
|
|
|
- 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 = _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;
|
|
|
- }
|
|
|
+ [self RefreshUploadViewFun];
|
|
|
+
|
|
|
+}
|
|
|
|
|
|
- index++;
|
|
|
+#pragma mark 那上传那边的数据来更新页面
|
|
|
+- (void)RefreshUploadViewFun
|
|
|
+{
|
|
|
+ KWeakSelf
|
|
|
+ [[uploadFileManager shareInstance] getDataInDatabaseFun:NO complete:^(NSMutableArray * _Nonnull Arr) {
|
|
|
+ //[weakSelf setRecordBodyDataFunBy:Arr];
|
|
|
+
|
|
|
+ if(!Arr ||Arr.count != 3){
|
|
|
+ HLog(@"数据库出错\n\n\n");
|
|
|
+ return;
|
|
|
}
|
|
|
+
|
|
|
+ mainBlock(^{
|
|
|
+ weakSelf.leftTableView.outSideDataArr = Arr;
|
|
|
+ [weakSelf.leftTableView RefreshAllDataFun];
|
|
|
|
|
|
- [self.leftTableView RefreshAllDataFun];
|
|
|
-
|
|
|
- }
|
|
|
-
|
|
|
+ });
|
|
|
+ }];
|
|
|
}
|
|
|
|
|
|
- (void)uploadFileDeteleFun:(NSNotification*)not
|
|
@@ -721,15 +709,15 @@
|
|
|
#pragma mark 点击上传中的全部暂停
|
|
|
- (void)didClickAllSuspendInLoadingFun
|
|
|
{
|
|
|
- // _leftHeadView.rightButton.selected = !_leftHeadView.rightButton.selected;
|
|
|
+ _leftTableView.uploadingHeadView.rightButton.selected = !_leftTableView.uploadingHeadView.rightButton.selected;
|
|
|
|
|
|
-// if(_leftHeadView.rightButton.selected){
|
|
|
-// [[uploadFileManager shareInstance] suspendUploadFileFun:YES];
|
|
|
-// }
|
|
|
-// else{
|
|
|
-// NSMutableArray *leftArr = _leftTableView.curDataArr;
|
|
|
-// [[uploadFileManager shareInstance] reUploadFileFunBy:leftArr];
|
|
|
-// }
|
|
|
+ if(_leftTableView.uploadingHeadView.rightButton.selected){
|
|
|
+ [[uploadFileManager shareInstance] suspendUploadFileFun:YES];
|
|
|
+ }
|
|
|
+ else{
|
|
|
+ NSMutableArray *leftArr = _leftTableView.uploadingArr;
|
|
|
+ [[uploadFileManager shareInstance] reUploadFileFunBy:leftArr];
|
|
|
+ }
|
|
|
}
|
|
|
#pragma mark 点击上传成功的清空记录
|
|
|
- (void)didClickClearRecordInDoneFun
|
|
@@ -756,14 +744,14 @@
|
|
|
|
|
|
- (void)ClearAllRecordInDoneFun
|
|
|
{
|
|
|
-// [[uploadFileManager shareInstance] deleteUploadFileRecordBy:_midTableView.curDataArr withDelCache:YES complete:^(BOOL isSuccess) {
|
|
|
-// HLog(@"isSuccess:%d",isSuccess);
|
|
|
-//
|
|
|
-// if(isSuccess){
|
|
|
-// [self->_midTableView.curDataArr removeAllObjects];
|
|
|
-// [self->_midTableView reloadDataFun];
|
|
|
-// }
|
|
|
-// }];
|
|
|
+ [[uploadFileManager shareInstance] deleteUploadFileRecordBy:_leftTableView.uploadDoneArr withDelCache:YES complete:^(BOOL isSuccess) {
|
|
|
+ HLog(@"isSuccess:%d",isSuccess);
|
|
|
+
|
|
|
+ if(isSuccess){
|
|
|
+ [self->_leftTableView.uploadDoneArr removeAllObjects];
|
|
|
+ [self->_leftTableView reloadDataFun];
|
|
|
+ }
|
|
|
+ }];
|
|
|
}
|
|
|
|
|
|
#pragma mark 点击上传失败的清空记录
|
|
@@ -791,40 +779,17 @@
|
|
|
|
|
|
- (void)ClearAllRecordInFailFun
|
|
|
{
|
|
|
-// [[uploadFileManager shareInstance] deleteUploadFileRecordBy:_rightTableView.curDataArr withDelCache:YES complete:^(BOOL isSuccess) {
|
|
|
-// HLog(@"isSuccess:%d",isSuccess);
|
|
|
-//
|
|
|
-// if(isSuccess){
|
|
|
-// [self->_rightTableView.curDataArr removeAllObjects];
|
|
|
-// [self->_rightTableView reloadDataFun];
|
|
|
-// }
|
|
|
-// }];
|
|
|
+ [[uploadFileManager shareInstance] deleteUploadFileRecordBy:_leftTableView.uploadfailArr withDelCache:YES complete:^(BOOL isSuccess) {
|
|
|
+ HLog(@"isSuccess:%d",isSuccess);
|
|
|
+
|
|
|
+ if(isSuccess){
|
|
|
+ [self->_leftTableView.uploadfailArr removeAllObjects];
|
|
|
+ [self->_leftTableView reloadDataFun];
|
|
|
+ }
|
|
|
+ }];
|
|
|
}
|
|
|
|
|
|
-#pragma mark 失败重传
|
|
|
-- (void)didClickReUploadFun:(uploadFileDataModel*)model{
|
|
|
-
|
|
|
- if(![model isKindOfClass:[uploadFileDataModel class]]){
|
|
|
- return;
|
|
|
- }
|
|
|
-
|
|
|
-// NSMutableArray *curArr = _leftTableView.curDataArr;
|
|
|
-//
|
|
|
-// BOOL isNeedToAdd = YES;
|
|
|
-//
|
|
|
-// for (uploadFileDataModel*mod in curArr) {
|
|
|
-// if(mod.bg_id.integerValue == model.bg_id.integerValue){
|
|
|
-// isNeedToAdd = NO;
|
|
|
-// break;
|
|
|
-// }
|
|
|
-// }
|
|
|
-//
|
|
|
-// if(isNeedToAdd){
|
|
|
-// [curArr addObject:model];
|
|
|
-// }
|
|
|
-//
|
|
|
-// [_leftTableView reloadDataFun];
|
|
|
-}
|
|
|
+
|
|
|
|
|
|
//-(void)backBtnPressed{
|
|
|
// [super backBtnPressed];
|