更新方法

张旭
1 parent 8b227b79
Showing 2 changed files with 63 additions and 50 deletions
CNLiveUploadYunSDKDemo/CNLiveUploadYunSDKDemo/AppDelegate.h
CNLiveUploadYunSDKDemo/CNLiveUploadYunSDKDemo/CNLiveUploadController.m
@@ -8,8 +8,8 @@
 #import <UIKit/UIKit.h>
-#define AppId  @"60_j5xilfyl12"
-#define AppKey @"8b58d3dcdd828359e6113d5531029801e5d2b53e9a980c"
+#define AppId  @"60_jaxisljz90"
+#define AppKey @"1ee33b54e18a66b94eca7f8149408565b02f749d314926"
 @interface AppDelegate : UIResponder <UIApplicationDelegate>
@@ -16,13 +16,14 @@
 #define FileBlockSize 5*1024*1024   //一块大小,分块最小5M
 //上传
-#define kUploadBucketKey @"7.6M.mov"  //上传时用到的bucket里文件的路径，此为在wz目录下7.6M.mov
-#define kUploadBucketName @"compose"   //上传所用的bucketName
 #define keyUploadPartNum @"partNum"    //需要app本地存储已经传成功的块号,demo为了演示，用NSUserDefaults存储，app可用数据库等
 #define keyUploadId @"uploadId"      //需要app本地存储已经初始化成功的uploadId，用于断点续传，demo为了演示，用NSUserDefaults存储,app可用数据库等
 @interface CNLiveUploadController ()<UITableViewDelegate,UITableViewDataSource,KingSoftServiceRequestDelegate>
-
+{
+    NSString *_bucketName;//SP对应的bucketName
+    NSString *_bucketKey;//SP上传时用到的bucket里文件的路径(包含扩展名)
+}
 @property (nonatomic ,strong) UITableView *             tableView;
 @property (assign, nonatomic) long long fileSize;
@@ -33,7 +34,6 @@
 @property (strong, nonatomic) NSFileHandle *fileHandle;
 @property (nonatomic, strong) NSArray *arrItems;
 @property (strong, nonatomic)  CNLiveMultipartUpload *muilt;
-
 @end
 @implementation CNLiveUploadController
@@ -50,6 +50,17 @@
     [self.view addSubview:self.tableView];
     self.tableView.delegate = self;
     self.tableView.dataSource = self;
+    
+    _bucketName = [CNLiveUpload getSPBucketName];
+    NSLog(@"bucketName:%@",_bucketName);
+    [self getBucketKeyFromServer];
+}
+
+- (void)getBucketKeyFromServer
+{
+#warning 此处建议从server获取 上传文件对应的bucketKey(文件路径包含扩展名)
+#warning Demo为了演示 bucketKey用固定值
+    _bucketKey = @"cnlive12/test123-7.6M.mov";
 }
 #pragma mark 相册方法
