Browse Source

1.修复bug

huangxiaodong 1 year ago
parent
commit
d852a1827b

+ 1 - 0
创维盒子/双子星云手机/Class/Set/uploadFile/model/photosBackupsTaskModel.h

@@ -35,6 +35,7 @@ typedef enum{
 @property (nonatomic, strong) NSArray *LocalIdentifierArr;
 @property (nonatomic, strong) NSArray *LocalIdentifierArr;
 @property (nonatomic, copy) NSString *filename;
 @property (nonatomic, copy) NSString *filename;
 
 
+@property (nonatomic, assign) BOOL didBackupsOneFileType;//某个文件已经存在
 @property (nonatomic, assign) NSUInteger failCount;
 @property (nonatomic, assign) NSUInteger failCount;
 @property (nonatomic, assign) NSUInteger didBackupsCount;
 @property (nonatomic, assign) NSUInteger didBackupsCount;
 @property (nonatomic, assign) backupsSuspendType isBackupsSuspendType;
 @property (nonatomic, assign) backupsSuspendType isBackupsSuspendType;

+ 1 - 1
创维盒子/双子星云手机/Class/Set/uploadFile/model/photosBackupsTaskModel.m

@@ -13,6 +13,6 @@
  */
  */
 +(NSArray *)bg_ignoreKeys{
 +(NSArray *)bg_ignoreKeys{
    return @[@"LocalIdentifierArr",@"filename",@"imageData",
    return @[@"LocalIdentifierArr",@"filename",@"imageData",
-            @"curUploadStateType",@"curUploadFileType",@"didUploadBytes",@"totalBytes",@"preTimeInterval",@"curTimeInterval"];
+            @"curUploadStateType",@"curUploadFileType",@"didUploadBytes",@"totalBytes",@"preTimeInterval",@"curTimeInterval",@"didBackupsOneFileType"];
 }
 }
 @end
 @end

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

@@ -263,6 +263,7 @@ static backupsFileManager * cur_backupsFileShareInstance = nil;
     [self deleteVideoFun];
     [self deleteVideoFun];
     _curPhotosBackupsTaskMod.didBackupsCount += 1;
     _curPhotosBackupsTaskMod.didBackupsCount += 1;
     [self RefreshDatabaseFun];
     [self RefreshDatabaseFun];
+    [self changeBackupsFileStateWithSpeedFun];
     [self beginBackupsFileFun];
     [self beginBackupsFileFun];
     
     
 }
 }

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

@@ -750,7 +750,14 @@
     photosBackupsTaskModel *photosBackupsTaskMod = [not object];
     photosBackupsTaskModel *photosBackupsTaskMod = [not object];
     //HLog(@"%@",uploadFileDataMod);
     //HLog(@"%@",uploadFileDataMod);
     
     
-    photosBackupsTaskMod.curTimeInterval = [[NSDate date] timeIntervalSince1970];
+    if(photosBackupsTaskMod.didBackupsOneFileType){
+        photosBackupsTaskMod.curTimeInterval = 0;
+        photosBackupsTaskMod.preTimeInterval = 0;
+    }
+    else{
+        photosBackupsTaskMod.curTimeInterval = [[NSDate date] timeIntervalSince1970];
+    }
+   
     _rightTableView.photosBackupsIngTaskModel = photosBackupsTaskMod;
     _rightTableView.photosBackupsIngTaskModel = photosBackupsTaskMod;
 }
 }
 
 

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

@@ -92,11 +92,13 @@
                             if(self.curPhotosBackupsTaskMod.curUploadFileType == uploadFileTypeImage){
                             if(self.curPhotosBackupsTaskMod.curUploadFileType == uploadFileTypeImage){
                                 
                                 
                                 if([fileLengthNum integerValue] == self.curPhotosBackupsTaskMod.totalBytes){
                                 if([fileLengthNum integerValue] == self.curPhotosBackupsTaskMod.totalBytes){
+                                    self.curPhotosBackupsTaskMod.didBackupsOneFileType = YES;
                                     HLog(@"文件已备份");
                                     HLog(@"文件已备份");
                                     [[backupsFileManager shareInstance] backupsFileDoneFun];
                                     [[backupsFileManager shareInstance] backupsFileDoneFun];
                                     return;
                                     return;
                                 }
                                 }
                                 
                                 
+                                self.curPhotosBackupsTaskMod.didBackupsOneFileType = NO;
                                 [self beginGotoBackupsImageFun:fileLengthNum];
                                 [self beginGotoBackupsImageFun:fileLengthNum];
                             }
                             }
                             else{
                             else{

+ 1 - 1
创维盒子/双子星云手机/CloudPlayer/PlayerViewController.mm

@@ -224,7 +224,7 @@ ComontAlretViewControllerDelegate>
     
     
     _checkThridConnectNum = 0;
     _checkThridConnectNum = 0;
     
     
-    _checkThridConnectTimer = [NSTimer scheduledTimerWithTimeInterval:1 target:self selector:@selector(checkThridRuiYunFun) userInfo:nil repeats:YES];
+    _checkThridConnectTimer = [NSTimer timerWithTimeInterval:1 target:self selector:@selector(checkThridRuiYunFun) userInfo:nil repeats:YES];
     [[NSRunLoop currentRunLoop] addTimer:_checkThridConnectTimer forMode:NSRunLoopCommonModes];
     [[NSRunLoop currentRunLoop] addTimer:_checkThridConnectTimer forMode:NSRunLoopCommonModes];
 }
 }