1.备份逻辑暂存

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

@@ -24,6 +24,9 @@ NS_ASSUME_NONNULL_BEGIN
 //处理备份消息
 - (void)handlePhotosBackupsFun;
 - (void)getDataWrongToChangeFailFun;
+
+//文件备份完成
+- (void)backupsFileDoneFun;
 @end
 
 NS_ASSUME_NONNULL_END

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

@@ -135,6 +135,7 @@ static backupsFileManager * cur_backupsFileShareInstance = nil;
     NSInteger index = _curPhotosBackupsTaskMod.didBackupsCount + _curPhotosBackupsTaskMod.failCount;
     
     if(index >= _curPhotosBackupsTaskMod.LocalIdentifierArr.count){
+        _curPhotosBackupsTaskMod.isCompleteType = YES;
         return;
     }
     
@@ -189,4 +190,20 @@ static backupsFileManager * cur_backupsFileShareInstance = nil;
     [[NSNotificationCenter defaultCenter] postNotificationName:backupsFileBeginNotification object:_curPhotosBackupsTaskMod];
 }
 
+- (void)backupsFileDoneFun
+{
+    _curPhotosBackupsTaskMod.didBackupsCount +=1;
+    [self beginBackupsFileFun];
+    
+//    long totalSizeByte = _curUploadFileDataModel.totalBytes;
+//
+//    [self changeUploadFileState:uploadStateDone withDidUploadBytes:totalSizeByte withModel:_curUploadFileDataModel complete:^(BOOL isSuccess) {
+//        [self->_fileModelDataArr removeObject:self->_curUploadFileDataModel];
+//
+//        self->_isUploadIngType = NO;
+//        if(self->_fileModelDataArr.count > 0){
+//            [self beginUploadFileFun];
+//        }
+//    }];
+}
 @end

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

@@ -18,7 +18,7 @@
     self.curPhotosBackupsTaskMod = uploadFileDataMod;
     
     if(![uploadFileDataMod isKindOfClass:[photosBackupsTaskModel class]]){
-        HLog(@"上传的文件类型不对");
+        HLog(@"备份的文件类型不对");
         return;
     }
     
@@ -40,8 +40,6 @@
         
         self.backupsIndexOfUploadFlie = 0;
         
-        //HLog(@"%@  %@",self.taskUid,self.fileName);
-        //self.cutFileDataArr = [self fileCutPartsBy:self.AllFileData];
     //}
     
     NSString * commandStr = [RCCommandHelp applyForBackupsFileBy:self.backupsTaskUid withFileName:self.backupsFileName withSavePath:@"/sdcard/DCIM/"];
@@ -75,7 +73,7 @@
                             taskUid = [[NSString  alloc] initWithFormat:@"%@",taskUid];
                         }
                         
