Ver código fonte

1.nas 流量传输 关闭后 nas任务全部暂停

huangxiaodong 7 meses atrás
pai
commit
ac0c18cc0f

+ 14 - 1
创维盒子/双子星云手机/Class/Set/uploadFile/fileTransfeSet/fileTransfeSetViewController.m

@@ -687,12 +687,25 @@
             [[iToast makeText:NSLocalizedString(@"File_Transfer_WWAN_working_open",nil)] show];
             
             //检测下备份任务
-            if([nasBackupsManager shareInstance].isWifiNeedReBackupsType){
+            if([nasBackupsManager shareInstance].isWifiNeedReBackupsType
+               ||[nasBackupsManager shareInstance].isWWANNeedReBackupsType){
                 [[nasBackupsManager shareInstance] reBackupsFileFun];
             }
+            
+            [[nasUploadFileManager shareInstance] reUploadFileFunByNetWork];
+            [[nasDownloadFileManager shareInstance] reDownloadloadFileFunByNetWork];
         }
         else{
             [[iToast makeText:NSLocalizedString(@"File_Transfer_WWAN_working_close",nil)] show];
+            
+            //检测当前有没有任务传输 有就暂停
+            [[nasUploadFileManager shareInstance] saveUploadingTaskByNetWorkErrorFun];
+            [[nasDownloadFileManager shareInstance]  saveDownloadloadingTaskByNetWorkErrorFun];
+            if([[nasBackupsManager shareInstance] checkBackupsingFun]){
+                [[nasBackupsManager shareInstance] suspendBackupsFileFun];
+                [nasBackupsManager shareInstance].isWWANNeedReBackupsType = YES;
+            }
+            
         }
     }
     else if(row == 1){

+ 1 - 0
创维盒子/双子星云手机/NAS/nasBackupsManager/nasBackupsManager.h

@@ -15,6 +15,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic,strong) photosBackupsTaskModel* curPhotosBackupsTaskMod;
 @property (nonatomic,copy) NSString* sdnId;//标志本次是否备份过
 @property (nonatomic,assign) BOOL isWifiNeedReBackupsType;//wifi下需求重新备份
+@property (nonatomic,assign) BOOL isWWANNeedReBackupsType;//WWAN下需求重新备份 (WWAN 备份中 关闭 WWAN 传输功能 再次打开)
 
 +(instancetype)shareInstance;
 

+ 1 - 0
创维盒子/双子星云手机/NAS/nasBackupsManager/nasBackupsManager.m

@@ -258,6 +258,7 @@
     }
     
     _isWifiNeedReBackupsType  = NO;
+    _isWWANNeedReBackupsType = NO;
     
     self.taskRenewTime = [iTools getNowTimeStamp];