Browse Source

1.备份逻辑优化

huangxiaodong 1 year ago
parent
commit
ccbbac9fd5

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

@@ -55,6 +55,8 @@ static backupsFileManager * cur_backupsFileShareInstance = nil;
         
         photosBackupsTaskModel *lastModel = array.firstObject;
         
+        HLog(@"1 bg_id:%@",lastModel.bg_id);
+        
         if(lastModel.isSuspendType){
             return;
         }
@@ -99,12 +101,15 @@ static backupsFileManager * cur_backupsFileShareInstance = nil;
             
             taskModel.totalLocalIdentifier = allLocalIdentifier;
             
+            HLog(@"2 bg_id:%@",taskModel.bg_id);
+            
             [taskModel bg_saveAsync:^(BOOL isSuccess) {
                 if(!isSuccess){
                     HLog(@"\n\nError!!!\n\n");
                 }
                 else{
-                    [self handelBackupsModelFun:taskModel];
+                    //[self handelBackupsModelFun:taskModel];
+                    [self handlePhotosBackupsFun];
                 }
             }];
         }
@@ -120,10 +125,7 @@ static backupsFileManager * cur_backupsFileShareInstance = nil;
        <= (_curPhotosBackupsTaskMod.didBackupsCount + _curPhotosBackupsTaskMod.failCount))
     {
         _curPhotosBackupsTaskMod.isCompleteType = YES;
-        [_curPhotosBackupsTaskMod bg_saveOrUpdateAsync:^(BOOL isSuccess) {
-                    
-        }];
-        
+        [self RefreshDatabaseFun];
         return;
     }
     
@@ -136,6 +138,7 @@ static backupsFileManager * cur_backupsFileShareInstance = nil;
     
     if(index >= _curPhotosBackupsTaskMod.LocalIdentifierArr.count){
         _curPhotosBackupsTaskMod.isCompleteType = YES;
+        [self RefreshDatabaseFun];
         return;
     }
     
@@ -176,9 +179,15 @@ static backupsFileManager * cur_backupsFileShareInstance = nil;
 {
     _curPhotosBackupsTaskMod.failCount += 1;
     
+    [self RefreshDatabaseFun];
+    [self beginBackupsFileFun];
+}
+
+- (void)RefreshDatabaseFun
+{
+    HLog(@"3 bg_id:%@",_curPhotosBackupsTaskMod.bg_id);
     [_curPhotosBackupsTaskMod bg_saveOrUpdateAsync:^(BOOL isSuccess) {
                 if(isSuccess){
-                    [self beginBackupsFileFun];
                 }
     }];
 }