Browse Source

1.文件上传UI逻辑调整

huangxiaodong 1 year ago
parent
commit
22585e0b1d
17 changed files with 232 additions and 225 deletions
  1. 22 14
      创维盒子/双子星云手机.xcodeproj/project.pbxproj
  2. 64 58
      创维盒子/双子星云手机/Class/Set/uploadFile/uploadFileManager/uploadFileManager.m
  3. 63 98
      创维盒子/双子星云手机/Class/Set/uploadFile/uploadFileRecordViewController.m
  4. 0 0
      创维盒子/双子星云手机/Class/Set/uploadFile/uploadFileView/backupsFileRecordCell.h
  5. 0 0
      创维盒子/双子星云手机/Class/Set/uploadFile/uploadFileView/backupsFileRecordCell.m
  6. 0 0
      创维盒子/双子星云手机/Class/Set/uploadFile/uploadFileView/backupsFilerecordTableView.h
  7. 0 0
      创维盒子/双子星云手机/Class/Set/uploadFile/uploadFileView/backupsFilerecordTableView.m
  8. 0 0
      创维盒子/双子星云手机/Class/Set/uploadFile/uploadFileView/uploadFileRecordBgScorllView.h
  9. 0 0
      创维盒子/双子星云手机/Class/Set/uploadFile/uploadFileView/uploadFileRecordBgScorllView.m
  10. 0 0
      创维盒子/双子星云手机/Class/Set/uploadFile/uploadFileView/uploadFileRecordCell.h
  11. 4 5
      创维盒子/双子星云手机/Class/Set/uploadFile/photoView/uploadFileRecordCell.m
  12. 0 0
      创维盒子/双子星云手机/Class/Set/uploadFile/uploadFileView/uploadFileRecordEditBottomView.h
  13. 0 0
      创维盒子/双子星云手机/Class/Set/uploadFile/uploadFileView/uploadFileRecordEditBottomView.m
  14. 6 0
      创维盒子/双子星云手机/Class/Set/uploadFile/photoView/uploadFileRecordTableView.h
  15. 73 50
      创维盒子/双子星云手机/Class/Set/uploadFile/photoView/uploadFileRecordTableView.m
  16. 0 0
      创维盒子/双子星云手机/Class/Set/uploadFile/uploadFileView/uploadFileRecordTableViewHeadView.h
  17. 0 0
      创维盒子/双子星云手机/Class/Set/uploadFile/uploadFileView/uploadFileRecordTableViewHeadView.m

+ 22 - 14
创维盒子/双子星云手机.xcodeproj/project.pbxproj

@@ -1263,6 +1263,7 @@
 		6B05815D2AFCD0A900D37290 /* uploadFile */ = {
 			isa = PBXGroup;
 			children = (
+				6B5D40172B4A70AB000965CF /* uploadFileView */,
 				6B5B60622B3D5F72009A2AE2 /* fileTransfeSet */,
 				6B0582822B0457A000D37290 /* uploadFileManager */,
 				6B0582712AFF79E100D37290 /* model */,
@@ -1298,20 +1299,6 @@
 				6B8FF6B82B04E19600800981 /* uploadFileRecordheadView.m */,
 				6B8FF6BB2B04EB7100800981 /* uploadFileRecordBodyView.h */,
 				6B8FF6BC2B04EB7100800981 /* uploadFileRecordBodyView.m */,
-				6B7272592B0E22D000C03F87 /* uploadFileRecordBgScorllView.h */,
-				6B72725A2B0E22D000C03F87 /* uploadFileRecordBgScorllView.m */,
-				6B72725D2B0E240F00C03F87 /* uploadFileRecordTableView.h */,
-				6B72725E2B0E240F00C03F87 /* uploadFileRecordTableView.m */,
-				6B1FBD382B467A8000926382 /* backupsFilerecordTableView.h */,
-				6B1FBD392B467A8000926382 /* backupsFilerecordTableView.m */,
-				6B8FF6BF2B05B24D00800981 /* uploadFileRecordCell.h */,
-				6B8FF6C02B05B24D00800981 /* uploadFileRecordCell.m */,
-				6B1FBD3C2B46875300926382 /* backupsFileRecordCell.h */,
-				6B1FBD3D2B46875300926382 /* backupsFileRecordCell.m */,
-				6B7272492B0AF59200C03F87 /* uploadFileRecordTableViewHeadView.h */,
-				6B72724A2B0AF59200C03F87 /* uploadFileRecordTableViewHeadView.m */,
-				6B72724D2B0B58E500C03F87 /* uploadFileRecordEditBottomView.h */,
-				6B72724E2B0B58E500C03F87 /* uploadFileRecordEditBottomView.m */,
 			);
 			path = photoView;
 			sourceTree = "<group>";
@@ -1392,6 +1379,27 @@
 			path = view;
 			sourceTree = "<group>";
 		};
