no message

王军波
1 parent 3f3c0dae
Showing 5 changed files with 39 additions and 13 deletions
CNLiveUploadYunSDKDemo/CNLiveUploadYunSDK.framework/CNLiveUploadYunSDK
CNLiveUploadYunSDKDemo/CNLiveUploadYunSDK.framework/Headers/CNLiveUpload.h
CNLiveUploadYunSDKDemo/CNLiveUploadYunSDK.framework/Info.plist
CNLiveUploadYunSDKDemo/CNLiveUploadYunSDK.framework/Modules/module.modulemap
CNLiveUploadYunSDKDemo/CNLiveUploadYunSDKDemo.xcodeproj/project.pbxproj
@@ -8,6 +8,11 @@
 #import <Foundation/Foundation.h>
+typedef NS_ENUM(NSInteger, CNLiveYun_UploadType) {
+    CNLiveYun_UploadType_CommonFile,  //普通文件
+    CNLiveYun_UploadType_VideoFile    //视频文件
+};
+
 @interface CNLiveUpload : NSObject
 /**
@@ -31,5 +36,32 @@
  @param successBlock      成功回调
  @param failureBlock      失败回调
  */
-+ (void)getTokenWithMd5:(NSString *)md5 verb:(NSString *)verb type:(NSString *)type res:(NSString *)res headers:(NSString *)headers date:(NSString *)date success:(void (^)(NSString *token))successBlock failure:(void (^)(NSDictionary *error))failureBlock;
++ (void)getTokenWithMd5:(NSString *)md5 verb:(NSString *)verb type:(NSString *)type res:(NSString *)res headers:(NSString *)headers date:(NSString *)date success:(void (^)(NSString *token ,NSString *cnliveDate))successBlock failure:(void (^)(NSDictionary *error))failureBlock;
+
+/**
+ 获取上传资源外链地址
+ 如果失败回调,可以开辟子线程重新请求此API获取资源外链地址
+ 
+ @param bucketKey    SP上传Bucket里文件的路径(包括扩展名)
+ @param uploadType   上传文件类型:
+                         普通文件  CNLiveYun_UploadType_CommonFile
+                         视频文件  CNLiveYun_UploadType_VideoFile
+ @param successBlock 成功回调,返回上传资源外链地址
+ @param failureBlock 失败回调,返回错误信息
+ */
++ (void)getUploadResourceUrlWithBucketKey:(NSString *)bucketKey uploadType:(CNLiveYun_UploadType)uploadType success:(void (^)(NSString *resUrl))successBlock failure:(void (^)(NSDictionary *error))failureBlock;
+
+/**
+ 获取SP的BucketName
+
+ @return BucketName
+ */
++ (NSString *)getSPBucketName;
+
+/**
+ 获取SDK版本号
+
+ @return SDK版本号
+ */
++ (NSString *)getSDKVersion;
 @end
-framework module CNLiveUploadYunSDK {
-  umbrella header "CNLiveUploadYunSDK.h"
-
-  export *
-  module * { export * }
-}
@@ -17,8 +17,8 @@
 		81B9CBA81F54207B009594FB /* KS3YunSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 81B9CBA31F54205E009594FB /* KS3YunSDK.framework */; };
 		81B9CBA91F54207B009594FB /* KS3YunSDK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 81B9CBA31F54205E009594FB /* KS3YunSDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		81B9CBAE1F5421C6009594FB /* 7.6M.mov in Resources */ = {isa = PBXBuildFile; fileRef = 81B9CBAD1F5421C6009594FB /* 7.6M.mov */; };
-		D2DD1B2D1FDFCACB001DFDD1 /* CNLiveUploadYunSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D2DD1B2B1FDFCAC8001DFDD1 /* CNLiveUploadYunSDK.framework */; };
-		D2DD1B2E1FDFCACB001DFDD1 /* CNLiveUploadYunSDK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D2DD1B2B1FDFCAC8001DFDD1 /* CNLiveUploadYunSDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		D2DD1B311FDFDA6C001DFDD1 /* CNLiveUploadYunSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D2DD1B301FDFDA6C001DFDD1 /* CNLiveUploadYunSDK.framework */; };
+		D2DD1B331FDFDA6F001DFDD1 /* CNLiveUploadYunSDK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D2DD1B301FDFDA6C001DFDD1 /* CNLiveUploadYunSDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 /* End PBXBuildFile section */
 /* Begin PBXCopyFilesBuildPhase section */
@@ -28,7 +28,7 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				D2DD1B2E1FDFCACB001DFDD1 /* CNLiveUploadYunSDK.framework in Embed Frameworks */,
+				D2DD1B331FDFDA6F001DFDD1 /* CNLiveUploadYunSDK.framework in Embed Frameworks */,
 				81B9CBA91F54207B009594FB /* KS3YunSDK.framework in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
@@ -51,7 +51,7 @@
 		81B9CBA01F54204F009594FB /* CNLiveUploadController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CNLiveUploadController.m; sourceTree = "<group>"; };
 		81B9CBA31F54205E009594FB /* KS3YunSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = KS3YunSDK.framework; sourceTree = "<group>"; };
 		81B9CBAD1F5421C6009594FB /* 7.6M.mov */ = {isa = PBXFileReference; lastKnownFileType = video.quicktime; path = 7.6M.mov; sourceTree = "<group>"; };
-		D2DD1B2B1FDFCAC8001DFDD1 /* CNLiveUploadYunSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLiveUploadYunSDK.framework; sourceTree = "<group>"; };
+		D2DD1B301FDFDA6C001DFDD1 /* CNLiveUploadYunSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLiveUploadYunSDK.framework; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 /* Begin PBXFrameworksBuildPhase section */
@@ -59,7 +59,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				D2DD1B2D1FDFCACB001DFDD1 /* CNLiveUploadYunSDK.framework in Frameworks */,
+				D2DD1B311FDFDA6C001DFDD1 /* CNLiveUploadYunSDK.framework in Frameworks */,
 				81B9CBA81F54207B009594FB /* KS3YunSDK.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -70,7 +70,7 @@
 		81B9CB7C1F542006009594FB = {
 			isa = PBXGroup;
 			children = (
-				D2DD1B2B1FDFCAC8001DFDD1 /* CNLiveUploadYunSDK.framework */,
+				D2DD1B301FDFDA6C001DFDD1 /* CNLiveUploadYunSDK.framework */,
 				81B9CBA31F54205E009594FB /* KS3YunSDK.framework */,
 				81B9CB871F542006009594FB /* CNLiveUploadYunSDKDemo */,
 				81B9CB861F542006009594FB /* Products */,