移除BucketName

张旭
1 parent a49b6bed
Showing 5 changed files with 147 additions and 146 deletions
CNLiveUploadYunSDKDemo/CNLiveUploadYunSDKDemo.xcodeproj/project.pbxproj
CNLiveUploadYunSDKDemo/CNLiveUploadYunSDKDemo/AppDelegate.h
CNLiveUploadYunSDKDemo/CNLiveUploadYunSDKDemo/AppDelegate.m
CNLiveUploadYunSDKDemo/CNLiveUploadYunSDKDemo/CNLiveUploadController.m
CNLiveUploadYunSDKDemo/CNLiveUploadYunSDKDemo/cnlive.mp4
@@ -17,6 +17,7 @@
 		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 */; };
+		D21D75D51FE0C9C700658839 /* cnlive.mp4 in Resources */ = {isa = PBXBuildFile; fileRef = D21D75D41FE0C9C600658839 /* cnlive.mp4 */; };
 		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 */
@@ -51,6 +52,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>"; };
+		D21D75D41FE0C9C600658839 /* cnlive.mp4 */ = {isa = PBXFileReference; lastKnownFileType = file; path = cnlive.mp4; sourceTree = "<group>"; };
 		D2DD1B301FDFDA6C001DFDD1 /* CNLiveUploadYunSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLiveUploadYunSDK.framework; sourceTree = "<group>"; };
 /* End PBXFileReference section */
  
@@ -95,6 +97,7 @@
 				81B9CB9F1F54204F009594FB /* CNLiveUploadController.h */,
 				81B9CBA01F54204F009594FB /* CNLiveUploadController.m */,
 				81B9CBAD1F5421C6009594FB /* 7.6M.mov */,
+				D21D75D41FE0C9C600658839 /* cnlive.mp4 */,
 				81B9CB911F542006009594FB /* Main.storyboard */,
 				81B9CB941F542006009594FB /* Assets.xcassets */,
 				81B9CB961F542006009594FB /* LaunchScreen.storyboard */,
@@ -173,6 +176,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				81B9CBAE1F5421C6009594FB /* 7.6M.mov in Resources */,
+				D21D75D51FE0C9C700658839 /* cnlive.mp4 in Resources */,
 				81B9CB981F542006009594FB /* LaunchScreen.storyboard in Resources */,
 				81B9CB951F542006009594FB /* Assets.xcassets in Resources */,
 				81B9CB931F542006009594FB /* Main.storyboard in Resources */,
@@ -8,6 +8,7 @@
  
 #import <UIKit/UIKit.h>
  
+//在视讯云开放平台 open.cnlive.com 注册应用,配置bundleID以及权限得到AppId和AppKey
 #define AppId  @"60_jaxisljz90"
 #define AppKey @"1ee33b54e18a66b94eca7f8149408565b02f749d314926"
  
@@ -25,7 +25,9 @@
     self.window.rootViewController = nav;
     [self.window makeKeyAndVisible];
  
+    //设置地区
     [[CNLiveClient initialize] setBucketDomainWithRegion:CNLiveBucketBeijing];
+    //初始化云上传SDK
     [CNLiveUpload setAppId:AppId appKey:AppKey isTestEnvironment:NO];
  
     return YES;
@@ -21,19 +21,18 @@
  
 @interface CNLiveUploadController ()<UITableViewDelegate,UITableViewDataSource,KingSoftServiceRequestDelegate>
 {
-    NSString *_bucketName;//SP对应的bucketName
     NSString *_bucketKey;//SP上传时用到的bucket里文件的路径(包含扩展名)
 }
-@property (nonatomic ,strong) UITableView *             tableView;
+@property (nonatomic ,strong) UITableView *             tableView;//列表
  
