|
@@ -81,19 +81,21 @@
|
|
|
fileLengthNum = data[@"fileLength"];
|
|
|
}
|
|
|
|
|
|
- if([fileLengthNum integerValue] == self.curPhotosBackupsTaskMod.totalBytes){
|
|
|
- self.backupsTaskUid = nil;
|
|
|
-
|
|
|
- [[backupsFileManager shareInstance] getDataWrongToChangeFailFun];
|
|
|
- HLog(@"hxd already 备份任务异常终止")
|
|
|
- return;
|
|
|
- }
|
|
|
|
|
|
- if(self.curUploadFileDataMod.curUploadFileType == uploadFileTypeImage){
|
|
|
+ if(self.curPhotosBackupsTaskMod.curUploadFileType == uploadFileTypeImage){
|
|
|
+
|
|
|
+ if([fileLengthNum integerValue] == self.curPhotosBackupsTaskMod.totalBytes){
|
|
|
+ self.backupsTaskUid = nil;
|
|
|
+
|
|
|
+ [[backupsFileManager shareInstance] getDataWrongToChangeFailFun];
|
|
|
+ HLog(@"hxd already 备份任务异常终止")
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
[self beginGotoBackupsImageFun:fileLengthNum];
|
|
|
}
|
|
|
else{
|
|
|
- [self beginGotoUploadVidelFun:fileLengthNum];
|
|
|
+ [self backupsBeginGotoUploadVidelFun:fileLengthNum];
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -135,7 +137,7 @@
|
|
|
|
|
|
#pragma mark 视频上传
|
|
|
//每次从文件重新切一片 传一片
|
|
|
--(void)beginGotoUploadVidelFun:(NSNumber*)fileLengthNum{
|
|
|
+-(void)backupsBeginGotoUploadVidelFun:(NSNumber*)fileLengthNum{
|
|
|
|
|
|
NSData *data = [self backupsCutVideoFileFunAtIndex:fileLengthNum.longLongValue];
|
|
|
HLog(@"data leng:%ld",[data length]);
|
|
@@ -273,21 +275,17 @@
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
+ [[backupsFileManager shareInstance] changeBackupsFileStateWithSpeedFun];
|
|
|
+
|
|
|
if(self.backupsIndexOfUploadFlie < self.backupsCutFileDataArr.count -1) {
|
|
|
|
|
|
- NSInteger didUploadSize = fileLengthNum.longLongValue;
|
|
|
-
|
|
|
-// [[uploadFileManager shareInstance] changeUploadFileState:uploadStateUploading withDidUploadBytes:didUploadSize withModel:self.curUploadFileDataMod complete:^(BOOL isSuccess) {
|
|
|
-//
|
|
|
-// }];
|
|
|
-
|
|
|
self.backupsIndexOfUploadFlie ++;
|
|
|
[self backupsFileFun];
|
|
|
}
|
|
|
else if(self.curPhotosBackupsTaskMod.curUploadFileType == uploadFileTypeVideo && fileLengthNum && fileLengthNum.longLongValue < self.curPhotosBackupsTaskMod.totalBytes){
|
|
|
//视频做了二次切割 不一定上传完了
|
|
|
HLog(@"视频上传传完一片 再来一片");
|
|
|
- [self beginGotoUploadVidelFun:fileLengthNum];
|
|
|
+ [self backupsBeginGotoUploadVidelFun:fileLengthNum];
|
|
|
}
|
|
|
else{
|
|
|
HLog(@"备份完成");
|