1.代码暂存

创维盒子/双子星云手机/AppDelegate/PrefixHeader.pch

@@ -82,8 +82,8 @@ isBangsScreen; \
 //#define CloudService           @"http://14.18.190.141:11180"
 //#define CloudService           @"http://14.18.190.141:1280"
 //创维盒子 测试地址
-#define CloudService   @"http://14.18.190.141:1801"
-//#define CloudService   @"http://hiboxde.armclouding.com:7780"
+//#define CloudService   @"http://14.18.190.141:1801"
+#define CloudService   @"http://hiboxde.armclouding.com:7780"
 
 
 #define AESCODEKEEYY @"fvO8gAfNSr1tbdQe"

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

@@ -12,7 +12,7 @@
 NS_ASSUME_NONNULL_BEGIN
 
 @interface uploadFileRecordTableView : UITableView
-@property (nonatomic, strong) NSMutableArray *curDataArr;
+@property (nonatomic, strong) NSMutableArray *outSideDataArr;
 @property (nonatomic,assign) BOOL isEditType;
 @property (nonatomic,assign) BOOL isSelectAllType;
 @property (nonatomic,strong) NSMutableArray *selectModelArr;

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

@@ -11,7 +11,12 @@
 #import "uploadFileManager.h"
 
 @interface uploadFileRecordTableView()<UITableViewDataSource,UITableViewDelegate,DZNEmptyDataSetSource, DZNEmptyDataSetDelegate>
-
+{
+    NSMutableArray *uploadingArr;
+    NSMutableArray *uploadfailArr;
+    NSMutableArray *uploadDoneArr;
+}
+@property (nonatomic, strong) NSMutableArray *curDataArr;
 @end
 
 @implementation uploadFileRecordTableView
@@ -45,16 +50,50 @@
     self.emptyDataSetDelegate = self;
 }
 
+- (void)setOutSideDataArr:(NSMutableArray *)outSideDataArr{
+    
+    if(!outSideDataArr || outSideDataArr.count != 3){
+        return;
+    }
+    
+    uploadingArr = outSideDataArr[0];
+    uploadfailArr = outSideDataArr[1];
+    uploadDoneArr = outSideDataArr[2];
+    
+    [self RefreshAllDataFun];
+}
+
+- (void)RefreshAllDataFun
+{
+    NSMutableArray *totalArr = [NSMutableArray new];
+    
+    if(uploadingArr.count>0){
+        [totalArr addObject:uploadingArr];
+    }
+    
+    if(uploadfailArr.count>0){
+        [totalArr addObject:uploadfailArr];
+    }
+    
+    if(uploadDoneArr.count>0){
+        [totalArr addObject:uploadDoneArr];
+    }
+    
+    _curDataArr = totalArr;
+    
+    [self reloadDataFun];
+}
 
 #pragma mark - 列表委托
 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView{
-    return 1;
+    return _curDataArr.count;
 }
 
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
     