-@property (assign, nonatomic) long long fileSize;
-@property (assign, nonatomic) NSInteger partSize;
-@property (assign, nonatomic) long long partLength;
-@property (nonatomic) NSInteger uploadNum;
-@property (nonatomic) NSInteger totalNum;
-@property (strong, nonatomic) NSFileHandle *fileHandle;
-@property (nonatomic, strong) NSArray *arrItems;
-@property (strong, nonatomic)  CNLiveMultipartUpload *muilt;
+@property (assign, nonatomic) long long fileSize;//文件大小
+@property (assign, nonatomic) NSInteger partSize;//单块大小
+@property (assign, nonatomic) long long partLength;//单块长度
+@property (nonatomic) NSInteger uploadNum;//当前上传块
+@property (nonatomic) NSInteger totalNum;//上传总块数
+@property (strong, nonatomic) NSFileHandle *fileHandle;//文件管理
+@property (nonatomic, strong) NSArray *arrItems;//数据源
+@property (strong, nonatomic)  CNLiveMultipartUpload *muilt;//分块上传对象
 @end
  
 @implementation CNLiveUploadController
@@ -51,16 +50,18 @@
     self.tableView.delegate = self;
     self.tableView.dataSource = self;
  
-    _bucketName = [CNLiveUpload getSPBucketName];
-    NSLog(@"bucketName:%@",_bucketName);
     [self getBucketKeyFromServer];
 }
  
+
+/**
+ 从服务器获取BucketKey,BucketKey为文件路径
+ */
 - (void)getBucketKeyFromServer
 {
 #warning 此处建议从server获取 上传文件对应的bucketKey(文件路径包含扩展名)
 #warning Demo为了演示 bucketKey用固定值
-    _bucketKey = @"cnlive122/test123-7.6M.mov";
+    _bucketKey = @"cnlive-test/cnlive.mp4";
 }
  
 #pragma mark 相册方法
