Pārlūkot izejas kodu

【IOS】开启后台传输后,上传过程中退到后台,再进入查看上传任务是暂停状态 (非必现 尝试优化)

huangxiaodong 1 gadu atpakaļ
vecāks
revīzija
9f315a7c1c

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

@@ -476,7 +476,7 @@ static backupsFileManager * cur_backupsFileShareInstance = nil;
         return NO;
     }
     
-    if(_curPhotosBackupsTaskMod.curBackupsState != backupsStateUploading){
+    if(_curPhotosBackupsTaskMod.curBackupsState == backupsStateSuspend){
         return NO;
     }
     

+ 6 - 7
创维盒子/双子星云手机/Class/Set/uploadFile/uploadFileManager/downloadManager.m

@@ -204,8 +204,6 @@ static downloadManager * cur_downloadManager = nil;
 {
     if(_downLoadFileModelDataArr.count == 0)
     {
-        _curDownloadFileModel = nil;
-        
         [self didDownloadAllTaskDoneFun];
         return;
     }
@@ -557,11 +555,11 @@ static downloadManager * cur_downloadManager = nil;
         return NO;
     }
     
-    if(_curDownloadFileModel.curDownloadStateType == downloadStateDone
-       ||_curDownloadFileModel.curDownloadStateType == downloadStateFail
-       ||_curDownloadFileModel.curDownloadStateType == downloadStateSuspend){
-        return NO;
-    }
+//    if(_curDownloadFileModel.curDownloadStateType == downloadStateDone
+//       ||_curDownloadFileModel.curDownloadStateType == downloadStateFail
+//       ||_curDownloadFileModel.curDownloadStateType == downloadStateSuspend){
+//        return NO;
+//    }
     
     if(_isSuspendType){
         return NO;
@@ -572,6 +570,7 @@ static downloadManager * cur_downloadManager = nil;
 
 - (void)didDownloadAllTaskDoneFun
 {
+    _curDownloadFileModel = nil;
     [[NSNotificationCenter defaultCenter] postNotificationName:downloadFileAllTaskDoneNotification object:nil];
 }
 

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

@@ -284,6 +284,12 @@ static uploadFileManager * cur_uploadFileShareInstance = nil;
     _curUploadFileDataModel.imageData = nil;
     _curUploadFileDataModel.videoData = nil;
     _curUploadFileDataModel = nil;
+    
+    if(_fileModelDataArr.count == 0){
+        [self didUploadAllTaskDoneFun];
+        return;
+    }
+    
     if(_reUploadIngSelectIndex > 0 && _reUploadIngSelectIndex < _fileModelDataArr.count){
         _curUploadFileDataModel = _fileModelDataArr[_reUploadIngSelectIndex];
     }
@@ -738,8 +744,6 @@ static uploadFileManager * cur_uploadFileShareInstance = nil;
             [self beginUploadFileFun];
         }
         else{
-            self->_isUploadIngType = NO;
-            self->_curUploadFileDataModel = nil;
             [self didUploadAllTaskDoneFun];
         }
     }];
@@ -939,9 +943,7 @@ static uploadFileManager * cur_uploadFileShareInstance = nil;
 
 - (BOOL)checkUploadingFun
 {
-    if(!_curUploadFileDataModel
-       || _curUploadFileDataModel.curUploadStateType == uploadStateDone
-       || _curUploadFileDataModel.curUploadStateType == uploadStateSuspend){
+    if(!_curUploadFileDataModel){
         return NO;
     }
     
@@ -975,6 +977,8 @@ static uploadFileManager * cur_uploadFileShareInstance = nil;
 
 - (void)didUploadAllTaskDoneFun
 {
+    self->_isUploadIngType = NO;
+    self->_curUploadFileDataModel = nil;
     [[NSNotificationCenter defaultCenter] postNotificationName:uploadFileAllTaskDoneNotification object:nil];
 }
 @end