1.去掉上传等待的逻辑

创维盒子/双子星云手机/Class/Set/uploadFile/model/uploadFileDataModel.h

@@ -11,7 +11,7 @@
 NS_ASSUME_NONNULL_BEGIN
 
 typedef enum{
-    uploadStateWait = 0,
+    uploadStateWait = 0,//弃用 但是为了兼容 要保留
     uploadStateUploading,
     uploadStateSuspend,
     uploadStateFail,

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

@@ -144,7 +144,8 @@ static uploadFileManager * cur_uploadFileShareInstance = nil;
         curModel.imageData = model.imageData;
         curModel.videoData = model.videoData;
         curModel.filename = [model.asset valueForKey:@"filename"];
-        curModel.curUploadStateType = uploadStateWait;
+        //curModel.curUploadStateType = uploadStateWait;
+        curModel.curUploadStateType = uploadStateUploading;
         
         if(model.type == TZAssetModelMediaTypeVideo){
             curModel.curUploadFileType = uploadFileTypeVideo;
@@ -399,10 +400,12 @@ static uploadFileManager * cur_uploadFileShareInstance = nil;
             [cachesFileManager removeItemAtPath:_curUploadFileDataModel.filename type:uploadFileTypeVideo error:nil];
         }
         
+        [self->_fileModelDataArr removeObject:self->_curUploadFileDataModel];
         [self handleDatabaseArrDeteleInUploading:_curUploadFileDataModel];
         [self handleDatabaseArrByInDone:_curUploadFileDataModel];
     }
     else if(curUploadStateType == uploadStateFail){
+        [self->_fileModelDataArr removeObject:self->_curUploadFileDataModel];
         [self handleDatabaseArrDeteleInUploading:_curUploadFileDataModel];
         [self handleDatabaseArrByInFail:_curUploadFileDataModel];
     }
@@ -485,6 +488,10 @@ static uploadFileManager * cur_uploadFileShareInstance = nil;
 
 - (void)handleDatabaseArrDeteleInUploading:(uploadFileDataModel*)uploadmodel
 {
+    if(!uploadmodel){
+        return;
+    }
+    
     if(_databaseArr && _databaseArr.count == 3 ){
         NSMutableArray *uploadingArr = _databaseArr[0];
         NSInteger count = uploadingArr.count;
@@ -504,7 +511,7 @@ static uploadFileManager * cur_uploadFileShareInstance = nil;
         NSInteger atferDelCount2 = uploadingArr.count;
         
         if(count == atferDelCount2){
-            HLog(@"\n\n\nerror:上传中的任务没有删除掉database\n\n\n\n");
+            //HLog(@"\n\n\nerror:上传中的任务没有删除掉database\n\n\n\n");
         }
     }
 }
@@ -625,8 +632,7 @@ static uploadFileManager * cur_uploadFileShareInstance = nil;
     long totalSizeByte = _curUploadFileDataModel.totalBytes;
     
     [self changeUploadFileState:uploadStateDone withDidUploadBytes:totalSizeByte withModel:_curUploadFileDataModel complete:^(BOOL isSuccess) {
-        [self->_fileModelDataArr removeObject:self->_curUploadFileDataModel];
-        
+
         self->_isUploadIngType = NO;
         if(self->_fileModelDataArr.count > 0){
             [self beginUploadFileFun];
@@ -638,7 +644,6 @@ static uploadFileManager * cur_uploadFileShareInstance = nil;
 - (void)uploadFileFailFun
 {
     [self changeUploadFileState:uploadStateFail withDidUploadBytes:_curUploadFileDataModel.didUploadBytes withModel:_curUploadFileDataModel complete:^(BOOL isSuccess) {
-        [self->_fileModelDataArr removeObject:self->_curUploadFileDataModel];
          
         if(self->_fileModelDataArr.count > 0){
             [self beginUploadFileFun];
@@ -650,7 +655,7 @@ static uploadFileManager * cur_uploadFileShareInstance = nil;
     }];
     
     mainBlock(^{
-        [[iToast makeText:NSLocalizedString(@"File_upload_fail",nil)] show];
+        //[[iToast makeText:NSLocalizedString(@"File_upload_fail",nil)] show];
     });
 }
 
@@ -732,6 +737,7 @@ static uploadFileManager * cur_uploadFileShareInstance = nil;
            {
                if(curUploadFileDataMod.bg_id.integerValue == uploadFileDataMod.bg_id.integerValue){
                    [_fileModelDataArr removeObject:curUploadFileDataMod];
+                   [self handleDatabaseArrDeteleInUploading:curUploadFileDataMod];
                    break;
                }
            }

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

@@ -265,9 +265,9 @@
             if([AFNetworkReachabilityManager sharedManager].networkReachabilityStatus == AFNetworkReachabilityStatusReachableViaWWAN){
                 [[iToast makeText:NSLocalizedString(@"backups_cannot_use_WWAN_tip",nil)] show];
                 [self reloadData];
+                return;
             }
             
-            return;
         }
         
         [[backupsFileManager shareInstance] reBackupsFileFunBy:model];

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

@@ -492,7 +492,7 @@
     }
     
     NSMutableArray*arr = [NSMutableArray new];
-    model.curUploadStateType = uploadStateWait;
+    model.curUploadStateType = uploadStateUploading;
     [arr addObject:model];
     [[uploadFileManager shareInstance] reUploadFileFunBy:arr withAll:NO];
     

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

@@ -122,11 +122,6 @@
         [self clearUploadFileDataFun];
         [[uploadFileManager shareInstance] uploadFileFailFun];
         
-        self.taskUid = nil;
-        
-        mainBlock(^{
-            [[iToast makeText:NSLocalizedString(@"File_upload_fail",nil)] show];
-        });
         HLog(@"hxd fail 上传任务异常终止")
         return;
     }
@@ -159,11 +154,6 @@
         [self clearUploadFileDataFun];
         [[uploadFileManager shareInstance] uploadFileFailFun];
         
-        self.taskUid = nil;
-        
-        mainBlock(^{
-            [[iToast makeText:NSLocalizedString(@"File_upload_fail",nil)] show];
-        });
         HLog(@"hxd fail 上传任务异常终止")
         return;
     }