iOS Team / CNLiveUploadSDKDemo · Commits

Commit 569068bee1b92304c0713d8547a077a4abb7f376

Authored by 王军波
1 parent 48267760

no message

Inline Side-by-side
Showing 8 changed files with 50 additions and 29 deletions
CNLiveUploadYunSDKDemo/CNLiveUploadYunSDK.framework/CNLiveUploadYunSDK
View file @569068b
No preview for this file type
CNLiveUploadYunSDKDemo/CNLiveUploadYunSDK.framework/Headers/CNLiveClient.h
  View file @569068b
... ... @@ -85,27 +85,47 @@ typedef enum {
85 85 (CNLiveInitiateMultipartUploadRequest *)request;
86 86  
87 87 /**
  88 + * 罗列出已经上传的块
  89 + *
  90 + * @param listPartsRequest 设置罗列已经上传的分块的request信息
  91 + *
  92 + * @return 返回resonse对象（里边有服务返回的数据（具体的参照demo））
  93 + */
  94 +
  95 +- (CNLiveListPartsResponse *)listParts:(CNLiveListPartsRequest *)listPartsRequest;
  96 +
  97 +/**
  98 + * 获取相册分块数据
  99 + *
  100 + * @param partNum 从1开始计数，第一块partNum = 1
  101 + * @param partLength 每一块数据的大小，单位为字节
  102 + * @param alassetURL 形如assets-library://asset/asset.mov?
  103 + id=25A47CAE-87CF-47A3-8834-592D60841DDB&ext=mov 的相册地址 ，
  104 + *
  105 + * @return 相册分块数据
  106 + */
  107 +- (NSData *)getUploadPartDataWithPartNum:(NSInteger)partNum
  108 + partLength:(NSInteger)partLength
  109 + alassetURL:(NSURL *)alassetURL;
  110 +/**
88 111 * 获取相册分块数据
89 112 *
90 113 * @param partNum 从1开始计数，第一块partNum = 1
91   - * @param partlength 每一块数据的大小，单位为字节
  114 + * @param partLength 每一块数据的大小，单位为字节
92 115 * @param assets Alasset对象，是获取视频数据的类
93 116 *
94 117 * @return 相册分块数据
95 118 */
96 119 - (NSData *)getUploadPartDataWithPartNum:(NSInteger)partNum
97   - partLength:(NSInteger)partlength
  120 + partLength:(NSInteger)partLength
98 121 Alasset:(ALAsset *)assets;
99   -
100 122 /**
101   - * 罗列出已经上传的块
  123 + * 获取相册类
  124 + * @param alassetURL 开头是assets-library://标识Alasset类的相册地址
102 125 *
103   - * @param listPartsRequest 设置罗列已经上传的分块的request信息
104   - *
105   - * @return 返回resonse对象（里边有服务返回的数据（具体的参照demo））
  126 + * @return 相册类
106 127 */
107   -
108   -- (CNLiveListPartsResponse *)listParts:(CNLiveListPartsRequest *)listPartsRequest;
  128 +- (ALAsset *)getAlassetFromAlassetURL:(NSURL *)alassetURL;
109 129  
110 130 /**
111 131 * 组装所有分块上传的文件
... ... @@ -144,3 +164,4 @@ typedef enum {
144 164 */
145 165 + (NSString *)apiVersion;
146 166 @end
  167 +
... ...
CNLiveUploadYunSDKDemo/CNLiveUploadYunSDK.framework/Headers/CNLiveInitiateMultipartUploadRequest.h
  View file @569068b
... ... @@ -16,7 +16,6 @@
16 16 @property(nonatomic, strong) NSString *strCNLiveToken;
17 17  
18 18 - (id)initWithKey:(NSString *)aKey
19   - inBucket:(NSString *)aBucket
20 19 acl:(CNLiveAccessControlList *)acl
21 20 grantAcl:(NSArray *)arrGrantAcl;
22 21  
... ...
CNLiveUploadYunSDKDemo/CNLiveUploadYunSDK.framework/Headers/CNLiveMultipartUpload.h
  View file @569068b
... ... @@ -11,8 +11,8 @@
11 11  
12 12 //上传类型
13 13 typedef enum {
14   - kCNLiveUploadAlasset = 0, //相册中
15   - kCNLiveUploadNormal, //沙盒里或工程里
  14 + kCNLiveUploadNormal = 0, //沙盒里或工程里
  15 + kCNLiveUploadAlasset, //相册中
16 16 } CNLiveUploadType;
17 17  
18 18  
... ...
CNLiveUploadYunSDKDemo/CNLiveUploadYunSDK.framework/Headers/CNLivePutObjectRequest.h
  View file @569068b
... ... @@ -13,8 +13,8 @@
13 13 @property(strong, nonatomic) NSString *CNYResource;
14 14 @property(nonatomic, strong) NSString *strCNLiveToken;
15 15  
16   -- (instancetype)initWithName:(NSString *)bucketName
17   - withAcl:(CNLiveAccessControlList *)acl
  16 +- (instancetype)initWithAcl:(CNLiveAccessControlList *)acl
18 17 grantAcl:(NSArray *)arrGrantAcl;
19 18 - (NSString *)CNYHeader;
  19 +
20 20 @end
... ...
CNLiveUploadYunSDKDemo/CNLiveUploadYunSDK.framework/Headers/CNLiveUpload.h
  View file @569068b
... ... @@ -8,8 +8,8 @@
8 8  
9 9 #import <Foundation/Foundation.h>
10 10  
11   -typedef NS_ENUM(NSInteger, CNLiveYun_UploadType) {
12   - CNLiveYun_UploadType_CommonFile, //普通文件
  11 +typedef NS_ENUM(NSInteger, CNLiveYun_UploadType) {//上传文件类型
  12 + CNLiveYun_UploadType_CommonFile, //普通文件 (除视频文件外的所有文件,如图片等)
13 13 CNLiveYun_UploadType_VideoFile //视频文件
14 14 };
15 15  
... ... @@ -39,6 +39,14 @@ typedef NS_ENUM(NSInteger, CNLiveYun_UploadType) {
39 39 + (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;
40 40  
41 41 /**
  42 + 上传时初始化模块,单块/分块开始上传时都需调此API
  43 +
  44 + @param successBlock 成功回调
  45 + @param failureBlock 失败回调
  46 + */
  47 ++ (void)initCNLiveUploadWithSuccess:(void (^)(void))successBlock failure:(void (^)(NSDictionary *error))failureBlock;
  48 +
  49 +/**
42 50 获取上传资源外链地址
43 51 如果失败回调,可以开辟子线程重新请求此API获取资源外链地址
44 52  
... ... @@ -52,13 +60,6 @@ typedef NS_ENUM(NSInteger, CNLiveYun_UploadType) {
52 60 + (void)getUploadResourceUrlWithBucketKey:(NSString *)bucketKey uploadType:(CNLiveYun_UploadType)uploadType success:(void (^)(NSString *resUrl))successBlock failure:(void (^)(NSDictionary *error))failureBlock;
53 61  
54 62 /**
55   - 获取SP的BucketName
56   -
57   - @return BucketName
58   - */
59   -+ (NSString *)getSPBucketName;
60   -
61   -/**
62 63 获取SDK版本号
63 64  
64 65 @return SDK版本号
... ...
CNLiveUploadYunSDKDemo/CNLiveUploadYunSDK.framework/Info.plist
View file @569068b
No preview for this file type
CNLiveUploadYunSDKDemo/CNLiveUploadYunSDKDemo.xcodeproj/project.pbxproj
  View file @569068b
... ... @@ -17,8 +17,8 @@
17 17 81B9CBA81F54207B009594FB /* KS3YunSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 81B9CBA31F54205E009594FB /* KS3YunSDK.framework */; };
18 18 81B9CBA91F54207B009594FB /* KS3YunSDK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 81B9CBA31F54205E009594FB /* KS3YunSDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
19 19 81B9CBAE1F5421C6009594FB /* 7.6M.mov in Resources */ = {isa = PBXBuildFile; fileRef = 81B9CBAD1F5421C6009594FB /* 7.6M.mov */; };
20   - D2DD1B311FDFDA6C001DFDD1 /* CNLiveUploadYunSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D2DD1B301FDFDA6C001DFDD1 /* CNLiveUploadYunSDK.framework */; };
21   - D2DD1B331FDFDA6F001DFDD1 /* CNLiveUploadYunSDK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D2DD1B301FDFDA6C001DFDD1 /* CNLiveUploadYunSDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
  20 + D2FEF9D71FE763AC00B217BD /* CNLiveUploadYunSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D2FEF9D51FE763A900B217BD /* CNLiveUploadYunSDK.framework */; };
  21 + D2FEF9D81FE763AC00B217BD /* CNLiveUploadYunSDK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D2FEF9D51FE763A900B217BD /* CNLiveUploadYunSDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
22 22 /* End PBXBuildFile section */
23 23  
24 24 /* Begin PBXCopyFilesBuildPhase section */
... ... @@ -28,7 +28,7 @@
28 28 dstPath = "";
29 29 dstSubfolderSpec = 10;
30 30 files = (
31   - D2DD1B331FDFDA6F001DFDD1 /* CNLiveUploadYunSDK.framework in Embed Frameworks */,
  31 + D2FEF9D81FE763AC00B217BD /* CNLiveUploadYunSDK.framework in Embed Frameworks */,
32 32 81B9CBA91F54207B009594FB /* KS3YunSDK.framework in Embed Frameworks */,
33 33 );
34 34 name = "Embed Frameworks";
... ... @@ -51,7 +51,7 @@
51 51 81B9CBA01F54204F009594FB /* CNLiveUploadController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CNLiveUploadController.m; sourceTree = "<group>"; };
52 52 81B9CBA31F54205E009594FB /* KS3YunSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = KS3YunSDK.framework; sourceTree = "<group>"; };
53 53 81B9CBAD1F5421C6009594FB /* 7.6M.mov */ = {isa = PBXFileReference; lastKnownFileType = video.quicktime; path = 7.6M.mov; sourceTree = "<group>"; };
54   - D2DD1B301FDFDA6C001DFDD1 /* CNLiveUploadYunSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLiveUploadYunSDK.framework; sourceTree = "<group>"; };
  54 + D2FEF9D51FE763A900B217BD /* CNLiveUploadYunSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLiveUploadYunSDK.framework; sourceTree = "<group>"; };
55 55 /* End PBXFileReference section */
56 56  
57 57 /* Begin PBXFrameworksBuildPhase section */
... ... @@ -59,7 +59,7 @@
59 59 isa = PBXFrameworksBuildPhase;
60 60 buildActionMask = 2147483647;
61 61 files = (
62   - D2DD1B311FDFDA6C001DFDD1 /* CNLiveUploadYunSDK.framework in Frameworks */,
  62 + D2FEF9D71FE763AC00B217BD /* CNLiveUploadYunSDK.framework in Frameworks */,
63 63 81B9CBA81F54207B009594FB /* KS3YunSDK.framework in Frameworks */,
64 64 );
65 65 runOnlyForDeploymentPostprocessing = 0;
... ... @@ -70,7 +70,7 @@
70 70 81B9CB7C1F542006009594FB = {
71 71 isa = PBXGroup;
72 72 children = (
73   - D2DD1B301FDFDA6C001DFDD1 /* CNLiveUploadYunSDK.framework */,
  73 + D2FEF9D51FE763A900B217BD /* CNLiveUploadYunSDK.framework */,
74 74 81B9CBA31F54205E009594FB /* KS3YunSDK.framework */,
75 75 81B9CB871F542006009594FB /* CNLiveUploadYunSDKDemo */,
76 76 81B9CB861F542006009594FB /* Products */,
... ...