1.备份任务切换路径后会自动启动，并且如果上个任务是完成的 那么下一个任务会重新全部上传

创维盒子/双子星云手机.xcodeproj/project.pbxproj

@@ -3874,7 +3874,7 @@
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -3951,7 +3951,7 @@
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",

创维盒子/双子星云手机/Class/Set/privacyMode/privacyModeViewController.m

@@ -322,6 +322,9 @@
 
     BOOL haveOpenMask = [connectDeviceManager shareInstance].DeviceThirdIdMod.data.isPrivacyMode;
     NSString* curSn = [connectDeviceManager shareInstance].DeviceThirdIdMod.data.changeSn;
+    if(!curSn || curSn.length == 0){
+        curSn = [connectDeviceManager shareInstance].DeviceThirdIdMod.data.sn;
+    }
     
     NSMutableDictionary *paraDict = [NSMutableDictionary dictionary];
     [paraDict setValue:curSn forKey:@"sn"];

创维盒子/双子星云手机/Class/Set/uploadFile/fileTransfeSet/fileTransferPathCheckViewController.h

@@ -6,6 +6,7 @@
 //
 
 #import "BaseViewController.h"
+#import "backupsFileManager.h"
 
 NS_ASSUME_NONNULL_BEGIN
 

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

@@ -271,6 +271,11 @@
         _didChangeSavePathFun();
     }
     
+    if(_curType == 2){
+        //相册自动备份
+        [[backupsFileManager shareInstance] reBackupsFileFun];
+    }
+    
     [self.tableView reloadData];
     
 }
@@ -307,6 +312,11 @@
         if(_didChangeSavePathFun){
             _didChangeSavePathFun();
         }
