1.修复输液选择取消时没有显示tabbar问题 --- 需要同步到主干

创维盒子/code/Class/Set/previewFile/previewAudioOrDocumentViewController.m

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

创维盒子/code/Class/Set/previewFile/previewFileAndFolderSecondViewController.m

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

创维盒子/code/Class/Set/previewFile/previewFileAndFolderViewController.m

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

创维盒子/code/Class/Set/previewFile/previewImageOrVideoViewController.m

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

创维盒子/code/NAS/DocumentPickerManager/DocumentPickerManager.m

@@ -75,6 +75,8 @@
 - (void)documentPickerWasCancelled:(UIDocumentPickerViewController *)controller {
     // 用户取消了文件选择
     HLog(@"Document picker was cancelled");
+    [self didFinishPickerTaskFun];
+
 }
 
 - (void)saveFileToAppSandbox:(NSURL *)fileURL {

创维盒子/code/NAS/NASViewController.m

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

创维盒子/code/NAS/NasPreviewAPPViewController.m

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

创维盒子/code/NAS/NasPreviewVideoViewController.m

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