+		6B5D40172B4A70AB000965CF /* uploadFileView */ = {
+			isa = PBXGroup;
+			children = (
+				6B7272592B0E22D000C03F87 /* uploadFileRecordBgScorllView.h */,
+				6B72725A2B0E22D000C03F87 /* uploadFileRecordBgScorllView.m */,
+				6B72725D2B0E240F00C03F87 /* uploadFileRecordTableView.h */,
+				6B72725E2B0E240F00C03F87 /* uploadFileRecordTableView.m */,
+				6B1FBD382B467A8000926382 /* backupsFilerecordTableView.h */,
+				6B1FBD392B467A8000926382 /* backupsFilerecordTableView.m */,
+				6B8FF6BF2B05B24D00800981 /* uploadFileRecordCell.h */,
+				6B8FF6C02B05B24D00800981 /* uploadFileRecordCell.m */,
+				6B1FBD3C2B46875300926382 /* backupsFileRecordCell.h */,
+				6B1FBD3D2B46875300926382 /* backupsFileRecordCell.m */,
+				6B7272492B0AF59200C03F87 /* uploadFileRecordTableViewHeadView.h */,
+				6B72724A2B0AF59200C03F87 /* uploadFileRecordTableViewHeadView.m */,
+				6B72724D2B0B58E500C03F87 /* uploadFileRecordEditBottomView.h */,
+				6B72724E2B0B58E500C03F87 /* uploadFileRecordEditBottomView.m */,
+			);
+			path = uploadFileView;
+			sourceTree = "<group>";
+		};
 		6BBB35D42AE7645200E4A59B /* BackgroundKeepAlive */ = {
 			isa = PBXGroup;
 			children = (

+ 64 - 58
创维盒子/双子星云手机/Class/Set/uploadFile/uploadFileManager/uploadFileManager.m

@@ -388,72 +388,78 @@ static uploadFileManager * cur_uploadFileShareInstance = nil;
 //修改文件上传的状态
 - (void)changeUploadFileState:(uploadStateType)curUploadStateType withDidUploadBytes:(long)didUpLoadBytes withModel:(uploadFileDataModel*)model  complete:(custom_complete_B)complete
 {
-    if(model.bg_id.integerValue == _curUploadFileDataModel.bg_id.integerValue){
-        _curUploadFileDataModel.curUploadStateType = curUploadStateType;
-        _curUploadFileDataModel.didUploadBytes = didUpLoadBytes;
+    if(model.bg_id.integerValue != _curUploadFileDataModel.bg_id.integerValue){
+        return;
     }
-    model.curUploadStateType = curUploadStateType;
-    model.didUploadBytes = didUpLoadBytes;
     
+    _curUploadFileDataModel.curUploadStateType = curUploadStateType;
+    _curUploadFileDataModel.didUploadBytes = didUpLoadBytes;
     
-    if(!_isSuspendType || curUploadStateType == uploadStateSuspend){
-        [[NSNotificationCenter defaultCenter] postNotificationName:uploadFileRefreshNotification object:model];
+    if(curUploadStateType == uploadStateDone){
+        _curUploadFileDataModel.videoData = [NSData new];
+        
+        if(_curUploadFileDataModel.curUploadFileType == uploadFileTypeVideo){
+            [cachesFileManager removeItemAtPath:_curUploadFileDataModel.filename type:uploadFileTypeVideo error:nil];
+        }
+        
+        [self handleDatabaseArrByDelete:_curUploadFileDataModel];
+        [self handleDatabaseArrByInDone:_curUploadFileDataModel];
     }
-    
-    if(curUploadStateType == uploadStateUploading){
-        return;
+    else if(curUploadStateType == uploadStateFail){
+        [self handleDatabaseArrByDelete:_curUploadFileDataModel];
+        [self handleDatabaseArrByInFail:_curUploadFileDataModel];
     }
-   
-    
-    //NSNumber * numberUploadState = nil;
-    NSString* where = nil;
+
+    [_curUploadFileDataModel bg_saveOrUpdateAsync:^(BOOL isSuccess) {
+        //HLog(@"%@ 写入 %@", model.filename, isSuccess ? @"成功":@"失败");
+    }];
+        
     
-//    if(curUploadStateType == uploadStateDone)
-//    {//只有上传中的才可能是完成的
-//        numberUploadState =  [NSNumber numberWithInt:uploadStateUploading];
-//        where = [NSString stringWithFormat:@"where %@=%@ and %@=%@ ",bg_sqlKey(@"filename"),bg_sqlValue(_curUploadFileDataModel.filename),bg_sqlKey(@"curUploadStateType"),bg_sqlValue(numberUploadState)];
-//    }
-//    else
-//    {//查找非上传完成的
-//        numberUploadState =  [NSNumber numberWithInt:uploadStateDone];
-//        where = [NSString stringWithFormat:@"where %@=%@ and %@!=%@ ",bg_sqlKey(@"filename"),bg_sqlValue(_curUploadFileDataModel.filename),bg_sqlKey(@"curUploadStateType"),bg_sqlValue(numberUploadState)];
-//    }
+    if(!_isSuspendType || curUploadStateType == uploadStateSuspend){
+        [[NSNotificationCenter defaultCenter] postNotificationName:uploadFileRefreshNotification object:model];
+    }
     
-    where = [NSString stringWithFormat:@"where %@=%@ ",bg_sqlKey(@"bg_id"),bg_sqlValue(model.bg_id)];
-    //HLog(@"ffff:%@",_curUploadFileDataModel.bg_id);
-    
-    KWeakSelf
-    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT,0), ^{
-            [uploadFileDataModel bg_findAsync:upLoadFile_image_tableName where:where complete:^(NSArray * _Nullable array) {
-                for (uploadFileDataModel * curModel in array) {
-                    curModel.curUploadStateType = curUploadStateType;
-                    curModel.didUploadBytes = didUpLoadBytes;
-                    
-                    if(curUploadStateType == uploadStateDone){
-                        curModel.videoData = [NSData new];
-                        
-                        if(curModel.curUploadFileType == uploadFileTypeVideo){
-                            [cachesFileManager removeItemAtPath:curModel.filename type:uploadFileTypeVideo error:nil];
-                        }
-                        
-                        [weakSelf handleDatabaseArrByDelete:curModel];
-                        [weakSelf handleDatabaseArrByInDone:curModel];
-                    }
-                    else if(curUploadStateType == uploadStateFail){
-                        [weakSelf handleDatabaseArrByDelete:curModel];
-                        [weakSelf handleDatabaseArrByInFail:curModel];
-                    }
-                    
-                    [curModel bg_saveOrUpdateAsync:^(BOOL isSuccess) {
-                        //HLog(@"%@ 写入 %@", model.filename, isSuccess ? @"成功":@"失败");
-                    }];
-                    
-                }
-                
-                complete(YES);
-            }];
-        });
+    complete(YES);
     
+    return;
+
+//    NSString* where = nil;
+//
+//    where = [NSString stringWithFormat:@"where %@=%@ ",bg_sqlKey(@"bg_id"),bg_sqlValue(model.bg_id)];
+//    //HLog(@"ffff:%@",_curUploadFileDataModel.bg_id);
+//
+//    KWeakSelf
+//    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT,0), ^{
+//            [uploadFileDataModel bg_findAsync:upLoadFile_image_tableName where:where complete:^(NSArray * _Nullable array) {
+//                for (uploadFileDataModel * curModel in array) {
+//                    curModel.curUploadStateType = curUploadStateType;
+//                    curModel.didUploadBytes = didUpLoadBytes;
+//
+//                    if(curUploadStateType == uploadStateDone){
+//                        curModel.videoData = [NSData new];
+//
+//                        if(curModel.curUploadFileType == uploadFileTypeVideo){
+//                            [cachesFileManager removeItemAtPath:curModel.filename type:uploadFileTypeVideo error:nil];
+//                        }
+//
+//                        [weakSelf handleDatabaseArrByDelete:curModel];
+//                        [weakSelf handleDatabaseArrByInDone:curModel];
+//                    }
+//                    else if(curUploadStateType == uploadStateFail){
+//                        [weakSelf handleDatabaseArrByDelete:curModel];
+//                        [weakSelf handleDatabaseArrByInFail:curModel];
+//                    }
+//
+//                    [curModel bg_saveOrUpdateAsync:^(BOOL isSuccess) {
+//                        //HLog(@"%@ 写入 %@", model.filename, isSuccess ? @"成功":@"失败");
+//                    }];
+//
+//                }
+//
+//                complete(YES);
+//            }];
+//        });
+//
 
 }
 

+ 63 - 98
创维盒子/双子星云手机/Class/Set/uploadFile/uploadFileRecordViewController.m

@@ -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];

创维盒子/双子星云手机/Class/Set/uploadFile/photoView/backupsFileRecordCell.h → 创维盒子/双子星云手机/Class/Set/uploadFile/uploadFileView/backupsFileRecordCell.h


创维盒子/双子星云手机/Class/Set/uploadFile/photoView/backupsFileRecordCell.m → 创维盒子/双子星云手机/Class/Set/uploadFile/uploadFileView/backupsFileRecordCell.m


创维盒子/双子星云手机/Class/Set/uploadFile/photoView/backupsFilerecordTableView.h → 创维盒子/双子星云手机/Class/Set/uploadFile/uploadFileView/backupsFilerecordTableView.h


创维盒子/双子星云手机/Class/Set/uploadFile/photoView/backupsFilerecordTableView.m → 创维盒子/双子星云手机/Class/Set/uploadFile/uploadFileView/backupsFilerecordTableView.m


创维盒子/双子星云手机/Class/Set/uploadFile/photoView/uploadFileRecordBgScorllView.h → 创维盒子/双子星云手机/Class/Set/uploadFile/uploadFileView/uploadFileRecordBgScorllView.h


创维盒子/双子星云手机/Class/Set/uploadFile/photoView/uploadFileRecordBgScorllView.m → 创维盒子/双子星云手机/Class/Set/uploadFile/uploadFileView/uploadFileRecordBgScorllView.m


创维盒子/双子星云手机/Class/Set/uploadFile/photoView/uploadFileRecordCell.h → 创维盒子/双子星云手机/Class/Set/uploadFile/uploadFileView/uploadFileRecordCell.h


+ 4 - 5
创维盒子/双子星云手机/Class/Set/uploadFile/photoView/uploadFileRecordCell.m

@@ -187,11 +187,11 @@
     else{
         self.selectButton.hidden = YES;
         
-//        if(_curUploadFileDataModel.curUploadStateType == uploadStateWait
-//           ||_curUploadFileDataModel.curUploadStateType == uploadStateUploading
-//           ||_curUploadFileDataModel.curUploadStateType == uploadStateSuspend){
+        if(_curUploadFileDataModel.curUploadStateType == uploadStateWait
+           ||_curUploadFileDataModel.curUploadStateType == uploadStateUploading
+           ||_curUploadFileDataModel.curUploadStateType == uploadStateSuspend){
             _upLoadStateButton.hidden = NO;
-        //}
+        }
     }
 }
 
@@ -292,7 +292,6 @@
     }
     else if(curUploadFileDataModel.curUploadStateType == uploadStateFail){
         [_upLoadStateButton setImage:[UIImage imageNamed:@"uploadFile_reStart"] forState:UIControlStateNormal];
-        _upLoadStateButton.hidden = YES;
         _progressBgView.hidden = YES;
     }
     else{

创维盒子/双子星云手机/Class/Set/uploadFile/photoView/uploadFileRecordEditBottomView.h → 创维盒子/双子星云手机/Class/Set/uploadFile/uploadFileView/uploadFileRecordEditBottomView.h


创维盒子/双子星云手机/Class/Set/uploadFile/photoView/uploadFileRecordEditBottomView.m → 创维盒子/双子星云手机/Class/Set/uploadFile/uploadFileView/uploadFileRecordEditBottomView.m


+ 6 - 0
创维盒子/双子星云手机/Class/Set/uploadFile/photoView/uploadFileRecordTableView.h

@@ -17,6 +17,10 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, strong)NSMutableArray *uploadfailArr;
 @property (nonatomic, strong)NSMutableArray *uploadDoneArr;
 