+        
+        if(_curType == 2){
+            //相册自动备份
+            [[backupsFileManager shareInstance] reBackupsFileFun];
+        }
     }
     else if(stateNumber.integerValue == 2 ){
         tipStr = NSLocalizedString(@"File_upload_path_new_save",nil);

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

@@ -55,7 +55,7 @@ typedef enum{
 
 @property (nonatomic, assign) NSTimeInterval  preTimeInterval;//计算速度用
 @property (nonatomic, assign) NSTimeInterval  curTimeInterval;//计算速度用
-
+@property (nonatomic, copy) NSString *backupsPath;//备份路径
 @end
 
 NS_ASSUME_NONNULL_END

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

@@ -37,6 +37,9 @@ NS_ASSUME_NONNULL_BEGIN
 //文件重新备份
 - (void)reBackupsFileFunBy:(photosBackupsTaskModel*)model;
 
+//文件重新备份
+- (void)reBackupsFileFun;
+
 //检查是否需要重新备份
 - (void)checkReBackupsFileFun;
 

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

@@ -127,6 +127,21 @@ static backupsFileManager * cur_backupsFileShareInstance = nil;
             taskModel.didBackupsCount = 0;
             taskModel.bg_tableName = backups_photos_tableName;
             
+            //备份路径
+            NSString * backupsDefaultPath = [HWDataManager getStringWithKey:stringKeyAddSn(Const_photo_backups_default_path)];
+            
+            if(!backupsDefaultPath || backupsDefaultPath.length == 0){
+                backupsDefaultPath = Const_default_backups_path;
+                [HWDataManager setStringWithKey:stringKeyAddSn(Const_photo_backups_default_path) value:backupsDefaultPath];
+            }
+            
+            NSString *lastStr= [backupsDefaultPath substringFromIndex:backupsDefaultPath.length-1];
+            if(![lastStr isEqualToString:@"/"]){
+                backupsDefaultPath = [[NSString alloc] initWithFormat:@"%@/",backupsDefaultPath];
+            }
+            
+            taskModel.backupsPath = backupsDefaultPath;
+            
             NSMutableString *allLocalIdentifier= [NSMutableString new];
             
             for (PHAsset *asset in curAlbumModel.result) {
@@ -140,7 +155,9 @@ static backupsFileManager * cur_backupsFileShareInstance = nil;
             
             taskModel.totalLocalIdentifier = allLocalIdentifier;
             
-            if(self->_lastModel && self->_lastModel.totalLocalIdentifier){//相册备份排重
+            if(self->_lastModel 
+               && self->_lastModel.totalLocalIdentifier
+               && (self->_lastModel.backupsPath && [self->_lastModel.backupsPath isEqualToString:taskModel.backupsPath])){//相册备份排重
                 taskModel.curTaskLocalIdentifier = [weakSelf AlbumBackupsHandleNew:taskModel];
             }
             else{
@@ -463,6 +480,23 @@ static backupsFileManager * cur_backupsFileShareInstance = nil;
     
 }
 
+//文件重新备份
+- (void)reBackupsFileFun
+{
+    [self handlePhotosBackupsFun];
+    
+    //if(_curPhotosBackupsTaskMod.curBackupsState != backupsStateUploading)
+    if(self->_lastModel.curBackupsState != backupsStateUploading){
+        if(self->_lastModel.curBackupsState == backupsStateFail
+           ||self->_lastModel.curBackupsState == backupsStateDone){//上次备份完成
+            [self getAllAlbumsFun];
+        }
+        else{//继续上次的备份任务
+            [self handelBackupsModelFun:self->_lastModel];
+        }
+    }
+}
+
 //检查是否需要重新备份
 - (void)checkReBackupsFileFun
 {

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

@@ -51,17 +51,23 @@
         
     //}
     
-    NSString * backupsDefaultPath = [HWDataManager getStringWithKey:stringKeyAddSn(Const_photo_backups_default_path)];
+    NSString * backupsDefaultPath =  self.curPhotosBackupsTaskMod.backupsPath;
     
-    if(!backupsDefaultPath || backupsDefaultPath.length == 0){
-        backupsDefaultPath = Const_default_backups_path;
-        [HWDataManager setStringWithKey:stringKeyAddSn(Const_photo_backups_default_path) value:backupsDefaultPath];
+    if(!backupsDefaultPath || backupsDefaultPath.length ==0){
+         backupsDefaultPath = [HWDataManager getStringWithKey:stringKeyAddSn(Const_photo_backups_default_path)];
+        
+        if(!backupsDefaultPath || backupsDefaultPath.length == 0){
+            backupsDefaultPath = Const_default_backups_path;
+            [HWDataManager setStringWithKey:stringKeyAddSn(Const_photo_backups_default_path) value:backupsDefaultPath];
+        }
+        
+        NSString *lastStr= [backupsDefaultPath substringFromIndex:backupsDefaultPath.length-1];
+        if(![lastStr isEqualToString:@"/"]){
+            backupsDefaultPath = [[NSString alloc] initWithFormat:@"%@/",backupsDefaultPath];
+        }
     }
     
-    NSString *lastStr= [backupsDefaultPath substringFromIndex:backupsDefaultPath.length-1];
-    if(![lastStr isEqualToString:@"/"]){
-        backupsDefaultPath = [[NSString alloc] initWithFormat:@"%@/",backupsDefaultPath];
-    }
+    
    
     NSString * commandStr = [RCCommandHelp applyForBackupsFileBy:self.backupsTaskUid withFileName:self.backupsFileName withSavePath:backupsDefaultPath];
     
@@ -393,7 +399,8 @@
     self.curPhotosBackupsTaskMod.didUploadBytes = [fileLengthNum longLongValue];
     [[backupsFileManager shareInstance] changeBackupsFileStateFun];
     
-    if(self.backupsIndexOfUploadFlie < self.backupsCutFileDataArr.count -1) {
+    if(self.backupsCutFileDataArr.count >0
+        && self.backupsIndexOfUploadFlie < (self.backupsCutFileDataArr.count -1)) {
         
         self.backupsIndexOfUploadFlie ++;
         [self backupsFileFun];