Przeglądaj źródła

1.备份关闭逻辑关联

huangxiaodong 1 rok temu
rodzic
commit
960835c4ac

+ 10 - 0
创维盒子/双子星云手机/Class/Set/uploadFile/uploadFileManager/backupsFileManager.m

@@ -227,6 +227,11 @@ static backupsFileManager * cur_backupsFileShareInstance = nil;
     _curPhotosBackupsTaskMod.failCount += 1;
     
     [self RefreshDatabaseFun];
+    
+    if(_curPhotosBackupsTaskMod.curBackupsState == backupsStateSuspend){
+        return;
+    }
+    
     [self beginBackupsFileFun];
 }
 
@@ -264,6 +269,11 @@ static backupsFileManager * cur_backupsFileShareInstance = nil;
     _curPhotosBackupsTaskMod.didBackupsCount += 1;
     [self RefreshDatabaseFun];
     [self changeBackupsFileStateWithSpeedFun];
+    
+    if(_curPhotosBackupsTaskMod.curBackupsState == backupsStateSuspend){
+        return;
+    }
+    
     [self beginBackupsFileFun];
     
 }

+ 2 - 0
创维盒子/双子星云手机/Class/Set/view/mySetHeadView.m

@@ -474,6 +474,8 @@
 {
     [HWDataManager setBoolWithKey:Const_photo_backups_state value:NO];
     [self setBackupsStateFun];
+    //处理相册备份
+    [[backupsFileManager shareInstance] suspendBackupsFileFun];
 }
 
 - (void)openImageBackupsFun

+ 7 - 5
创维盒子/双子星云手机/CloudPlayer/PlayerViewController+backupsFile.m

@@ -95,11 +95,13 @@
                                     self.curPhotosBackupsTaskMod.didBackupsOneFileType = YES;
                                     HLog(@"文件已备份");
                                     [[backupsFileManager shareInstance] backupsFileDoneFun];
-                                    return;
+                                    
+                                }
+                                else{
+                                    self.curPhotosBackupsTaskMod.didBackupsOneFileType = NO;
+                                    [self beginGotoBackupsImageFun:fileLengthNum];
                                 }
                                 
-                                self.curPhotosBackupsTaskMod.didBackupsOneFileType = NO;
-                                [self beginGotoBackupsImageFun:fileLengthNum];
                             }
                             else{
                                 [self backupsBeginGotoUploadVidelFun:fileLengthNum];
@@ -272,7 +274,7 @@
 - (void)handleBackupsingFun:(NSNumber*)fileLengthNum
 {
 //    BOOL isCanUseCellular = [HWDataManager getBoolWithKey:Const_file_backups_canUse_Cellular];
-//    
+//
 //    if(!isCanUseCellular){//不允许流量备份
 //        //
 //        if([AFNetworkReachabilityManager sharedManager].networkReachabilityStatus == AFNetworkReachabilityStatusReachableViaWWAN){
@@ -280,7 +282,7 @@
 //            self.curPhotosBackupsTaskMod.curBackupsState = backupsStateSuspend;
 //            [[backupsFileManager shareInstance] changeBackupsFileStateWithSpeedFun];
 //        }
-//        
+//
 //    }