+@property (nonatomic,strong) uploadFileRecordTableViewHeadView *uploadingHeadView;
+@property (nonatomic,strong) uploadFileRecordTableViewHeadView *failHeadView;
+@property (nonatomic,strong) uploadFileRecordTableViewHeadView *doneHeadView;
+
 @property (nonatomic,assign) BOOL isEditType;
 @property (nonatomic,assign) BOOL isSelectAllType;
 @property (nonatomic,strong) NSMutableArray *selectModelArr;
@@ -24,6 +28,8 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic,copy) void (^didLongPressClick)(void);
 @property (nonatomic,copy) void (^didClickReUploadBlock)(uploadFileDataModel* model);
 
+@property (nonatomic,copy) void (^didClickSectionHeadViewRightButton)(NSInteger section);
+
 -(void)reloadDataFun;
 - (void)RefreshAllDataFun;
 #pragma mark 单个点击选中后删除

+ 73 - 50
创维盒子/双子星云手机/Class/Set/uploadFile/photoView/uploadFileRecordTableView.m

@@ -16,9 +16,6 @@
    
 }
 
-@property (nonatomic,strong) uploadFileRecordTableViewHeadView *uploadingHeadView;
-@property (nonatomic,strong) uploadFileRecordTableViewHeadView *failHeadView;
-@property (nonatomic,strong) uploadFileRecordTableViewHeadView *doneHeadView;
 
 @property (nonatomic, strong) NSMutableArray *curDataArr;
 @end
