上传/下载文件时，传输过程中，真机WiFi切换流量时，传输列表提示去开启，开启流量传输后任务未继续传输

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

@@ -275,7 +275,7 @@
         [[nasBackupsManager shareInstance] suspendBackupsFileFun];
         
         //2.重新开启备份
-        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(8 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
             [[nasBackupsManager shareInstance] reBackupsFileFun];
         });
     }
@@ -283,7 +283,7 @@
     //是否上传中 处理切换网络环境 用户无感上传切换
     BOOL needToReUploadTaskType = [nasUploadFileManager shareInstance].needToReUploadTaskType;
     if(needToReUploadTaskType){//如果网络层先保存 这里为YES
-        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(8 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
             [[nasUploadFileManager shareInstance] reUploadFileFunByNetWork];
         });
     }
@@ -292,7 +292,7 @@
         if([nasUploadFileManager shareInstance].uploadingArr.count > 0){
             [[nasUploadFileManager shareInstance] saveUploadingTaskByNetWorkErrorFun];
             //因为不知道是网络变化通知快 还是传输快 这里5秒后重新传
-            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(8 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
                 [[nasUploadFileManager shareInstance] reUploadFileFunByNetWork];
             });
         }
@@ -303,7 +303,7 @@
     BOOL needToReDownloadTaskType = [nasDownloadFileManager shareInstance].needToReDownloadTaskType;
     if(needToReDownloadTaskType){//如果网络层先保存 这里为YES
         //HLog(@"hxd 2222")
-        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(8 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
             [[nasDownloadFileManager shareInstance] reDownloadloadFileFunByNetWork];
         });
     }
@@ -314,7 +314,7 @@
             //HLog(@"hxd 4444")
             [[nasDownloadFileManager shareInstance] saveDownloadloadingTaskByNetWorkErrorFun];
             //因为不知道是网络变化通知快 还是传输快 这里5秒后重新传
-            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(8 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
                 [[nasDownloadFileManager shareInstance] reDownloadloadFileFunByNetWork];
             });
         }

创维盒子/双子星云手机/NAS/nasDownloadManager/nasDownloadFileManager.m

@@ -803,6 +803,16 @@ static nasDownloadFileManager * cur_nasDownloadFileManager = nil;
             fileModel.fileUrl = @"";
         }
         
+        //判断是否可以下载
+        BOOL isCanUseCellular = [HWDataManager getBoolWithKey:stringKeyAddSn(Const_file_Transfe_canUse_Cellular_all)];
+        if(!isCanUseCellular){//不允许流量下载
+            //
+            if([AFNetworkReachabilityManager sharedManager].networkReachabilityStatus == AFNetworkReachabilityStatusReachableViaWWAN){
+                return;
+            }
+            
+        }
+        
         [self beginDownloadFilesByUrls:_netWorkFailSaveArr];
         [_netWorkFailSaveArr removeAllObjects];
     }

创维盒子/双子星云手机/NAS/nasUploadManager/nasUploadFileManager.m

@@ -691,21 +691,35 @@
 - (void)reUploadFileFunByNetWork
 {
     [nasUploadFileManager shareInstance].needToReUploadTaskType = NO;
-    
+    HLog(@"reUploadFileFunByNetWork")
     if(_netWorkFailSaveArr && _netWorkFailSaveArr.count >0){
-        
+        HLog(@"reUploadFileFunByNetWork  _netWorkFailSaveArr.count >0")
         //1.修改状态从失败改为上传中
         for (uploadFileDataModel * model in _netWorkFailSaveArr) {
-            model.curUploadStateType = uploadStateUploading;
-            model.bg_tableName = nasUpLoadFile_tableName;
+            for (uploadFileDataModel * uploadingModel in self.uploadingArr){
+               if (model.bg_id.integerValue == uploadingModel.bg_id.integerValue) {
+                   uploadingModel.curUploadStateType = uploadStateUploading;
+                   continue;
+               }
+           }
         }
         
-//        //2、保存到数控库
+        //2、保存到数控库
 //        [uploadFileDataModel bg_saveOrUpdateArrayAsync:_netWorkFailSaveArr complete:^(BOOL isSuccess) {
 //            
 //        }];
         
-        //重新开始上传
+        //3.判断是否可以上传
+        BOOL isCanUseCellular = [HWDataManager getBoolWithKey:stringKeyAddSn(Const_file_Transfe_canUse_Cellular_all)];
+        if(!isCanUseCellular){//不允许流量上传
+            //
+            if([AFNetworkReachabilityManager sharedManager].networkReachabilityStatus == AFNetworkReachabilityStatusReachableViaWWAN){
+                return;
+            }
+            
+        }
+        
+        //4.重新开始上传
         [[nasMixUploadManager shareManager] addUploadWithModels:_netWorkFailSaveArr];
         [_netWorkFailSaveArr removeAllObjects];