Browse Source

1.去掉备份相关逻辑

huangxiaodong 6 months ago
parent
commit
d15e9affd0

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

@@ -226,18 +226,18 @@
     }
     
     //是否备份中 处理切换网络环境 用户无感备份切换
-    if(([nasBackupsManager shareInstance].curPhotosBackupsTaskMod
-       && [nasBackupsManager shareInstance].curPhotosBackupsTaskMod.curBackupsState == backupsStateUploading)
-       || [nasBackupsManager shareInstance].isWifiNeedReBackupsType){
-        
-        //1.先暂停备份
-        [[nasBackupsManager shareInstance] suspendBackupsFileFun];
-        
-        //2.重新开启备份
-        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-            [[nasBackupsManager shareInstance] reBackupsFileFun];
-        });
-    }
+//    if(([nasBackupsManager shareInstance].curPhotosBackupsTaskMod
+//       && [nasBackupsManager shareInstance].curPhotosBackupsTaskMod.curBackupsState == backupsStateUploading)
+//       || [nasBackupsManager shareInstance].isWifiNeedReBackupsType){
+//        
+//        //1.先暂停备份
+//        [[nasBackupsManager shareInstance] suspendBackupsFileFun];
+//        
+//        //2.重新开启备份
+//        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+//            [[nasBackupsManager shareInstance] reBackupsFileFun];
+//        });
+//    }
     
     //是否上传中 处理切换网络环境 用户无感上传切换
     BOOL needToReUploadTaskType = [nasUploadFileManager shareInstance].needToReUploadTaskType;

+ 3 - 3
创维盒子/双子星云手机/Class/Set/uploadFile/photoView/uploadFileRecordheadView.m

@@ -27,9 +27,9 @@
 
     NSString *leftStr =  NSLocalizedString(@"my_set_no_File_upload",nil);
     NSString *midStr =  NSLocalizedString(@"my_set_no_File_download",nil);
-    NSString *rightStr =  NSLocalizedString(@"my_set_no_File_backups",nil);
-    NSString *fourStr =  NSLocalizedString(@"my_set_no_File_receive_title",nil);
-    NSArray *titleArr =  @[leftStr,midStr,rightStr,fourStr];
+    //NSString *rightStr =  NSLocalizedString(@"my_set_no_File_backups",nil);
+    //NSString *fourStr =  NSLocalizedString(@"my_set_no_File_receive_title",nil);
+    NSArray *titleArr =  @[leftStr,midStr/*,rightStr,fourStr*/];
     
     _butWidth = (SCREEN_W - 30)/titleArr.count;
     

+ 4 - 4
创维盒子/双子星云手机/mine/mineViewController.m

@@ -367,10 +367,10 @@
     long vide0AllSizeBeforeClear = [iTools folderSizeAtPath:videoPath];
     
     NSString *backupsingVideoName = nil;
-    if([nasBackupsManager shareInstance].curPhotosBackupsTaskMod
-       && [nasBackupsManager shareInstance].curPhotosBackupsTaskMod.curUploadFileType == uploadFileTypeVideo){
-        backupsingVideoName = [nasBackupsManager shareInstance].curPhotosBackupsTaskMod.filename;
-    }
+//    if([nasBackupsManager shareInstance].curPhotosBackupsTaskMod
+//       && [nasBackupsManager shareInstance].curPhotosBackupsTaskMod.curUploadFileType == uploadFileTypeVideo){
+//        backupsingVideoName = [nasBackupsManager shareInstance].curPhotosBackupsTaskMod.filename;
+//    }
     
     NSString *uploadingVideoName = nil;
 //    if([uploadFileManager shareInstance].curUploadFileDataModel

+ 3 - 3
创维盒子/双子星云手机/webRtc/webRtcManager/webRtcManager.m

@@ -178,7 +178,7 @@
     [[errorAlertTool shareInstance] dismissErrorAlertFun];
     
     //处理相册备份
-    [[nasBackupsManager shareInstance] AutohandlePhotosBackupsFun];
+    //[[nasBackupsManager shareInstance] AutohandlePhotosBackupsFun];
     
     //获取磁盘外挂
     [self getExtraFilesListFun];
@@ -615,7 +615,7 @@
 {
     HLog(@"checkAllTaskFun");
     //处理相册备份
-    [[nasBackupsManager shareInstance] checkReBackupsFileFun];
+    //[[nasBackupsManager shareInstance] checkReBackupsFileFun];
     
     //处理上传失败的重新上传
     //[[nasUploadFileManager shareInstance] reUploadFileFunByNetWork];
@@ -635,7 +635,7 @@
 - (void)checkFileTransfeTaskFun
 {
     
-    BOOL isBackupsingType = [[nasBackupsManager shareInstance] checkBackupsingFun];
+    BOOL isBackupsingType = NO;//[[nasBackupsManager shareInstance] checkBackupsingFun];
     BOOL isUploadingType = [[nasMixUploadManager shareManager] checkUploadTaskDoingFun];
     BOOL isDownloadingType = [[nasDownloadManager shareManager] isDownLoadIngType];
     BOOL isNasDownloadingType = [customDownloadManager shareManager].isDownLoadIngType;