|
@@ -24,6 +24,7 @@
|
|
|
#import "imageDetailsScrollViewController.h"
|
|
|
#import "searchBarThridTypeView.h"
|
|
|
#import "NasSearchViewController.h"
|
|
|
+#import "DocumentPickerManager.h"
|
|
|
|
|
|
@interface previewFileAndFolderSecondViewController ()<UITableViewDelegate,UITableViewDataSource,DZNEmptyDataSetSource, DZNEmptyDataSetDelegate>
|
|
|
{
|
|
@@ -708,14 +709,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 文件下载
|
|
@@ -859,4 +868,14 @@
|
|
|
[self.navigationController pushViewController:vc animated:YES];
|
|
|
}
|
|
|
|
|
|
+#pragma mark 文件上传跳转上传记录
|
|
|
+- (void)gotoUploadFileRecordByFileAppWithUrls:(NSArray*)urls
|
|
|
+{
|
|
|
+ uploadFileRecordViewController *vc = [uploadFileRecordViewController new];
|
|
|
+ [self.navigationController pushViewController:vc animated:YES];
|
|
|
+ vc.isUploadingType = YES;
|
|
|
+ [vc gotoUploadFileByFileApp:urls];
|
|
|
+
|
|
|
+}
|
|
|
+
|
|
|
@end
|