-                        if(taskUid &&  [taskUid isEqualToString:self.taskUid]){
+                        if(taskUid &&  [taskUid isEqualToString:self.backupsTaskUid]){
                             
                             NSNumber * fileLengthNum = @0;
                             if ([[data allKeys] containsObject:@"fileLength"])
@@ -84,10 +82,10 @@
                             }
                             
                             if([fileLengthNum integerValue] == self.curPhotosBackupsTaskMod.totalBytes){
-                                self.taskUid = nil;
+                                self.backupsTaskUid = nil;
                                 
                                 [[backupsFileManager shareInstance] getDataWrongToChangeFailFun];
-                                HLog(@"hxd already 上传任务异常终止")
+                                HLog(@"hxd already 备份任务异常终止")
                                 return;
                             }
                             
@@ -117,22 +115,22 @@
 #pragma mark 遇到异常时 重新上传
 - (void)tryAgainApplyBackupsFun
 {
-    self.taskUid = nil;
+    self.backupsTaskUid = nil;
     [self ApplyBackupsFileFun];
 }
 
 #pragma mark 图片上传
 -(void)beginGotoBackupsImageFun:(NSNumber*)fileLengthNum{
     
-    self.cutFileDataArr = [self fileCutPartsBy:self.backupsAllFileData withDidUpLoadSize:[fileLengthNum integerValue]];
+    self.backupsCutFileDataArr = [self backupsFileCutPartsBy:self.backupsAllFileData withDidUpLoadSize:[fileLengthNum integerValue]];
     
-    if(!self.cutFileDataArr){
+    if(!self.backupsCutFileDataArr){
         [[backupsFileManager shareInstance] getDataWrongToChangeFailFun];
         return;
     }
     
     //答复的taskUid 跟申请的一致 开发发送内容
-    [self upLoadFileFun];
+    [self backupsFileFun];
 }
 
 - (void)backupsFileFunServiceResponseFun:(NSDictionary *)dataDict
@@ -190,7 +188,7 @@
         return;
     }
     
-    if(self.indexOfUploadFlie < self.cutFileDataArr.count -1) {
+    if(self.backupsIndexOfUploadFlie < self.backupsCutFileDataArr.count -1) {
         
         NSInteger didUploadSize = fileLengthNum.longLongValue;
         
@@ -198,19 +196,18 @@
 //
 //        }];
         
-        self.indexOfUploadFlie ++;
-        [self upLoadFileFun];
+        self.backupsIndexOfUploadFlie ++;
+        [self backupsFileFun];
     }
-    else if(self.curUploadFileDataMod.curUploadFileType == uploadFileTypeVideo && fileLengthNum && fileLengthNum.longLongValue < self.curUploadFileDataMod.totalBytes){
+    else if(self.curPhotosBackupsTaskMod.curUploadFileType == uploadFileTypeVideo && fileLengthNum && fileLengthNum.longLongValue < self.curPhotosBackupsTaskMod.totalBytes){
         //视频做了二次切割 不一定上传完了
         HLog(@"视频上传传完一片 再来一片");
         //[self beginGotoUploadVidelFun:fileLengthNum];
     }
     else{
-        HLog(@"上传完成");
+        HLog(@"备份完成");
         
-//        [self clearUploadFileDataFun];
-//        [[uploadFileManager shareInstance] uploadFileDoneFun];
+        [[backupsFileManager shareInstance] backupsFileDoneFun];
     }
 }
 
@@ -224,7 +221,7 @@
 }
 
 #pragma mark 文件切片
--(NSMutableArray *)fileCutPartsBy:(NSData*)curData withDidUpLoadSize:(NSInteger)didLoadSize{
+-(NSMutableArray *)backupsFileCutPartsBy:(NSData*)curData withDidUpLoadSize:(NSInteger)didLoadSize{
  
     NSData * data = curData;
     
@@ -246,7 +243,7 @@
 //            index = didLoadSize/subs;
 //            allLength = allLength - didLoadSize;
             
-            self.indexOfUploadFlie = didLoadSize/subs;
+            self.backupsIndexOfUploadFlie = didLoadSize/subs;
         }
     }
 
@@ -315,17 +312,17 @@
        0x68  0x0e                                                        0x16
     bcc校验从第1位 也就是从msgType起 到 校验位前（不包含校验位）数据作bcc校验
  */
-- (void)upLoadFileFun
+- (void)backupsFileFun
 {
     //HLog(@"上传文件%ld/%ld",self.indexOfUploadFlie +1,self.cutFileDataArr.count);
     
-    if(self.cutFileDataArr.count <= self.indexOfUploadFlie)
+    if(self.backupsCutFileDataArr.count <= self.backupsIndexOfUploadFlie)
     {
         return;
     }
     
     //data
-    NSData *curData = self.cutFileDataArr[self.indexOfUploadFlie];
+    NSData *curData = self.backupsCutFileDataArr[self.backupsIndexOfUploadFlie];
     //HLog(@"headData:%@",curData);
     
     //head
@@ -340,7 +337,7 @@
     //HLog(@"msgTypeData:%@",msgTypeData);
     
     //taskId
-    NSData *taskIdData = [self.taskUid dataUsingEncoding:NSUTF8StringEncoding];
+    NSData *taskIdData = [self.backupsTaskUid dataUsingEncoding:NSUTF8StringEncoding];
     //HLog(@"taskIdData:%@",taskIdData);
     
     //datalen
@@ -352,13 +349,13 @@
     
     
     //curNum
-    int curNum = (int)self.indexOfUploadFlie;
+    int curNum = (int)self.backupsIndexOfUploadFlie;
     //NSData *curNumData = [NSData dataWithBytes:&curNum length:sizeof(curNum)];
     NSData * curNumData = [self int2Data:curNum];
     //HLog(@"curNumData:%@",curNumData);
     
     //totalNum
-    int totalNum = (int)self.cutFileDataArr.count;
+    int totalNum = (int)self.backupsCutFileDataArr.count;
     //NSData *totalNumData = [NSData dataWithBytes:&totalNum length:sizeof(totalNum)];
     NSData * totalNumData = [self int2Data:totalNum];
     //HLog(@"totalNumData:%@",totalNumData);