-    if(_curDataArr){
-        return _curDataArr.count;
+    if(section < _curDataArr.count){
+        NSArray *curArr = _curDataArr[section];
+        return curArr.count;
     }
     
     return 0;
@@ -64,6 +103,7 @@
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{
     
     NSInteger row = indexPath.row;
+    NSInteger section = indexPath.section;
     static NSString *identifier = @"uploadFileRecordCell";
     
     uploadFileRecordCell * cell =  [tableView dequeueReusableCellWithIdentifier:identifier];

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

@@ -34,7 +34,6 @@
 
 @property (nonatomic,strong) uploadFileRecordTableViewHeadView *leftHeadView;
 @property (nonatomic,strong) uploadFileRecordTableViewHeadView *midHeadView;
-//@property (nonatomic,strong) uploadFileRecordTableViewHeadView *rightHeadView;
 
 
 //@property (nonatomic, strong) NSMutableArray *allDataArr;
@@ -181,34 +180,8 @@
         [weakSelf didClickClearRecordInDoneFun];
     };
     
-//    _rightHeadView =  [[uploadFileRecordTableViewHeadView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_W, 40)];
-//    _rightTableView.tableHeaderView = _rightHeadView;
-//    _rightHeadView.didClickButFun = ^{
-//        [weakSelf didClickClearRecordInFailFun];
-//    };
-    
-    
-    
-    
-//    _uploadFileRecordBodyV = [[uploadFileRecordBodyView alloc] init];
-//
-//    [self.view addSubview:_uploadFileRecordBodyV];
-//
-//    [_uploadFileRecordBodyV mas_makeConstraints:^(MASConstraintMaker *make) {
-//        make.left.mas_equalTo(0);
-//        make.right.mas_equalTo(0);
-//        make.top.mas_equalTo(_uploadFileRecordheadV.mas_bottom).offset(0.0);
-//        make.bottom.mas_equalTo(0);
-//    }];
-//
-    
-//    _uploadFileRecordBodyV.didScrollFun = ^(NSInteger index) {
-//        [weakSelf didScorllBodyFun:index];
-//    };
-//
-//    _uploadFileRecordBodyV.didLongPressClick = ^{
-//        weakSelf.isEditType = YES;
-//    };
+
+
   
     _leftButton = [[UIButton alloc] init];
     [_leftButton setTitleColor:[UIColor hwColor:@"#01B7EA" alpha:1.0] forState:UIControlStateNormal];
@@ -378,10 +351,11 @@
         //NSMutableArray *arr1 = Arr;
         //[weakSelf setRecordBodyDataFunBy:arr1];
         
-        weakSelf.leftTableView.curDataArr = Arr[0];
+        //weakSelf.leftTableView.curDataArr = Arr[0];
+        weakSelf.leftTableView.outSideDataArr = Arr;
         [weakSelf.leftTableView reloadDataFun];
         
-        weakSelf.midTableView.curDataArr = Arr[1];
+        //weakSelf.midTableView.curDataArr = Arr[1];
         [weakSelf.midTableView reloadDataFun];
         
 //        weakSelf.rightTableView.curDataArr = Arr[2];
@@ -411,14 +385,11 @@
         }
         
         mainBlock(^{
-            weakSelf.leftTableView.curDataArr = curLoadIngArr;
+            weakSelf.leftTableView.outSideDataArr = Arr;
             [weakSelf.leftTableView reloadDataFun];
             
-            weakSelf.midTableView.curDataArr = Arr[1];
-            [weakSelf.midTableView reloadDataFun];
-            
-//            weakSelf.rightTableView.curDataArr = Arr[2];
-//            [weakSelf.rightTableView reloadDataFun];
+//            weakSelf.midTableView.curDataArr = Arr[1];
+//            [weakSelf.midTableView reloadDataFun];
             
             [weakSelf handleUploadingRightButFun];
         });
@@ -490,23 +461,23 @@
 #pragma mark 处理上传中的 全部暂停等
 - (void)handleUploadingRightButFun
 {
-    if(_leftTableView.curDataArr.count ==0){
-        //不处理
-    }
-    else{
-        NSMutableArray *upLoadingArr = [uploadFileManager shareInstance].fileModelDataArr;
-        BOOL isUploadIngType = [uploadFileManager shareInstance].isUploadIngType;
-        
-        if(!upLoadingArr ||upLoadingArr.count == 0 || !isUploadIngType){//不是上传状态
-            _leftHeadView.rightButton.selected = YES;
-        }
-        else if(upLoadingArr.count == _leftTableView.curDataArr.count){
-            _leftHeadView.rightButton.selected = NO;
-        }
-        else{
-            _leftHeadView.rightButton.selected = YES;
-        }
-    }
+//    if(_leftTableView.curDataArr.count ==0){
+//        //不处理
+//    }
+//    else{
+//        NSMutableArray *upLoadingArr = [uploadFileManager shareInstance].fileModelDataArr;
+//        BOOL isUploadIngType = [uploadFileManager shareInstance].isUploadIngType;
+//
+//        if(!upLoadingArr ||upLoadingArr.count == 0 || !isUploadIngType){//不是上传状态
+//            _leftHeadView.rightButton.selected = YES;
+//        }
+//        else if(upLoadingArr.count == _leftTableView.curDataArr.count){
+//            _leftHeadView.rightButton.selected = NO;
+//        }
+//        else{
+//            _leftHeadView.rightButton.selected = YES;
+//        }
+//    }
 }
 
 
