1.1.3bug上传

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

@@ -212,6 +212,10 @@
     _curUploadFileDataModel.imageData = nil;
     _curUploadFileDataModel = nil;
     
+    _fileSpeedlabel.hidden = YES;
+    _progressBgView.hidden = NO;
+    _upLoadStateButton.hidden = NO;
+    
     _curUploadFileDataModel = curUploadFileDataModel;
     //HLog(@"hhhhhhh  %@ %ld %ld",curUploadFileDataModel.bg_id,curUploadFileDataModel.curUploadStateType,curUploadFileDataModel.didUploadBytes);
     
@@ -248,7 +252,7 @@
     
     
     //_fileImageView.image = [UIImage imageWithData:curUploadFileDataModel.imageData];
-    _fileSpeedlabel.hidden = YES;
+ 
     
     if(curUploadFileDataModel.curUploadStateType == uploadStateWait){
         [_upLoadStateButton setImage:[UIImage imageNamed:@"uploadFile_wait"] forState:UIControlStateNormal];
@@ -288,6 +292,7 @@
     }
     else if(curUploadFileDataModel.curUploadStateType == uploadStateFail){
         [_upLoadStateButton setImage:[UIImage imageNamed:@"uploadFile_reStart"] forState:UIControlStateNormal];
+        _upLoadStateButton.hidden = YES;
         _progressBgView.hidden = YES;
     }
     else{

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

@@ -13,6 +13,10 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface uploadFileRecordTableView : UITableView
 @property (nonatomic, strong) NSMutableArray *outSideDataArr;
+@property (nonatomic, strong)NSMutableArray *uploadingArr;
+@property (nonatomic, strong)NSMutableArray *uploadfailArr;
+@property (nonatomic, strong)NSMutableArray *uploadDoneArr;
+
 @property (nonatomic,assign) BOOL isEditType;
 @property (nonatomic,assign) BOOL isSelectAllType;
 @property (nonatomic,strong) NSMutableArray *selectModelArr;
@@ -21,6 +25,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic,copy) void (^didClickReUploadBlock)(uploadFileDataModel* model);
 
 -(void)reloadDataFun;
+- (void)RefreshAllDataFun;
 #pragma mark 单个点击选中后删除
 - (void)deleteModelOneByOneFun;
 @end

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

@@ -13,9 +13,7 @@
 
 @interface uploadFileRecordTableView()<UITableViewDataSource,UITableViewDelegate,DZNEmptyDataSetSource, DZNEmptyDataSetDelegate>
 {
-    NSMutableArray *uploadingArr;
-    NSMutableArray *uploadfailArr;
-    NSMutableArray *uploadDoneArr;
+   
 }
 
 @property (nonatomic,strong) uploadFileRecordTableViewHeadView *uploadingHeadView;
@@ -64,9 +62,9 @@
     
     _outSideDataArr = outSideDataArr;
     
-    uploadingArr = outSideDataArr[0];
-    uploadfailArr = outSideDataArr[1];
-    uploadDoneArr = outSideDataArr[2];
+    _uploadingArr = outSideDataArr[0];
+    _uploadDoneArr = outSideDataArr[1];
+    _uploadfailArr = outSideDataArr[2];
     
     [self RefreshAllDataFun];
 }
@@ -75,16 +73,16 @@
 {
     NSMutableArray *totalArr = [NSMutableArray new];
     
-    if(uploadingArr.count>0){
-        [totalArr addObject:uploadingArr];
+    if(_uploadingArr.count>0){
+        [totalArr addObject:_uploadingArr];
     }
     
-    if(uploadfailArr.count>0){
-        [totalArr addObject:uploadfailArr];
+    if(_uploadfailArr.count>0){
+        [totalArr addObject:_uploadfailArr];
     }
     
-    if(uploadDoneArr.count>0){
-        [totalArr addObject:uploadDoneArr];
+    if(_uploadDoneArr.count>0){
+        [totalArr addObject:_uploadDoneArr];
     }
     
     _curDataArr = totalArr;
@@ -177,10 +175,10 @@
         curType = 2;
     }
     else if(section == 1){
-        if(uploadingArr.count == 0){
+        if(_uploadingArr.count == 0){
             curType = 2;
         }
-        else if(uploadfailArr.count == 0){
+        else if(_uploadfailArr.count == 0){
             curType = 2;
         }
         else{
@@ -188,10 +186,10 @@
         }
     }
     else{
-        if(uploadingArr.count > 0){
+        if(_uploadingArr.count > 0){
             curType = 0;
         }
-        else if(uploadfailArr.count > 0){
+        else if(_uploadfailArr.count > 0){
             curType = 1;
         }
         else{
@@ -315,13 +313,13 @@
         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];
+        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];
         
-        if(uploadingArr.count == 0){
+        if(_uploadingArr.count == 0){
             _uploadingHeadView.hidden = YES;
         }
         else{
@@ -333,12 +331,12 @@
      if(_failHeadView){
         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];
+        NSString *titleStr = [[NSString alloc] initWithFormat:@"%@ (%ld)",leftStr,_uploadfailArr.count];
 
          _failHeadView.titleLabel.text = titleStr;
         [_failHeadView.rightButton setTitle:rightStr forState:UIControlStateNormal];
          
-         if(uploadfailArr.count == 0){
+         if(_uploadfailArr.count == 0){
              _failHeadView.hidden = YES;
          }
          else{
@@ -349,12 +347,12 @@
     if(_doneHeadView){
         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];
+        NSString *titleStr = [[NSString alloc] initWithFormat:@"%@ (%ld)",leftStr,_uploadDoneArr.count];
 
         _doneHeadView.titleLabel.text = titleStr;
         [_doneHeadView.rightButton setTitle:rightStr forState:UIControlStateNormal];
         
-        if(uploadDoneArr.count == 0){
+        if(_uploadDoneArr.count == 0){
             _doneHeadView.hidden = YES;
         }
         else{

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

@@ -607,6 +607,8 @@ static uploadFileManager * cur_uploadFileShareInstance = nil;
         [where appendString:curStr];
         isSuc = [uploadFileDataModel bg_delete:upLoadFile_image_tableName where:where];
         
+        [self handleDatabaseArrByDelete:uploadFileDataMod];
+        
         //删除本地图片
         if(isSuc && isDelCache){
             //判断是否可以删除本地缓存
@@ -615,7 +617,6 @@ static uploadFileManager * cur_uploadFileShareInstance = nil;
                 NSMutableArray *uploadDoneArr = _databaseArr[1];
                 NSMutableArray *uploadFailArr = _databaseArr[2];
                 
-                [self handleDatabaseArrByDelete:uploadFileDataMod];
                 
                 BOOL isNeedDel = YES;
                 for (uploadFileDataModel *baseUploadFileDataMod in uploadingArr) {

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

@@ -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];
+            
+        });
+    }];
     
 }
 

创维盒子/双子星云手机/CloudPlayer/PlayerViewController+upLoadFile.m

@@ -79,9 +79,9 @@
                                     }
                                 }];
                                 
-//                                mainBlock(^{
-//                                    [[iToast makeText:NSLocalizedString(@"File_upload_file_already_exists",nil)] show];
-//                                });
+                                mainBlock(^{
+                                    [[iToast makeText:NSLocalizedString(@"File_upload_file_already_exists",nil)] show];
+                                });
                                 
                                 HLog(@"hxd already 上传文件已存在")
                                 return;