提交导出路径更改,添加测试

梁星国
1 parent d75ba136
Showing 5 changed files with 14 additions and 57 deletions
CNLiveICloudPicker/CNICloudDocumentPickerController.h
CNLiveICloudPicker/CNICloudDocumentPickerManager.h
CNLiveICloudPicker/CNICloudDocumentPickerManager.m
CNLiveICloudPicker/CNICloudManager.h
CNLiveICloudPicker/CNICloudManager.m
@@ -15,9 +15,6 @@ NS_ASSUME_NONNULL_BEGIN
 /** 主题颜色 */
 @property (strong, nonatomic) UIColor *themeColor;
-
-
-
 @end
 NS_ASSUME_NONNULL_END
-//
-//  CNICloudDocumentPickerManager.h
-//  iCloud_测试
-//
-//  Created by 梁星国 on 2018/10/12.
-//  Copyright © 2018年 梁星国. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import "CNICloudDocumentPickerController.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-typedef NS_ENUM(NSUInteger, CNICloudDocumentType) {
-    CNICloudDocumentTypeUrl, //
-    CNICloudDocumentTypeUrls,
-    CNICloudDocumentTypeUTIs,
-} NS_ENUM_AVAILABLE_IOS(8_0) __TVOS_PROHIBITED;
-
-
-@interface CNICloudDocumentPickerManager : NSObject
-
-
-
-@end
-
-NS_ASSUME_NONNULL_END
-//
-//  CNICloudDocumentPickerManager.m
-//  iCloud_测试
-//
-//  Created by 梁星国 on 2018/10/12.
-//  Copyright © 2018年 梁星国. All rights reserved.
-//
-
-#import "CNICloudDocumentPickerManager.h"
-#import "CNICloudDocumentPickerController.h"
-
-
-@implementation CNICloudDocumentPickerManager
-
-
-
-
-
-@end
@@ -36,10 +36,9 @@ NS_ASSUME_NONNULL_BEGIN
  @param url 文件路径
  @param outputPath 导出路径
  @param maxSize 保存的最大尺寸 为 nil 忽略
- @param conversationId 群聊为群 ID， 单聊为好友ID （即 会话ID）
  @param callBackContent 保存h的路径 url,是否保存成功,保存失败的描述
  */
-+ (void)saveWithDocumentURL:(NSURL *)url outputPath:(NSString *)outputPath maxSize:(float)maxSize conversationId:(NSString *)conversationId callBackContent:(void(^)(CNICloudDocumentModel *model, BOOL success, NSString * msg, NSInteger code))callBackContent;
++ (void)saveWithDocumentURL:(NSURL *)url outputPath:(NSString *)outputPath maxSize:(float)maxSize callBackContent:(void(^)(CNICloudDocumentModel *model, BOOL success, NSString * msg, NSInteger code))callBackContent;
 /**
  文件是否在指定filePath存在 否则是否在iCloudBox存在
@@ -79,15 +79,14 @@
 /**
- 保存文件到本地 /Documents/iCloudBox 下
+ 保存文件到本地指定路径 默认/Documents/iCloudBox 下
  @param url 文件路径
  @param maxSize 保存的最大尺寸 为 nil 忽略
- @param conversationId 群聊为群 ID， 单聊为好友ID （即 会话ID）
  @param callBackContent 保存h的路径 url,是否保存成功,保存失败的描述
  */
-+ (void)saveWithDocumentURL:(NSURL *)url outputPath:(NSString *)outputPath maxSize:(float)maxSize conversationId:(NSString *)conversationId callBackContent:(void(^)(CNICloudDocumentModel *model, BOOL success, NSString * msg, NSInteger code))callBackContent {
++ (void)saveWithDocumentURL:(NSURL *)url outputPath:(NSString *)outputPath maxSize:(float)maxSize callBackContent:(void(^)(CNICloudDocumentModel *model, BOOL success, NSString * msg, NSInteger code))callBackContent {
     if (![CNICloudManager iCloudEnable]) {
         callBackContent(nil, false, @"请在设置->AppleID、iCloud->iCloud中打开访问权限",code101);
@@ -97,6 +96,10 @@
     NSArray *array = [[url absoluteString] componentsSeparatedByString:@"/"];
     NSString *fileName = [array lastObject];
     fileName = [fileName stringByRemovingPercentEncoding];
+    if (!fileName) {
+        callBackContent(nil, false, @"请在设置->AppleID、iCloud->iCloud中打开访问权限",code104);
+        return;
+    }
     [CNICloudManager downloadWithDocumentURL:url callBack:^(bool success ,NSData *data, float size) {
@@ -119,13 +122,17 @@
             NSString *dataPath = [NSString string];
             if ([NSString isEmpty:outputPath]) {
-                dataPath = kICloudBoxDownLoadPath;
+                dataPath = kICloudBoxPath;
             }else {
                 dataPath = outputPath;
             }
-            NSURL *writeUrl = [[NSURL alloc]initFileURLWithPath:dataPath];
-            [CNICloudFileHelper createDirectoryAtPath:dataPath];
+            BOOL isCreate = [CNICloudFileHelper createDirectoryAtPath:dataPath];
+            if (!isCreate) {
+                callBackContent(nil,YES,@"文件创建失败",code104);
+                return;
+            }
+            NSURL *writeUrl = [[NSURL alloc]initFileURLWithPath:[dataPath stringByAppendingString:fileName]];
             BOOL isWrite = [data writeToURL:writeUrl options:NSDataWritingAtomic error:nil];
             if (isWrite) {