1.上传相关bug

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

@@ -41,7 +41,7 @@ NS_ASSUME_NONNULL_BEGIN
 //暂停上传
 - (void)suspendUploadFileFun:(BOOL)isSuspendAll;
 //文件重新上传
-- (void)reUploadFileFunBy:(NSMutableArray*)Arr;
+- (void)reUploadFileFunBy:(NSMutableArray*)Arr withAll:(BOOL)isAllType;
 
 //文件上传完成
 - (void)uploadFileDoneFun;

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

@@ -242,8 +242,8 @@ static uploadFileManager * cur_uploadFileShareInstance = nil;
     }
     else
     {
-        //_curUploadFileDataModel = _fileModelDataArr.firstObject;
-        _curUploadFileDataModel = _fileModelDataArr.lastObject;
+        _curUploadFileDataModel = _fileModelDataArr.firstObject;
+        //_curUploadFileDataModel = _fileModelDataArr.lastObject;
     }
     
     
@@ -388,11 +388,11 @@ static uploadFileManager * cur_uploadFileShareInstance = nil;
             [cachesFileManager removeItemAtPath:_curUploadFileDataModel.filename type:uploadFileTypeVideo error:nil];
         }
         
-        [self handleDatabaseArrByDelete:_curUploadFileDataModel];
+        [self handleDatabaseArrDeteleInUploading:_curUploadFileDataModel];
         [self handleDatabaseArrByInDone:_curUploadFileDataModel];
     }
     else if(curUploadStateType == uploadStateFail){
-        [self handleDatabaseArrByDelete:_curUploadFileDataModel];
+        [self handleDatabaseArrDeteleInUploading:_curUploadFileDataModel];
         [self handleDatabaseArrByInFail:_curUploadFileDataModel];
     }
 
@@ -472,6 +472,14 @@ static uploadFileManager * cur_uploadFileShareInstance = nil;
     }
 }
 
+- (void)handleDatabaseArrDeteleInUploading:(uploadFileDataModel*)uploadmodel
+{
+    if(_databaseArr && _databaseArr.count == 3 ){
+        NSMutableArray *uploadingArr = _databaseArr[0];
+        [uploadingArr removeObject:uploadmodel];
+    }
+}
+
 - (void)handleDatabaseArrByInDone:(uploadFileDataModel*)uploadmodel
 {
     if(_databaseArr && _databaseArr.count == 3 ){
@@ -522,12 +530,20 @@ static uploadFileManager * cur_uploadFileShareInstance = nil;
 }
 
 //某个文件重新上传
-- (void)reUploadFileFunBy:(NSMutableArray*)Arr
+- (void)reUploadFileFunBy:(NSMutableArray*)Arr withAll:(BOOL)isAllType
 {
     if(!_fileModelDataArr){
         _fileModelDataArr = [NSMutableArray new];
     }
     
+    if(isAllType)
+    {
+        _fileModelDataArr = Arr;
+        _reUploadIngSelectIndex = -1;
+        [self beginUploadFileFun];
+        return;
+    }
+    
     _reUploadIngSelectIndex = 0;
     
     NSMutableArray *curArr = [NSMutableArray arrayWithArray:Arr];
@@ -572,8 +588,6 @@ static uploadFileManager * cur_uploadFileShareInstance = nil;
 {
     long totalSizeByte = _curUploadFileDataModel.totalBytes;
     
-    [self handleDatabaseArrByDelete:_curUploadFileDataModel];
-    
     [self changeUploadFileState:uploadStateDone withDidUploadBytes:totalSizeByte withModel:_curUploadFileDataModel complete:^(BOOL isSuccess) {
         [self->_fileModelDataArr removeObject:self->_curUploadFileDataModel];
         
@@ -595,6 +609,7 @@ static uploadFileManager * cur_uploadFileShareInstance = nil;
         }
         else{
             self->_isUploadIngType = NO;
+            self->_curUploadFileDataModel = nil;
         }
     }];
     
@@ -700,6 +715,9 @@ static uploadFileManager * cur_uploadFileShareInstance = nil;
         if(_fileModelDataArr.count >=1){
             [self beginUploadFileFun];
         }
+        else{
+            _curUploadFileDataModel = nil;
+        }
     }
         
     [[NSNotificationCenter defaultCenter] postNotificationName:uploadFileRefreshNotification object:nil];
@@ -761,7 +779,9 @@ static uploadFileManager * cur_uploadFileShareInstance = nil;
 //检查是否需要重新上传
 - (void)checkReUploadFileFun
 {
-    if(!_curUploadFileDataModel){
+    if(!_curUploadFileDataModel
+       || _curUploadFileDataModel.curUploadStateType == uploadStateDone
+       || _curUploadFileDataModel.curUploadStateType == uploadStateSuspend){
         return;
     }
     

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

@@ -677,7 +677,7 @@
     }
     else{
         NSMutableArray *leftArr = _leftTableView.uploadingArr;
-        [[uploadFileManager shareInstance] reUploadFileFunBy:leftArr];
+        [[uploadFileManager shareInstance] reUploadFileFunBy:leftArr withAll:YES];
     }
 }
 #pragma mark 点击上传成功的清空记录

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

@@ -473,7 +473,7 @@
     else{
         NSMutableArray*arr = [NSMutableArray new];
         [arr addObject:model];
-        [[uploadFileManager shareInstance] reUploadFileFunBy:arr];
+        [[uploadFileManager shareInstance] reUploadFileFunBy:arr withAll:NO];
     }
     
 }
@@ -494,7 +494,7 @@
     NSMutableArray*arr = [NSMutableArray new];
     model.curUploadStateType = uploadStateWait;
     [arr addObject:model];
-    [[uploadFileManager shareInstance] reUploadFileFunBy:arr];
+    [[uploadFileManager shareInstance] reUploadFileFunBy:arr withAll:NO];
     
 }
 @end

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

@@ -71,6 +71,8 @@
                             if([fileLengthNum integerValue] == self.curUploadFileDataMod.totalBytes && self.curUploadFileDataMod.totalBytes != 0){
                                 self.taskUid = nil;
                                 
+                                self.curUploadFileDataMod.curUploadStateType = uploadStateDone;
+                                
                                 NSMutableArray *delArr = [NSMutableArray new];
                                 [delArr addObject:self.curUploadFileDataMod];
                                 [[uploadFileManager shareInstance] deleteUploadFileRecordBy:delArr withDelCache:NO complete:^(BOOL isSuccess) {