@@ -135,108 +136,104 @@
  */
 - (void)beginMultipartUpload
 {
-    if(_bucketName == nil){
-        _bucketName = [CNLiveUpload getSPBucketName];
-        if (!_bucketName) {
-            NSLog(@"获取BucketName失败,请检查视讯云上传模块权限是否配置!");
-            return;
-        }
-    }
-    
-    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:_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 ,NSString *cnliveDate) {
-        [initMultipartUploadReq setStrCNLiveToken:token];
-        [initMultipartUploadReq setStrDate:cnliveDate];
-        _muilt = [[CNLiveClient initialize] initiateMultipartUploadWithRequest:initMultipartUploadReq];
+    [CNLiveUpload initCNLiveUploadWithSuccess:^{
+        NSString *strKey = _bucketKey;
+        _partSize = 5;    //  文件大于5M为最小5M一块
  
-        if (_muilt == nil) {
-            NSLog(@"####Init upload failed, please check access key, secret key and bucket name!####");
-            return ;
-        }
+        CNLiveAccessControlList *acl = [[CNLiveAccessControlList alloc] init];
+        [acl setContronAccess:CNLiveYun_Permission_Public_Read];
  
-        //选择相册还是普通方式
-        _muilt.uploadType = kCNLiveUploadNormal;
+        CNLiveInitiateMultipartUploadRequest *initMultipartUploadReq = [[CNLiveInitiateMultipartUploadRequest alloc] initWithKey:strKey acl:acl grantAcl:nil];
+        [initMultipartUploadReq setCompleteRequest];
  
-        //根据文件路径不一样，有如下两种上传
-        if (_muilt.uploadType == kCNLiveUploadNormal) { //如果是沙盒或者工程里的文件
-            //工程里，沙盒里，是沙盒路径
-            NSString *strFilePath = [[NSBundle mainBundle] pathForResource:@"7.6M" ofType:@"mov"];
-            _fileHandle = [NSFileHandle fileHandleForReadingAtPath:strFilePath];
-            _fileSize = [_fileHandle availableData].length;
-            if (_fileSize <= 0) {
-                NSLog(@"####This file is not exist!####");
-                return ;
-            }
-            if (!(_partSize > 0 || _partSize != 0)) {
-                _partLength = _fileSize;
-            }else{
-                _partLength = _partSize * 1024.0 * 1024.0;
-            }
-            _totalNum = (ceilf((float)_fileSize / (float)_partLength));
-            [_fileHandle seekToFileOffset:0];
-        }else
-        {
-            //如果是相册里的，从这传
-            ALAssetRepresentation *assetD = [self getAlasset].defaultRepresentation;
-            _fileSize = assetD.size;
-            if (_fileSize <= 0) {
-                NSLog(@"####This file is not exist!####");
+        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 ,NSString *cnliveDate) {
+            [initMultipartUploadReq setStrCNLiveToken:token];
+            [initMultipartUploadReq setStrDate:cnliveDate];
+            _muilt = [[CNLiveClient initialize] initiateMultipartUploadWithRequest:initMultipartUploadReq];
+            
+            if (_muilt == nil) {
+                NSLog(@"####Init upload failed, please check access key, secret key and bucket name!####");
                 return ;
             }
-            if (!(_partSize > 0 || _partSize != 0)) {
-                _partLength = _fileSize;
-            }else{
-                _partLength = _partSize * 1024.0 * 1024.0;
+            
+            //选择相册还是普通方式
+            _muilt.uploadType = kCNLiveUploadNormal;
+            
+            //根据文件路径不一样，有如下两种上传
+            if (_muilt.uploadType == kCNLiveUploadNormal) { //如果是沙盒或者工程里的文件
+                //工程里，沙盒里，是沙盒路径
+                NSString *strFilePath = [[NSBundle mainBundle] pathForResource:@"7.6M" ofType:@"mov"];
+                _fileHandle = [NSFileHandle fileHandleForReadingAtPath:strFilePath];
+                _fileSize = [_fileHandle availableData].length;
+                if (_fileSize <= 0) {
+                    NSLog(@"####This file is not exist!####");
+                    return ;
+                }
+                if (!(_partSize > 0 || _partSize != 0)) {
+                    _partLength = _fileSize;
+                }else{
+                    _partLength = _partSize * 1024.0 * 1024.0;
+                }
+                _totalNum = (ceilf((float)_fileSize / (float)_partLength));
+                [_fileHandle seekToFileOffset:0];
+            }else
+            {
+                //如果是相册里的，从这传
+                ALAssetRepresentation *assetD = [self getAlasset].defaultRepresentation;
+                _fileSize = assetD.size;
+                if (_fileSize <= 0) {
+                    NSLog(@"####This file is not exist!####");
+                    return ;
+                }
+                if (!(_partSize > 0 || _partSize != 0)) {
+                    _partLength = _fileSize;
+                }else{
+                    _partLength = _partSize * 1024.0 * 1024.0;
+                }
+                _totalNum = (ceilf((float)_fileSize / (float)_partLength));
             }
-            _totalNum = (ceilf((float)_fileSize / (float)_partLength));
-        }
-        
+            
 #warning 上传的断点续传判断：初始化上传后，开始上传前，此处需要list一下所有的数据块，如果uploadID是新生成的，可以跳过list过程从第一块开始传，如果上传是断点续传，需用初始化用到的uploadId，list一下所有已经传过的数据块，再从暂停块上传即可， 这里用NSUserDefault演示存储过程。
-        //判断uploadId是否存在，进而进行上传的断点续传
-        if ([mUserDefaults objectForKey:keyUploadId] == nil) {
-            [mUserDefaults setObject:_muilt.uploadId forKey:keyUploadId];
-            [mUserDefaults synchronize];
-            _uploadNum = 1;
-            [self uploadWithPartNumber:_uploadNum];
-        }else
-        {
-            _muilt.uploadId = [mUserDefaults objectForKey:keyUploadId];
-            //list一下所有上传过的块
-            CNLiveListPartsRequest *req2 = [[CNLiveListPartsRequest alloc] initWithMultipartUpload:_muilt];
-            [req2 setCompleteRequest];
-            [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]);
-                
-                //从这块开始上传,list结果的最后一块
-                _uploadNum = ((CNLivePart *)[response2.listResult.parts lastObject]).partNumber + 1 ;
-                
-                //进度补齐
-                long long alreadyTotalWriten = (_uploadNum - 1) * _partLength ;
-                double progress = alreadyTotalWriten / (float)_fileSize;
-                UIProgressView *progressView = (UIProgressView *)[self.view viewWithTag:199];
-                progressView.progress = progress;
+            //判断uploadId是否存在，进而进行上传的断点续传
+            if ([mUserDefaults objectForKey:keyUploadId] == nil) {
+                [mUserDefaults setObject:_muilt.uploadId forKey:keyUploadId];
+                [mUserDefaults synchronize];
+                _uploadNum = 1;
                 [self uploadWithPartNumber:_uploadNum];
-            } failure:^(NSDictionary *error) {
-                
-            }];
-        }
+            }else
+            {
+                _muilt.uploadId = [mUserDefaults objectForKey:keyUploadId];
+                //list一下所有上传过的块
+                CNLiveListPartsRequest *req2 = [[CNLiveListPartsRequest alloc] initWithMultipartUpload:_muilt];
+                [req2 setCompleteRequest];
+                [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]);
+                    
+                    //从这块开始上传,list结果的最后一块
+                    _uploadNum = ((CNLivePart *)[response2.listResult.parts lastObject]).partNumber + 1 ;
+                    
+                    //进度补齐
+                    long long alreadyTotalWriten = (_uploadNum - 1) * _partLength ;
+                    double progress = alreadyTotalWriten / (float)_fileSize;
+                    UIProgressView *progressView = (UIProgressView *)[self.view viewWithTag:199];
+                    progressView.progress = progress;
+                    [self uploadWithPartNumber:_uploadNum];
+                } failure:^(NSDictionary *error) {
+                    NSLog(@"error %@",error);
+                }];
+            }
+        } failure:^(NSDictionary *error) {
+            NSLog(@"error %@",error);
+        }];
     } failure:^(NSDictionary *error) {
-        
+        NSLog(@"error %@",error);
     }];
 }
  