@@ -29,6 +26,7 @@
     self = [super initWithFrame:frame];
     if (self) {
         [self initCommon];
+        [self initTableHeaderInSectionFun];
         _selectModelArr = [NSMutableArray new];
         _curDataArr = [NSMutableArray new];
     }
@@ -197,46 +195,19 @@
         }
     }
     
-    uploadFileRecordTableViewHeadView *headView = [[uploadFileRecordTableViewHeadView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_W, 40)];
-    //headView.backgroundColor = [UIColor greenColor];
     
-    headView.didClickButFun = ^{
-            //[weakSelf didClickAllSuspendInLoadingFun];
-    };
+    [self RefresHeadUIFun];
     
     if(curType == 2){
-        
-        if(_doneHeadView){
-            return _doneHeadView;
-        }
-        else{
-            _doneHeadView = headView;
-        }
-        
+        return _doneHeadView;
     }
     else if(curType == 1){
-        
-        if(_failHeadView){
-            return _failHeadView;
-        }
-        else{
-            _failHeadView = headView;
-        }
-        
+        return _failHeadView;
     }
     else{
-        if(_uploadingHeadView){
-            return _uploadingHeadView;
-        }
-        else{
-            _uploadingHeadView = headView;
-        }
-        
+        return _uploadingHeadView;
     }
     
