1.备份逻辑优化

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

@@ -120,7 +120,7 @@ static backupsFileManager * cur_backupsFileShareInstance = nil;
             TZAlbumModel *curAlbumModel= models.firstObject;
             
             photosBackupsTaskModel * taskModel = [photosBackupsTaskModel new];
-            taskModel.count = curAlbumModel.count;
+            //taskModel.count = curAlbumModel.count;
             //taskModel.result = curAlbumModel.result;
             
             taskModel.failCount = 0;
@@ -147,6 +147,8 @@ static backupsFileManager * cur_backupsFileShareInstance = nil;
                 taskModel.curTaskLocalIdentifier = allLocalIdentifier;
             }
             
+            taskModel.count = [taskModel.curTaskLocalIdentifier componentsSeparatedByString:@"&"].count;
+            
             HLog(@"2 bg_id:%@",taskModel.bg_id);
             
             [taskModel bg_saveAsync:^(BOOL isSuccess) {

创维盒子/双子星云手机/Class/Set/uploadFile/uploadFileView/backupsFileRecordCell.m

@@ -353,6 +353,14 @@
         CGRect frame = CGRectMake(0, 0, SCREEN_W - 15*2 - 34*2, 2);
         
         CGFloat curProgress = _curPhotosBackupsTaskModel.didBackupsCount/((_curPhotosBackupsTaskModel.count - _curPhotosBackupsTaskModel.failCount)*1.0);
+        
+        //只有一个任务的时候
+        if(_curPhotosBackupsTaskModel.LocalIdentifierArr.count == 1
+           && _curPhotosBackupsTaskModel.didBackupsCount == 0){
+            curProgress = _curPhotosBackupsTaskModel.didUploadBytes / (_curPhotosBackupsTaskModel.totalBytes*1.0);
+        }
+        
+        //curProgress = _curPhotosBackupsTaskModel.didUploadBytes / (_curPhotosBackupsTaskModel.totalBytes*1.0);
 
         if(curProgress > 1){
             curProgress = 1;
@@ -392,23 +400,21 @@
         
     }
     
+    //HLog(@"1111111111 %ld %ld  %ld %ld %f",_curPhotosBackupsTaskModel.totalBytes,_curPhotosBackupsTaskModel.didUploadBytes,_curPhotosBackupsTaskModel.totalBytes-_curPhotosBackupsTaskModel.didUploadBytes,speed,estimateTime)
+    
     if(estimateTime>0){
         NSInteger seconds = (NSInteger)estimateTime;
         if(seconds >= 60){
             timeStr = [[NSString alloc] initWithFormat:@"%ld%@",seconds/60,NSLocalizedString(@"common_minute",nil)];
         }
         else{
-            timeStr = [[NSString alloc] initWithFormat:@"%ld%@",seconds,NSLocalizedString(@"common_minute",nil)];
+            timeStr = [[NSString alloc] initWithFormat:@"%ld%@",seconds,NSLocalizedString(@"common_second",nil)];
         }
         
     }
     
     _fileTimelabel.text = [[NSString alloc] initWithFormat:@"%@%@",NSLocalizedString(@"Estimated_time",nil),timeStr];
 
-    
-//    "Estimated_time"      = "当前文件预计需";
-//    "common_minute"      = "分";
-//    "common_second"      = "秒";
 }
 
 - (void)handlFileProgresslabelFun