@@ -313,7 +310,7 @@
             NSLog(@"error: %@", response.error.description);
         }
     } failure:^(NSDictionary *error) {
-        
+        NSLog(@"error %@",error);
     }];
 }
  
@@ -321,46 +318,43 @@
 //最小支持但块上传小于5M，最大支持单块上传为5G
 - (void)beginSingleUpload:(NSInteger) row
 {
-    if(_bucketName == nil){
-        _bucketName = [CNLiveUpload getSPBucketName];
-        if (!_bucketName) {
-            NSLog(@"获取BucketName失败,请检查视讯云上传模块权限是否配置!");
-            return;
-        }
-    }
-    CNLiveAccessControlList *ControlList = [[CNLiveAccessControlList alloc] init];
-    [ControlList setContronAccess:CNLiveYun_Permission_Public_Read_Write];
-    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 = _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 ,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];
-            
-            //putObjRequest若没设置代理，则是同步的下方判断，
-            //putObjRequest若设置了代理，则走上传代理回调,
-            if (putObjRequest.delegate == nil) {
-                NSLog(@"%@",[[NSString alloc] initWithData:response.body encoding:NSUTF8StringEncoding]);
-                if (response.httpStatusCode == 200) {
-                    NSLog(@"Put object success");
-                }
-                else {
-                    NSLog(@"Put object failed");
+    [CNLiveUpload initCNLiveUploadWithSuccess:^{
+        CNLiveAccessControlList *ControlList = [[CNLiveAccessControlList alloc] init];
+        [ControlList setContronAccess:CNLiveYun_Permission_Public_Read_Write];
+        CNLivePutObjectRequest *putObjRequest = [[CNLivePutObjectRequest alloc] initWithAcl: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 = _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 ,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];
+                
+                //putObjRequest若没设置代理，则是同步的下方判断，
+                //putObjRequest若设置了代理，则走上传代理回调,
+                if (putObjRequest.delegate == nil) {
+                    NSLog(@"%@",[[NSString alloc] initWithData:response.body encoding:NSUTF8StringEncoding]);
+                    if (response.httpStatusCode == 200) {
+                        NSLog(@"Put object success");
+                    }
+                    else {
+                        NSLog(@"Put object failed");
+                    }
                 }
-            }
-        });
+            });
+        } failure:^(NSDictionary *error) {
+            NSLog(@"error %@",error);
+        }];
     } failure:^(NSDictionary *error) {
         NSLog(@"error %@",error);
     }];