-    [self RefresHeadUIFun];
-    
-    return headView;
 }
 
 - (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section
@@ -291,24 +262,76 @@
     });
 }
 
-#pragma mark 熟悉头部数据
--(void)RefresHeadUIFun
+#pragma mark 初始化段头
+- (void)initTableHeaderInSectionFun
 {
-//    uploadFileRecordTableViewHeadView *headView = (uploadFileRecordTableViewHeadView *)self.tableHeaderView;
-//
-//    if(!headView || ![headView isKindOfClass:[uploadFileRecordTableViewHeadView class]]){
-//        return;
-//    }
-//
-//    if(!_curDataArr ||_curDataArr.count ==0){
-//        headView.hidden = YES;
-//        return;
-//    }
-//
-//    headView.hidden = NO;
-//
-//    NSInteger tag = self.tag;
+    KWeakSelf
+    if(!_uploadingHeadView){
+        _uploadingHeadView = [[uploadFileRecordTableViewHeadView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_W, 40)];
+        //headView.backgroundColor = [UIColor greenColor];
+        
+        NSString *leftStr =  NSLocalizedString(@"File_upload_Record_uploading",nil);
+        NSString *rightStr =  NSLocalizedString(@"File_upload_Record_all_suspend",nil);
+        NSString *rightSelectStr =  NSLocalizedString(@"File_upload_Record_all_open",nil);
+        NSString *titleStr = [[NSString alloc] initWithFormat:@"%@ (%ld)",leftStr,_uploadingArr.count];
+
+        _uploadingHeadView.titleLabel.text = titleStr;
+        [_uploadingHeadView.rightButton setTitle:rightStr forState:UIControlStateNormal];
+        [_uploadingHeadView.rightButton setTitle:rightSelectStr forState:UIControlStateSelected];
+        
+        _uploadingHeadView.didClickButFun = ^{
+            [weakSelf didClickRightButtonFun:0];
+        };
+    }
+    
+
+    if(!_failHeadView){
+        _failHeadView = [[uploadFileRecordTableViewHeadView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_W, 40)];
+        //headView.backgroundColor = [UIColor greenColor];
+        
+        NSString *leftStr =  NSLocalizedString(@"File_upload_Record_did_upload",nil);
+        NSString *rightStr =  NSLocalizedString(@"File_upload_Record_clear_Record",nil);
+        NSString *titleStr = [[NSString alloc] initWithFormat:@"%@ (%ld)",leftStr,_uploadfailArr.count];
+
+         _failHeadView.titleLabel.text = titleStr;
+        [_failHeadView.rightButton setTitle:rightStr forState:UIControlStateNormal];
+         
+        _failHeadView.didClickButFun = ^{
+            [weakSelf didClickRightButtonFun:2];
+        };
+    }
+    
+    if(!_doneHeadView){
+        _doneHeadView = [[uploadFileRecordTableViewHeadView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_W, 40)];
+        //headView.backgroundColor = [UIColor greenColor];
+        
+        NSString *leftStr =  NSLocalizedString(@"File_upload_Record_did_upload",nil);
+        NSString *rightStr =  NSLocalizedString(@"File_upload_Record_clear_Record",nil);
+        NSString *titleStr = [[NSString alloc] initWithFormat:@"%@ (%ld)",leftStr,_uploadDoneArr.count];
+
+        _doneHeadView.titleLabel.text = titleStr;
+        [_doneHeadView.rightButton setTitle:rightStr forState:UIControlStateNormal];
+        
+        _doneHeadView.didClickButFun = ^{
+            [weakSelf didClickRightButtonFun:1];
+        };
+    }
+     
     
+}
+
+#pragma mark 点击头部右边按钮
+- (void)didClickRightButtonFun:(NSInteger)section
+{
+    if(_didClickSectionHeadViewRightButton){
+        _didClickSectionHeadViewRightButton(section);
+    }
+}
+
+#pragma mark 刷新头部数据
+-(void)RefresHeadUIFun
+{
+
     if(_uploadingHeadView){
         NSString *leftStr =  NSLocalizedString(@"File_upload_Record_uploading",nil);
         NSString *rightStr =  NSLocalizedString(@"File_upload_Record_all_suspend",nil);

创维盒子/双子星云手机/Class/Set/uploadFile/photoView/uploadFileRecordTableViewHeadView.h → 创维盒子/双子星云手机/Class/Set/uploadFile/uploadFileView/uploadFileRecordTableViewHeadView.h


创维盒子/双子星云手机/Class/Set/uploadFile/photoView/uploadFileRecordTableViewHeadView.m → 创维盒子/双子星云手机/Class/Set/uploadFile/uploadFileView/uploadFileRecordTableViewHeadView.m