1.修复备份视频bug

创维盒子/双子星云手机/AppDelegate/Config/Notification.h

@@ -73,6 +73,8 @@
 
 /* 上传备份通知*/
 #define backupsFileBeginNotification                 @"backupsFileBeginNot"
+/*备份文件更新通知*/
+#define backupsFileRefreshNotification                 @"backupsFileRefreshNot"
 
 /*获取云机基本信息通知*/
 #define getCouldPhoneBaseInfoNotification                 @"getCouldPhoneBaseInfoNot"

创维盒子/双子星云手机/Class/Set/uploadFile/photoView/backupsFilerecordTableView.h

@@ -11,6 +11,10 @@
 NS_ASSUME_NONNULL_BEGIN
 
 @interface backupsFilerecordTableView : UITableView
+
+//正在上传的任务
+@property (nonatomic,strong) photosBackupsTaskModel *photosBackupsIngTaskModel;
+
 @property (nonatomic, strong) NSArray *outSideDataArr;
 
 @property (nonatomic,assign) BOOL isEditType;

创维盒子/双子星云手机/Class/Set/uploadFile/photoView/backupsFilerecordTableView.m

@@ -57,6 +57,47 @@
 }
 
 
+- (void)setPhotosBackupsIngTaskModel:(photosBackupsTaskModel *)photosBackupsIngTaskModel
+{
+    _photosBackupsIngTaskModel = photosBackupsIngTaskModel;
+    
+    if(backupsingArr.count >=1){
+        
+        if(_photosBackupsIngTaskModel.curBackupsState == backupsStateUploading
+           || _photosBackupsIngTaskModel.curBackupsState == backupsStateSuspend){
+            [backupsingArr replaceObjectAtIndex:0 withObject:_photosBackupsIngTaskModel];
+        }
+        else if (_photosBackupsIngTaskModel.curBackupsState == backupsStateFail){
+            [backupsingArr removeObjectAtIndex:0];
+            [backupsfailArr insertObject:_photosBackupsIngTaskModel atIndex:0];
+        }
+        else if (_photosBackupsIngTaskModel.curBackupsState == backupsStateDone){
+            [backupsingArr removeObjectAtIndex:0];
+            [backupsDoneArr insertObject:_photosBackupsIngTaskModel atIndex:0];
+        }
+    }
+    else{
+        [backupsingArr removeObjectAtIndex:0];
+        [backupsDoneArr insertObject:_photosBackupsIngTaskModel atIndex:0];
+    }
+    
+    NSMutableArray*newDataArr = [NSMutableArray new];
+    if(backupsingArr.count > 0){
+        [newDataArr addObject:backupsingArr];
+    }
+       
+    if(backupsfailArr.count > 0){
+        [newDataArr addObject:backupsfailArr];
+    }
+    
+    if(backupsDoneArr.count > 0){
+        [newDataArr addObject:backupsDoneArr];
+    }
+    
+    _curDataArr = newDataArr;
+    [self reloadDataFun];
+}
+
 -(void)setOutSideDataArr:(NSArray *)outSideDataArr
 {
     _outSideDataArr = outSideDataArr;

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

@@ -27,6 +27,9 @@ NS_ASSUME_NONNULL_BEGIN
 
 //文件备份完成
 - (void)backupsFileDoneFun;
+
+//修改文件上传的状态
+- (void)changeBackupsFileStateWithSpeedFun;
 @end
 
 NS_ASSUME_NONNULL_END

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

@@ -35,6 +35,8 @@ static backupsFileManager * cur_backupsFileShareInstance = nil;
 
 - (void)handlePhotosBackupsFun
 {
+    //return;
+    
     BOOL haveOpenBackups = [HWDataManager getBoolWithKey:Const_photo_backups_state];
     
     if(!haveOpenBackups){
@@ -248,15 +250,12 @@ static backupsFileManager * cur_backupsFileShareInstance = nil;
     [self RefreshDatabaseFun];
     [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];
-//        }
-//    }];
 }
+
+//修改文件上传的状态
+- (void)changeBackupsFileStateWithSpeedFun
+{
+    [[NSNotificationCenter defaultCenter] postNotificationName:backupsFileRefreshNotification object:_curPhotosBackupsTaskMod];
+}
+
 @end

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

@@ -58,6 +58,8 @@
     
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(uploadFileDeteleFun:)  name:uploadFileDeteleNotification  object:nil];
     
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(backupsFileRefreshFun:)  name:backupsFileRefreshNotification  object:nil];
+    
     [self.view setBackgroundColor:[UIColor whiteColor]];
     
     self.titleLabel.text = NSLocalizedString(@"my_set_no_File_Transfer_List",nil) ;
@@ -878,4 +880,13 @@
 //    _uploadFileRecordEditBottomV = nil;
 //
 //}
+
+- (void)backupsFileRefreshFun:(NSNotification*)not
+{
+    photosBackupsTaskModel *photosBackupsTaskMod = [not object];
+    //HLog(@"%@",uploadFileDataMod);
+    
+    photosBackupsTaskMod.curTimeInterval = [[NSDate date] timeIntervalSince1970];
+    _rightTableView.photosBackupsIngTaskModel = photosBackupsTaskMod;
+}
 @end

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

@@ -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(@"备份完成");