@@ -124,21 +135,21 @@
  */
 - (void)beginMultipartUpload
 {
-    NSString *strKey = kUploadBucketKey;   //key 为在bucket下的路径，demo中为根目录下7.6M.mov路径
+    NSString *strKey = _bucketKey;
     _partSize = 5;    //  文件大于5M为最小5M一块
-
+    
     CNLiveAccessControlList *acl = [[CNLiveAccessControlList alloc] init];
     [acl setContronAccess:CNLiveYun_Permission_Public_Read];
-
-    CNLiveInitiateMultipartUploadRequest *initMultipartUploadReq = [[CNLiveInitiateMultipartUploadRequest alloc] initWithKey:strKey inBucket:kUploadBucketName acl:acl grantAcl:nil];
+    
+    CNLiveInitiateMultipartUploadRequest *initMultipartUploadReq = [[CNLiveInitiateMultipartUploadRequest alloc] initWithKey:strKey inBucket:_bucketName acl:acl grantAcl:nil];
     [initMultipartUploadReq setCompleteRequest];
-
+    
     NSArray *array = [initMultipartUploadReq.CNYHeader componentsSeparatedByString:@"\n"];
     NSString *headers = [array firstObject];
-
-    [CNLiveUpload getTokenWithMd5:initMultipartUploadReq.contentMd5 verb:initMultipartUploadReq.httpMethod type:initMultipartUploadReq.contentType res:initMultipartUploadReq.CNYResource headers:headers date:initMultipartUploadReq.strDate success:^(NSString *token) {
+    
+    [CNLiveUpload getTokenWithMd5:initMultipartUploadReq.contentMd5 verb:initMultipartUploadReq.httpMethod type:initMultipartUploadReq.contentType res:initMultipartUploadReq.CNYResource headers:headers date:initMultipartUploadReq.strDate success:^(NSString *token ,NSString *cnliveDate) {
         [initMultipartUploadReq setStrCNLiveToken:token];
-        
+        [initMultipartUploadReq setStrDate:cnliveDate];
         _muilt = [[CNLiveClient initialize] initiateMultipartUploadWithRequest:initMultipartUploadReq];
         if (_muilt == nil) {
@@ -196,12 +207,9 @@
             //list一下所有上传过的块
             CNLiveListPartsRequest *req2 = [[CNLiveListPartsRequest alloc] initWithMultipartUpload:_muilt];
             [req2 setCompleteRequest];
-            
-            //使用token签名时从Appserver获取token后设置token，使用Ak sk则忽略，不需要调用
-            
-            [CNLiveUpload getTokenWithMd5:req2.contentMd5 verb:req2.httpMethod type:req2.contentType res:req2.CNYResource headers:headers date:req2.strDate success:^(NSString *token) {
+            [CNLiveUpload getTokenWithMd5:req2.contentMd5 verb:req2.httpMethod type:req2.contentType res:req2.CNYResource headers:headers date:req2.strDate success:^(NSString *token ,NSString *cnliveDate) {
                 [req2 setStrCNLiveToken:token];
-                
+                [req2 setStrDate:cnliveDate];
                 CNLiveListPartsResponse *response2 = [[CNLiveClient initialize] listParts:req2];
                 NSLog(@"response.listResult.parts.count =%lu",(unsigned long)[response2.listResult.parts count]);
@@ -219,8 +227,6 @@
             }];
         }
-        //initMultipartUploadReq.strDate = @"Fri, 15 Jul 2016 09:21:30 GMT";
-        //initMultipartUploadReq.strKS3Token = @"KSS JYWSSnN5qY/hFiWg/Y1V:s1ICTedN7C+QqGFMD1FQYj6/bYA=";
     } failure:^(NSDictionary *error) {
     }];
@@ -249,20 +255,19 @@
                 [_fileHandle seekToFileOffset:_partLength*(_uploadNum)];
             }
         }
-
+        
         CNLiveUploadPartRequest *req = [[CNLiveUploadPartRequest alloc] initWithMultipartUpload:_muilt partNumber:(int32_t)partNumber  data:data generateMD5:NO];
         req.delegate = self;
         req.contentLength = data.length;
         req.contentMd5 = [CNLiveSDKUtil base64md5FromData:data];
         [req setCompleteRequest];
-
+        
         NSArray *array = [req.CNYHeader componentsSeparatedByString:@"\n"];
         NSString *headers = [array firstObject];
-        [CNLiveUpload getTokenWithMd5:req.contentMd5 verb:req.httpMethod type:req.contentType res:req.CNYResource headers:headers date:req.strDate success:^(NSString *token) {
-            //使用token签名时从Appserver获取token后设置token，使用Ak sk则忽略，不需要调用
+        [CNLiveUpload getTokenWithMd5:req.contentMd5 verb:req.httpMethod type:req.contentType res:req.CNYResource headers:headers date:req.strDate success:^(NSString *token ,NSString *cnliveDate) {
             [req setStrCNLiveToken:token];
-            
+            [req setStrDate:cnliveDate];
             [[CNLiveClient initialize] uploadPart:req];
         } failure:^(NSDictionary *error) {
@@ -276,16 +281,16 @@
         NSLog(@"请先创建上传,再调用Abort");
         return;
     }
-
+    
     CNLiveAbortMultipartUploadRequest *request = [[CNLiveAbortMultipartUploadRequest alloc] initWithMultipartUpload:_muilt];
     [request setCompleteRequest];
-
+    
     NSArray *array = [request.CNYHeader componentsSeparatedByString:@"\n"];
     NSString *headers = [array firstObject];
-    [CNLiveUpload getTokenWithMd5:request.contentMd5 verb:request.httpMethod type:request.contentType res:request.CNYResource headers:headers date:request.strDate success:^(NSString *token) {
+    [CNLiveUpload getTokenWithMd5:request.contentMd5 verb:request.httpMethod type:request.contentType res:request.CNYResource headers:headers date:request.strDate success:^(NSString *token ,NSString *cnliveDate) {
         [request setStrCNLiveToken:token];
-        
+        [request setStrDate:cnliveDate];
         CNLiveAbortMultipartUploadResponse *response = [[CNLiveClient initialize] abortMultipartUpload:request];
         if (response.httpStatusCode == 204) {
             NSLog(@"Abort multipart upload success!");
@@ -310,24 +315,22 @@
 {
     CNLiveAccessControlList *ControlList = [[CNLiveAccessControlList alloc] init];
     [ControlList setContronAccess:CNLiveYun_Permission_Public_Read_Write];
-    CNLivePutObjectRequest *putObjRequest = [[CNLivePutObjectRequest alloc] initWithName:kUploadBucketName withAcl:ControlList grantAcl:nil];
-
+    CNLivePutObjectRequest *putObjRequest = [[CNLivePutObjectRequest alloc] initWithName:_bucketName withAcl:ControlList grantAcl:nil];
     NSString *fileName = [[NSBundle mainBundle] pathForResource:@"7.6M" ofType:@"mov"];
     putObjRequest.data = [NSData dataWithContentsOfFile:fileName options:NSDataReadingMappedIfSafe error:nil];
-    
     _fileSize = putObjRequest.data.length;
-
+    
     putObjRequest.delegate = self;
-    putObjRequest.filename = kUploadBucketKey;
+    putObjRequest.filename = _bucketKey;
     putObjRequest.contentMd5 = [CNLiveSDKUtil base64md5FromData:putObjRequest.data];
     [putObjRequest setCompleteRequest];
-
+    
     NSArray *array = [putObjRequest.CNYHeader componentsSeparatedByString:@"\n"];
     NSString *headers = [array firstObject];
-    [CNLiveUpload getTokenWithMd5:putObjRequest.contentMd5 verb:putObjRequest.httpMethod type:putObjRequest.contentType res:putObjRequest.CNYResource headers:headers date:putObjRequest.strDate success:^(NSString *token) {
+    [CNLiveUpload getTokenWithMd5:putObjRequest.contentMd5 verb:putObjRequest.httpMethod type:putObjRequest.contentType res:putObjRequest.CNYResource headers:headers date:putObjRequest.strDate success:^(NSString *token ,NSString *cnliveDate) {
         [putObjRequest setStrCNLiveToken:token];
-        
+        [putObjRequest setStrDate:cnliveDate];
         dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
             CNLivePutObjectResponse *response = [[CNLiveClient initialize] putObject:putObjRequest];
@@ -434,6 +437,11 @@
     if ([request isKindOfClass:[KS3PutObjectRequest class]]) {
         if (response.httpStatusCode == 200) {
             NSLog(@"单块上传成功");
+            [CNLiveUpload getUploadResourceUrlWithBucketKey:_bucketKey uploadType:CNLiveYun_UploadType_VideoFile success:^(NSString *resUrl) {
+                NSLog(@"succ:%@",resUrl);
+            } failure:^(NSDictionary *error) {
+                NSLog(@"error%@",error);
+            }];
         }else
         {
             NSLog(@"单块上传失败");
@@ -453,9 +461,9 @@
             NSArray *array = [req2.CNYHeader componentsSeparatedByString:@"\n"];
             NSString *headers = [array firstObject];
-            [CNLiveUpload getTokenWithMd5:req2.contentMd5 verb:req2.httpMethod type:req2.contentType res:req2.CNYResource headers:headers date:req2.strDate success:^(NSString *token) {
+            [CNLiveUpload getTokenWithMd5:req2.contentMd5 verb:req2.httpMethod type:req2.contentType res:req2.CNYResource headers:headers date:req2.strDate success:^(NSString *token ,NSString *cnliveDate) {
                 [req2 setStrCNLiveToken:token];
-                
+                [req2 setStrDate:cnliveDate];
                 CNLiveListPartsResponse *response2 = [[CNLiveClient initialize] listParts:req2];
                 CNLiveCompleteMultipartUploadRequest *req = [[CNLiveCompleteMultipartUploadRequest alloc] initWithMultipartUpload:_muilt];
                 NSLog(@"%@",response2.listResult.parts);
@@ -468,9 +476,9 @@
                 NSArray *array1 = [req.CNYHeader componentsSeparatedByString:@"\n"];
                 NSString *headers1 = [array1 firstObject];
-                [CNLiveUpload getTokenWithMd5:req.contentMd5 verb:req.httpMethod type:req.contentType res:req.CNYResource headers:headers1 date:req.strDate success:^(NSString *token) {
+                [CNLiveUpload getTokenWithMd5:req.contentMd5 verb:req.httpMethod type:req.contentType res:req.CNYResource headers:headers1 date:req.strDate success:^(NSString *token ,NSString *cnliveDate) {
                     [req setStrCNLiveToken:token];
-                    
+                    [req setStrDate:cnliveDate];
                     CNLiveCompleteMultipartUploadResponse *resp = [[CNLiveClient initialize] completeMultipartUpload:req];
                     NSString *bodyStr = [[NSString alloc]initWithData:resp.body encoding:NSUTF8StringEncoding];
                     if (resp.httpStatusCode != 200) {
@@ -482,6 +490,11 @@
                         [mUserDefaults setInteger:0 forKey:keyUploadPartNum];
                         _uploadNum = 0 ;
                         [mUserDefaults synchronize];
+                        [CNLiveUpload getUploadResourceUrlWithBucketKey:_bucketKey uploadType:CNLiveYun_UploadType_VideoFile success:^(NSString *resUrl) {
+                            NSLog(@"succ: %@",resUrl);
+                        } failure:^(NSDictionary *error) {
+                            NSLog(@"error: %@",error);
+                        }];
                     }
                 } failure:^(NSDictionary *error) {
@@ -560,14 +573,14 @@
 }
 /*
-#pragma mark - Navigation
-
-// In a storyboard-based application, you will often want to do a little preparation before navigation
-- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
-    // Get the new view controller using [segue destinationViewController].
-    // Pass the selected object to the new view controller.
-}
-*/
+ #pragma mark - Navigation
+ 
+ // In a storyboard-based application, you will often want to do a little preparation before navigation
+ - (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+ // Get the new view controller using [segue destinationViewController].
+ // Pass the selected object to the new view controller.
+ }
+ */
 @end