1.文件APP 上传同步菜单 -- 日志同步

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

@@ -24,6 +24,7 @@
 #import "audioPlayerViewController.h"
 #import "videoPlayByAVPlayerViewController.h"
 #import "MJRefresh.h"
+#import "DocumentPickerManager.h"
 
 @interface previewAudioOrDocumentViewController ()<UITableViewDelegate,UITableViewDataSource,DZNEmptyDataSetSource, DZNEmptyDataSetDelegate>
 {
@@ -960,14 +961,22 @@
 #pragma mark 调整文件上传
 - (void)gotoUploadFileFunWith:(NSInteger)tag
 {
-    uploadImageOrVideoViewController *vc = [uploadImageOrVideoViewController new];
-    if(tag ==10){
-        vc.isPhotoType = YES;
+    if(tag == 10 || tag == 11){
+        uploadImageOrVideoViewController *vc = [uploadImageOrVideoViewController new];
+        if(tag ==10){
+            vc.isPhotoType = YES;
+        }
+        else{
+            vc.isPhotoType = NO;
+        }
+        [self.navigationController pushViewController:vc animated:YES];
     }
     else{
-        vc.isPhotoType = NO;
+        KWeakSelf
+        [[DocumentPickerManager shareManager] openDocumentPickerSuccess:^(NSArray * _Nonnull urls) {
+            [weakSelf gotoUploadFileRecordByFileAppWithUrls:urls];
+        }];
     }
-    [self.navigationController pushViewController:vc animated:YES];
 }
 
 #pragma mark 文件下载
@@ -1128,4 +1137,13 @@
     }];
 }
 
+#pragma mark 文件上传跳转上传记录
+- (void)gotoUploadFileRecordByFileAppWithUrls:(NSArray*)urls
+{
+    uploadFileRecordViewController *vc = [uploadFileRecordViewController new];
+    [self.navigationController pushViewController:vc animated:YES];
+    vc.isUploadingType = YES;
+    [vc gotoUploadFileByFileApp:urls];
+    
+}
 @end

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

@@ -22,6 +22,7 @@
 #import "videoPlayByAVPlayerViewController.h"
 #import "audioPlayerViewController.h"
 #import "imageDetailsScrollViewController.h"
+#import "DocumentPickerManager.h"
 
 @interface previewFileAndFolderSecondViewController ()<UITableViewDelegate,UITableViewDataSource,DZNEmptyDataSetSource, DZNEmptyDataSetDelegate>
 {
@@ -684,14 +685,22 @@
 #pragma mark 调整文件上传
 - (void)gotoUploadFileFunWith:(NSInteger)tag
 {
-    uploadImageOrVideoViewController *vc = [uploadImageOrVideoViewController new];
-    if(tag ==10){
-        vc.isPhotoType = YES;
+    if(tag == 10 || tag == 11){
+        uploadImageOrVideoViewController *vc = [uploadImageOrVideoViewController new];
+        if(tag ==10){
+            vc.isPhotoType = YES;
+        }
+        else{
+            vc.isPhotoType = NO;
+        }
+        [self.navigationController pushViewController:vc animated:YES];
     }
     else{
-        vc.isPhotoType = NO;
+        KWeakSelf
+        [[DocumentPickerManager shareManager] openDocumentPickerSuccess:^(NSArray * _Nonnull urls) {
+            [weakSelf gotoUploadFileRecordByFileAppWithUrls:urls];
+        }];
     }
-    [self.navigationController pushViewController:vc animated:YES];
 }
 
 #pragma mark 文件下载
@@ -826,4 +835,16 @@
     
     [self getFileListFun];
 }
+
+#pragma mark 文件上传跳转上传记录
+- (void)gotoUploadFileRecordByFileAppWithUrls:(NSArray*)urls
+{
+    uploadFileRecordViewController *vc = [uploadFileRecordViewController new];
+    [self.navigationController pushViewController:vc animated:YES];
+    vc.isUploadingType = YES;
+    [vc gotoUploadFileByFileApp:urls];
+    
+}
+
+
 @end

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

@@ -25,6 +25,7 @@
 #import "audioPlayerViewController.h"
 #import "imageDetailsScrollViewController.h"
 #import "MJRefresh.h"
+#import "DocumentPickerManager.h"
 
 @interface previewFileAndFolderViewController ()<UITableViewDelegate,UITableViewDataSource,DZNEmptyDataSetSource, DZNEmptyDataSetDelegate>
 {
@@ -1051,14 +1052,22 @@
 #pragma mark 调整文件上传
 - (void)gotoUploadFileFunWith:(NSInteger)tag
 {
-    uploadImageOrVideoViewController *vc = [uploadImageOrVideoViewController new];
-    if(tag ==10){
-        vc.isPhotoType = YES;
+    if(tag == 10 || tag == 11){
+        uploadImageOrVideoViewController *vc = [uploadImageOrVideoViewController new];
+        if(tag ==10){
+            vc.isPhotoType = YES;
+        }
+        else{
+            vc.isPhotoType = NO;
+        }
+        [self.navigationController pushViewController:vc animated:YES];
     }
     else{
-        vc.isPhotoType = NO;
+        KWeakSelf
+        [[DocumentPickerManager shareManager] openDocumentPickerSuccess:^(NSArray * _Nonnull urls) {
+            [weakSelf gotoUploadFileRecordByFileAppWithUrls:urls];
+        }];
     }
-    [self.navigationController pushViewController:vc animated:YES];
 }
 
 #pragma mark 文件下载
@@ -1249,5 +1258,15 @@
     }];
 }
 