@@ -536,75 +507,75 @@
     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];
-            
-        }
-    }
+//    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];
+//
+//        }
+//    }
     
 }
 
@@ -614,34 +585,34 @@
     //HLog(@"%@",uploadFileDataMod);
     
     //UI和数据还没准备好
-    if(!_leftTableView){
-        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-            [[NSNotificationCenter defaultCenter] postNotificationName:uploadFileDeteleNotification object:uploadFileDataMod];
-        });
-        
-        return;
-    }
-    
-    if([uploadFileDataMod isKindOfClass:[uploadFileDataModel class]] ){
-        
-        NSMutableArray *curArr = _leftTableView.curDataArr;
-        
-        NSInteger index = 0;
-        for (uploadFileDataModel*mod in curArr) {
-            HLog(@"bg_id:%@ ?=? %@",mod.bg_id,uploadFileDataMod.bg_id);
-            
-            if(mod.bg_id.integerValue == uploadFileDataMod.bg_id.integerValue){
-                [curArr removeObject:mod];
-                break;
-            }
-            
-            index++;
-        }
-        
-        //精准刷新
-        //[self.uploadFileRecordBodyV RefreshDataWithUploadingArr:_allDataArr[0] withDoneArr:nil withfailArr:nil];
-        [self.leftTableView reloadDataFun];
-    }
+//    if(!_leftTableView){
+//        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+//            [[NSNotificationCenter defaultCenter] postNotificationName:uploadFileDeteleNotification object:uploadFileDataMod];
+//        });
+//
+//        return;
+//    }
+//
+//    if([uploadFileDataMod isKindOfClass:[uploadFileDataModel class]] ){
+//
+//        NSMutableArray *curArr = _leftTableView.curDataArr;
+//
+//        NSInteger index = 0;
+//        for (uploadFileDataModel*mod in curArr) {
+//            HLog(@"bg_id:%@ ?=? %@",mod.bg_id,uploadFileDataMod.bg_id);
+//
+//            if(mod.bg_id.integerValue == uploadFileDataMod.bg_id.integerValue){
+//                [curArr removeObject:mod];
+//                break;
+//            }
+//
+//            index++;
+//        }
+//
+//        //精准刷新
+//        //[self.uploadFileRecordBodyV RefreshDataWithUploadingArr:_allDataArr[0] withDoneArr:nil withfailArr:nil];
+//        [self.leftTableView reloadDataFun];
+//    }
     
 }
 
@@ -767,13 +738,13 @@
 {
     _leftHeadView.rightButton.selected = !_leftHeadView.rightButton.selected;
     
-    if(_leftHeadView.rightButton.selected){
-        [[uploadFileManager shareInstance] suspendUploadFileFun:YES];
-    }
-    else{
-        NSMutableArray *leftArr = _leftTableView.curDataArr;
-        [[uploadFileManager shareInstance] reUploadFileFunBy:leftArr];
-    }
+//    if(_leftHeadView.rightButton.selected){
+//        [[uploadFileManager shareInstance] suspendUploadFileFun:YES];
+//    }
+//    else{
+//        NSMutableArray *leftArr = _leftTableView.curDataArr;
+//        [[uploadFileManager shareInstance] reUploadFileFunBy:leftArr];
+//    }
 }
 #pragma mark 点击上传成功的清空记录
 - (void)didClickClearRecordInDoneFun
@@ -800,14 +771,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:_midTableView.curDataArr withDelCache:YES complete:^(BOOL isSuccess) {
+//        HLog(@"isSuccess:%d",isSuccess);
+//
+//        if(isSuccess){
+//            [self->_midTableView.curDataArr removeAllObjects];
+//            [self->_midTableView reloadDataFun];
+//        }
+//    }];
 }
 
 #pragma mark 点击上传失败的清空记录
@@ -852,22 +823,22 @@
         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];
+//    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{