Browse Source

1.修复上传文件(文件APP) 点击取消的相关bug

huangxiaodong 5 months ago
parent
commit
bc211627a1

+ 4 - 0
创维盒子/code/Class/Set/previewFile/previewAudioOrDocumentViewController.m

@@ -1247,6 +1247,10 @@
 #pragma mark 文件上传跳转上传记录
 - (void)gotoUploadFileRecordByFileAppWithUrls:(NSArray*)urls
 {
+    if(!urls || urls.count == 0){
+        return;
+    }
+    
     uploadFileRecordViewController *vc = [uploadFileRecordViewController new];
     [self.navigationController pushViewController:vc animated:YES];
     vc.isUploadingType = YES;

+ 3 - 0
创维盒子/code/Class/Set/previewFile/previewFileAndFolderSecondViewController.m

@@ -893,6 +893,9 @@
 #pragma mark 文件上传跳转上传记录
 - (void)gotoUploadFileRecordByFileAppWithUrls:(NSArray*)urls
 {
+    if(!urls || urls.count == 0){
+        return;
+    }
     uploadFileRecordViewController *vc = [uploadFileRecordViewController new];
     [self.navigationController pushViewController:vc animated:YES];
     vc.isUploadingType = YES;

+ 3 - 0
创维盒子/code/Class/Set/previewFile/previewFileAndFolderViewController.m

@@ -1264,6 +1264,9 @@
 #pragma mark 文件上传跳转上传记录
 - (void)gotoUploadFileRecordByFileAppWithUrls:(NSArray*)urls
 {
+    if(!urls || urls.count == 0){
+        return;
+    }
     uploadFileRecordViewController *vc = [uploadFileRecordViewController new];
     [self.navigationController pushViewController:vc animated:YES];
     vc.isUploadingType = YES;

+ 4 - 0
创维盒子/code/Class/Set/previewFile/previewImageOrVideoViewController.m

@@ -1422,6 +1422,10 @@
 #pragma mark 文件上传跳转上传记录
 - (void)gotoUploadFileRecordByFileAppWithUrls:(NSArray*)urls
 {
+    if(!urls || urls.count == 0){
+        return;
+    }
+    
     uploadFileRecordViewController *vc = [uploadFileRecordViewController new];
     [self.navigationController pushViewController:vc animated:YES];
     vc.isUploadingType = YES;

+ 2 - 1
创维盒子/code/NAS/DocumentPickerManager/DocumentPickerManager.m

@@ -75,6 +75,7 @@
 - (void)documentPickerWasCancelled:(UIDocumentPickerViewController *)controller {
     // 用户取消了文件选择
     HLog(@"Document picker was cancelled");
+    [self didFinishPickerTaskFun];
 }
 
 - (void)saveFileToAppSandbox:(NSURL *)fileURL {
@@ -128,7 +129,7 @@
     }
     
     HLog(@"处理完成了")
-    if(!curURLS || curURLS.count == 0 || didNoticeUIType){
+    if(!curURLS  || didNoticeUIType){
         return;
     }
 

+ 5 - 0
创维盒子/code/NAS/NASViewController.m

@@ -1185,6 +1185,11 @@
 #pragma mark 文件上传跳转上传记录
 - (void)gotoUploadFileRecordByFileAppWithUrls:(NSArray*)urls
 {
+    if(!urls || urls.count == 0){
+        [self showTabbarFun];
+        return;
+    }
+    
     uploadFileRecordViewController *vc = [uploadFileRecordViewController new];
     [self.navigationController pushViewController:vc animated:YES];
     vc.isUploadingType = YES;

+ 3 - 0
创维盒子/code/NAS/NasPreviewAPPViewController.m

@@ -1484,6 +1484,9 @@
 #pragma mark 文件上传跳转上传记录
 - (void)gotoUploadFileRecordByFileAppWithUrls:(NSArray*)urls
 {
+    if(!urls || urls.count == 0){
+        return;
+    }
     uploadFileRecordViewController *vc = [uploadFileRecordViewController new];
     [self.navigationController pushViewController:vc animated:YES];
     vc.isUploadingType = YES;

+ 3 - 0
创维盒子/code/NAS/NasPreviewVideoViewController.m

@@ -1181,6 +1181,9 @@
 #pragma mark 文件上传跳转上传记录
 - (void)gotoUploadFileRecordByFileAppWithUrls:(NSArray*)urls
 {
+    if(!urls || urls.count == 0){
+        return;
+    }
     uploadFileRecordViewController *vc = [uploadFileRecordViewController new];
     [self.navigationController pushViewController:vc animated:YES];
     vc.isUploadingType = YES;

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

@@ -5962,7 +5962,7 @@
 				CODE_SIGN_ENTITLEMENTS = "计算器.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 18;
+				CURRENT_PROJECT_VERSION = 19;
 				DEVELOPMENT_TEAM = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -6046,7 +6046,7 @@
 				CODE_SIGN_ENTITLEMENTS = "计算器.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 18;
+				CURRENT_PROJECT_VERSION = 19;
 				DEVELOPMENT_TEAM = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",