+#pragma mark 文件上传跳转上传记录
+- (void)gotoUploadFileRecordByFileAppWithUrls:(NSArray*)urls
+{
+    uploadFileRecordViewController *vc = [uploadFileRecordViewController new];
+    [self.navigationController pushViewController:vc animated:YES];
+    vc.isUploadingType = YES;
+    [vc gotoUploadFileByFileApp:urls];
+    
+}
+
 @end
 

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

@@ -25,6 +25,7 @@
 #import "videoPlayViewController.h"
 #import "videoPlayByAVPlayerViewController.h"
 #import "MJRefresh.h"
+#import "DocumentPickerManager.h"
 
 @interface previewImageOrVideoViewController ()<UICollectionViewDelegate,UICollectionViewDataSource,DZNEmptyDataSetSource, DZNEmptyDataSetDelegate>
 {
@@ -1192,15 +1193,22 @@
 #pragma mark 调整文件上传
 - (void)gotoUploadFileFunWith:(NSInteger)tag
 {
-    
-    uploadImageOrVideoViewController *vc = [uploadImageOrVideoViewController new];
-    if(tag ==10){
-        vc.isPhotoType = YES;
+    if(tag == 10 || tag == 11){
+        uploadImageOrVideoViewController *vc = [uploadImageOrVideoViewController new];
+        if(tag ==10){
+            vc.isPhotoType = YES;
+        }
+        else{
+            vc.isPhotoType = NO;
+        }
+        [self.navigationController pushViewController:vc animated:YES];
     }
     else{
-        vc.isPhotoType = NO;
+        KWeakSelf
+        [[DocumentPickerManager shareManager] openDocumentPickerSuccess:^(NSArray * _Nonnull urls) {
+            [weakSelf gotoUploadFileRecordByFileAppWithUrls:urls];
+        }];
     }
-    [self.navigationController pushViewController:vc animated:YES];
 }
 
 
@@ -1337,4 +1345,13 @@
     [self.dataCollectionView reloadData];
 }
 
+#pragma mark 文件上传跳转上传记录
+- (void)gotoUploadFileRecordByFileAppWithUrls:(NSArray*)urls
+{
+    uploadFileRecordViewController *vc = [uploadFileRecordViewController new];
+    [self.navigationController pushViewController:vc animated:YES];
+    vc.isUploadingType = YES;
+    [vc gotoUploadFileByFileApp:urls];
+    
+}
 @end

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

@@ -24,6 +24,7 @@
 //#import "audioPlayerViewController.h"
 #import "videoPlayByAVPlayerViewController.h"
 #import "MJRefresh.h"
+#import "DocumentPickerManager.h"
 
 @interface NasPreviewVideoViewController ()<UITableViewDelegate,UITableViewDataSource,DZNEmptyDataSetSource, DZNEmptyDataSetDelegate>
 {
@@ -932,14 +933,22 @@
 #pragma mark 调整文件上传
 - (void)gotoUploadFileFunWith:(NSInteger)tag
 {
-    uploadImageOrVideoViewController *vc = [uploadImageOrVideoViewController new];
-    if(tag ==10){
-        vc.isPhotoType = YES;
+    if(tag == 10 || tag == 11){
+        uploadImageOrVideoViewController *vc = [uploadImageOrVideoViewController new];
+        if(tag ==10){
+            vc.isPhotoType = YES;
+        }
+        else{
+            vc.isPhotoType = NO;
+        }
+        [self.navigationController pushViewController:vc animated:YES];
     }
     else{
-        vc.isPhotoType = NO;
+        KWeakSelf
+        [[DocumentPickerManager shareManager] openDocumentPickerSuccess:^(NSArray * _Nonnull urls) {
+            [weakSelf gotoUploadFileRecordByFileAppWithUrls:urls];
+        }];
     }
-    [self.navigationController pushViewController:vc animated:YES];
 }
 
 #pragma mark 文件下载
@@ -1099,4 +1108,13 @@
     }];
 }
 
+#pragma mark 文件上传跳转上传记录
+- (void)gotoUploadFileRecordByFileAppWithUrls:(NSArray*)urls
+{
+    uploadFileRecordViewController *vc = [uploadFileRecordViewController new];
+    [self.navigationController pushViewController:vc animated:YES];
+    vc.isUploadingType = YES;
+    [vc gotoUploadFileByFileApp:urls];
+    
+}
 @end