no message

王军波
1 parent 48267760
Showing 8 changed files with 50 additions and 29 deletions
CNLiveUploadYunSDKDemo/CNLiveUploadYunSDK.framework/CNLiveUploadYunSDK
CNLiveUploadYunSDKDemo/CNLiveUploadYunSDK.framework/Headers/CNLiveClient.h
CNLiveUploadYunSDKDemo/CNLiveUploadYunSDK.framework/Headers/CNLiveInitiateMultipartUploadRequest.h
CNLiveUploadYunSDKDemo/CNLiveUploadYunSDK.framework/Headers/CNLiveMultipartUpload.h
CNLiveUploadYunSDKDemo/CNLiveUploadYunSDK.framework/Headers/CNLivePutObjectRequest.h
CNLiveUploadYunSDKDemo/CNLiveUploadYunSDK.framework/Headers/CNLiveUpload.h
CNLiveUploadYunSDKDemo/CNLiveUploadYunSDK.framework/Info.plist
CNLiveUploadYunSDKDemo/CNLiveUploadYunSDKDemo.xcodeproj/project.pbxproj
@@ -85,27 +85,47 @@ typedef enum {
 (CNLiveInitiateMultipartUploadRequest *)request;
 /**
+ *  罗列出已经上传的块
+ *
+ *  @param listPartsRequest 设置罗列已经上传的分块的request信息
+ *
+ *  @return 返回resonse对象（里边有服务返回的数据（具体的参照demo））
+ */
+
+- (CNLiveListPartsResponse *)listParts:(CNLiveListPartsRequest *)listPartsRequest;
+
+/**
+ *  获取相册分块数据
+ *
+ *  @param partNum 从1开始计数，第一块partNum = 1
+ *  @param partLength 每一块数据的大小，单位为字节
+ *  @param alassetURL 形如assets-library://asset/asset.mov?
+ id=25A47CAE-87CF-47A3-8834-592D60841DDB&ext=mov 的相册地址  ，
+ *
+ *  @return 相册分块数据
+ */
+- (NSData *)getUploadPartDataWithPartNum:(NSInteger)partNum
+                              partLength:(NSInteger)partLength
+                              alassetURL:(NSURL *)alassetURL;
+/**
  *  获取相册分块数据
  *
  *  @param partNum 从1开始计数，第一块partNum = 1
- *  @param partlength 每一块数据的大小，单位为字节
+ *  @param partLength 每一块数据的大小，单位为字节
  *  @param assets Alasset对象，是获取视频数据的类
  *
  *  @return 相册分块数据
  */
 - (NSData *)getUploadPartDataWithPartNum:(NSInteger)partNum
-                              partLength:(NSInteger)partlength
+                              partLength:(NSInteger)partLength
                                  Alasset:(ALAsset *)assets;
-
 /**
- *  罗列出已经上传的块
+ *  获取相册类
+ *  @param alassetURL 开头是assets-library://标识Alasset类的相册地址
  *
- *  @param listPartsRequest 设置罗列已经上传的分块的request信息
- *
- *  @return 返回resonse对象（里边有服务返回的数据（具体的参照demo））
+ *  @return 相册类
  */
-
-- (CNLiveListPartsResponse *)listParts:(CNLiveListPartsRequest *)listPartsRequest;
+- (ALAsset *)getAlassetFromAlassetURL:(NSURL *)alassetURL;
 /**
  *  组装所有分块上传的文件
@@ -144,3 +164,4 @@ typedef enum {
  */
 + (NSString *)apiVersion;
 @end
+
@@ -16,7 +16,6 @@
 @property(nonatomic, strong) NSString *strCNLiveToken;
 - (id)initWithKey:(NSString *)aKey
-         inBucket:(NSString *)aBucket
               acl:(CNLiveAccessControlList *)acl
          grantAcl:(NSArray *)arrGrantAcl;
@@ -11,8 +11,8 @@
 //上传类型
 typedef enum {
-    kCNLiveUploadAlasset = 0, //相册中
-    kCNLiveUploadNormal,      //沙盒里或工程里
+    kCNLiveUploadNormal = 0,      //沙盒里或工程里
+    kCNLiveUploadAlasset,         //相册中
 } CNLiveUploadType;
@@ -13,8 +13,8 @@
 @property(strong, nonatomic) NSString *CNYResource;
 @property(nonatomic, strong) NSString *strCNLiveToken;
-- (instancetype)initWithName:(NSString *)bucketName
-                     withAcl:(CNLiveAccessControlList *)acl
+- (instancetype)initWithAcl:(CNLiveAccessControlList *)acl
                     grantAcl:(NSArray *)arrGrantAcl;
 - (NSString *)CNYHeader;
+
 @end
@@ -8,8 +8,8 @@
 #import <Foundation/Foundation.h>
-typedef NS_ENUM(NSInteger, CNLiveYun_UploadType) {
-    CNLiveYun_UploadType_CommonFile,  //普通文件
+typedef NS_ENUM(NSInteger, CNLiveYun_UploadType) {//上传文件类型
+    CNLiveYun_UploadType_CommonFile,  //普通文件 (除视频文件外的所有文件,如图片等)
     CNLiveYun_UploadType_VideoFile    //视频文件
 };
@@ -39,6 +39,14 @@ typedef NS_ENUM(NSInteger, CNLiveYun_UploadType) {
 + (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 successBlock      成功回调
+ @param failureBlock      失败回调
+ */
++ (void)initCNLiveUploadWithSuccess:(void (^)(void))successBlock failure:(void (^)(NSDictionary *error))failureBlock;
+
+/**
  获取上传资源外链地址
  如果失败回调,可以开辟子线程重新请求此API获取资源外链地址
@@ -52,13 +60,6 @@ typedef NS_ENUM(NSInteger, CNLiveYun_UploadType) {
 + (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版本号
@@ -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 */; };
-		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, ); }; };
+		D2FEF9D71FE763AC00B217BD /* CNLiveUploadYunSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D2FEF9D51FE763A900B217BD /* CNLiveUploadYunSDK.framework */; };
+		D2FEF9D81FE763AC00B217BD /* CNLiveUploadYunSDK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D2FEF9D51FE763A900B217BD /* CNLiveUploadYunSDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 /* End PBXBuildFile section */
 /* Begin PBXCopyFilesBuildPhase section */
@@ -28,7 +28,7 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				D2DD1B331FDFDA6F001DFDD1 /* CNLiveUploadYunSDK.framework in Embed Frameworks */,
+				D2FEF9D81FE763AC00B217BD /* 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>"; };
-		D2DD1B301FDFDA6C001DFDD1 /* CNLiveUploadYunSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLiveUploadYunSDK.framework; sourceTree = "<group>"; };
+		D2FEF9D51FE763A900B217BD /* 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 = (
-				D2DD1B311FDFDA6C001DFDD1 /* CNLiveUploadYunSDK.framework in Frameworks */,
+				D2FEF9D71FE763AC00B217BD /* CNLiveUploadYunSDK.framework in Frameworks */,
 				81B9CBA81F54207B009594FB /* KS3YunSDK.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -70,7 +70,7 @@
 		81B9CB7C1F542006009594FB = {
 			isa = PBXGroup;
 			children = (
-				D2DD1B301FDFDA6C001DFDD1 /* CNLiveUploadYunSDK.framework */,
+				D2FEF9D51FE763A900B217BD /* CNLiveUploadYunSDK.framework */,
 				81B9CBA31F54205E009594FB /* KS3YunSDK.framework */,
 				81B9CB871F542006009594FB /* CNLiveUploadYunSDKDemo */,
 				81B9CB861F542006009594FB /* Products */,