1.上传和下载任务限制 任务结束后才能继续加任务

创维盒子/双子星云手机.xcodeproj/project.pbxproj

@@ -2782,7 +2782,7 @@
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 6;
+				CURRENT_PROJECT_VERSION = 7;
 				DEVELOPMENT_TEAM = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -2861,7 +2861,7 @@
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 6;
+				CURRENT_PROJECT_VERSION = 7;
 				DEVELOPMENT_TEAM = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",

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

@@ -31,6 +31,9 @@
 #import "fileTransfeSetViewController.h"
 #import "backupsSetViewController.h"
 #import "downLoadPreviewViewController.h"
+#import "uploadFileDataModel.h"
+#import "uploadFileManager.h"
+#import "downloadManager.h"
 
 @interface MySetViewController ()<HelpDownScrollViewDelegate,UITableViewDelegate,UITableViewDataSource,ComontAlretViewControllerDelegate>
 {
@@ -253,34 +256,86 @@
     [[self customTableHeadView] closeImageBackupsFun];
 }
 
+- (void)checkDidHadUploadTaskFunWith:(NSInteger)tag
+{
+    KWeakSelf
+    [[uploadFileManager shareInstance] getDataInDatabaseFun:YES complete:^(NSMutableArray * _Nonnull Arr) {
+        mainBlock(^{
+            if(Arr && Arr.count== 3){
+                NSArray *uploadingArr = Arr.firstObject;
+                if(uploadingArr.count == 0){
+                    [weakSelf gotoUploadFileFunWith:tag];
+                }
+                else{
+                    [[iToast makeText:NSLocalizedString(@"upload_task_not_done_tip",nil)] show];
+                }
+            }
+            else{
+                [weakSelf gotoUploadFileFunWith:tag];
+            };
+        });
+            
+    }];
+}
+
+- (void)gotoUploadFileFunWith:(NSInteger)tag
+{
+    if(self->_getBaseInfo){
+        self->_getBaseInfo();
+    }
+    
+    uploadImageOrVideoViewController *vc = [uploadImageOrVideoViewController new];
+    if(tag ==11){
+        vc.isPhotoType = YES;
+    }
+    else{
+        vc.isPhotoType = NO;
+    }
+    [self.navigationController pushViewController:vc animated:YES];
+}
+
+- (void)checkDidHadDownloadTaskFunWith:(NSInteger)tag
+{
+    KWeakSelf
+    [[downloadManager shareInstance] getDataInDatabaseFun:YES complete:^(NSMutableArray * _Nonnull Arr) {
+        mainBlock(^{
+            if(Arr && Arr.count== 3){
+                NSArray *downloadingArr = Arr.firstObject;
+                if(downloadingArr.count == 0){
+                    [weakSelf gotoDownloadFileFunWith:tag];
+                }
+                else{
+                    [[iToast makeText:NSLocalizedString(@"download_task_not_done_tip",nil)] show];
+                }
+            }
+            else{
+                [weakSelf gotoDownloadFileFunWith:tag];
+            };
+        });
+            
+    }];
+}
+- (void)gotoDownloadFileFunWith:(NSInteger)tag
+{
+    downLoadPreviewViewController *vc = [downLoadPreviewViewController new];
+    if(tag ==12){
+        vc.isPhotoType = YES;
+    }
+    else{
+        vc.isPhotoType = NO;
+    }
+    
+    [self.navigationController pushViewController:vc animated:YES];
+}
+
 #pragma mark 点击图片或者视频
 - (void)gotoFileTransferFunBy:(NSInteger)tag
 {
     if(tag == 11 ||tag == 21){
-        if(self->_getBaseInfo){
-            self->_getBaseInfo();
-        }
-        
-        uploadImageOrVideoViewController *vc = [uploadImageOrVideoViewController new];
-        if(tag ==11){
-            vc.isPhotoType = YES;
-        }
-        else{
-            vc.isPhotoType = NO;
-        }
-        [self.navigationController pushViewController:vc animated:YES];
+        [self checkDidHadUploadTaskFunWith:tag];
     }
     else if(tag == 12 ||tag == 22){
-        
-        
-        downLoadPreviewViewController *vc = [downLoadPreviewViewController new];
-        if(tag ==12){
-            vc.isPhotoType = YES;
-        }
-        else{
-            vc.isPhotoType = NO;
-        }
-        [self.navigationController pushViewController:vc animated:YES];
+        [self checkDidHadDownloadTaskFunWith:tag];
     }
 }
 

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

@@ -20,6 +20,7 @@
 #import "photosBackupsTaskModel.h"
 #import "downloadManager.h"
 #import "downloadFileRecordTableView.h"
+#import "MySetViewController.h"
 
 @interface uploadFileRecordViewController ()<UIScrollViewDelegate>
 
@@ -763,16 +764,24 @@
 
 
 
-//-(void)backBtnPressed{
-//    [super backBtnPressed];
-//
-//    _indexPathsForSelectedItems = nil;
-//    _uploadFileRecordheadV = nil;
-//    //_uploadFileRecordBodyV = nil;
-//    //_allDataArr = nil;
-//    _uploadFileRecordEditBottomV = nil;
-//
-//}
+-(void)backBtnPressed{
+    //[super backBtnPressed];
+
+    NSArray *vcArrs = self.navigationController.viewControllers;
+    
+    BOOL didPopType = NO;
+    for (UIViewController *vc in vcArrs) {
+        if([vc isKindOfClass:[MySetViewController class]]){
+            didPopType = YES;
+            [self.navigationController popToViewController:vc animated:YES];
+            return;
+        }
+    }
+    
+    if(!didPopType){
+        [self.navigationController popViewControllerAnimated:YES];
+    }
+}
 
 - (void)backupsFileRefreshFun:(NSNotification*)not
 {

创维盒子/双子星云手机/zh-Hans.lproj/Localizable.strings

@@ -389,3 +389,5 @@
 "disk_insertion_pop_tip_sub3" = "03文件设置";
 "upload_file_and_not_path_tip" = "磁盘路径不存在，请检查磁盘是否正常连接";
 "save_path_change_suc_tip" = "路径更改已成功";
+"upload_task_not_done_tip" = "目前有上传任务正在进行中，请稍后再操作";
+"download_task_not_done_tip" = "目前有下载任务正在进行中，请稍后再操作";