Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/CNLiveUploadSDKDemo

# Conflicts: # CNLiveUploadYunSDKDemo/CNLiveUploadYunSDKDemo.xcodeproj/project.pbxproj

Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/CNLiveUploadSDKDemo
# Conflicts: # CNLiveUploadYunSDKDemo/CNLiveUploadYunSDKDemo.xcodeproj/project.pbxproj
王军波
2 parents 569068be afd7749b
Showing 8 changed files with 293 additions and 208 deletions
CNLiveUploadYunSDKDemo/CNLiveUploadYunSDKDemo.xcodeproj/project.pbxproj
CNLiveUploadYunSDKDemo/CNLiveUploadYunSDKDemo/7.6M.mov
CNLiveUploadYunSDKDemo/CNLiveUploadYunSDKDemo/AppDelegate.h
CNLiveUploadYunSDKDemo/CNLiveUploadYunSDKDemo/AppDelegate.m
CNLiveUploadYunSDKDemo/CNLiveUploadYunSDKDemo/CNLiveUploadController.m
CNLiveUploadYunSDKDemo/CNLiveUploadYunSDKDemo/cnlive.mp4
CNLiveUploadYunSDKDemo/iOS 视讯云上传SDK使用说明文档.pdf
README.md
@@ -16,9 +16,9 @@
 		81B9CBA11F54204F009594FB /* CNLiveUploadController.m in Sources */ = {isa = PBXBuildFile; fileRef = 81B9CBA01F54204F009594FB /* CNLiveUploadController.m */; };
 		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 */; };
-		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, ); }; };
+		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 */
 /* Begin PBXCopyFilesBuildPhase section */
@@ -28,7 +28,7 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				D2FEF9D81FE763AC00B217BD /* CNLiveUploadYunSDK.framework in Embed Frameworks */,
+				D2DD1B331FDFDA6F001DFDD1 /* CNLiveUploadYunSDK.framework in Embed Frameworks */,
 				81B9CBA91F54207B009594FB /* KS3YunSDK.framework in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
@@ -50,8 +50,8 @@
 		81B9CB9F1F54204F009594FB /* CNLiveUploadController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CNLiveUploadController.h; sourceTree = "<group>"; };
 		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>"; };
-		D2FEF9D51FE763A900B217BD /* CNLiveUploadYunSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLiveUploadYunSDK.framework; 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 */
 /* Begin PBXFrameworksBuildPhase section */
@@ -59,7 +59,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				D2FEF9D71FE763AC00B217BD /* CNLiveUploadYunSDK.framework in Frameworks */,
+				D2DD1B311FDFDA6C001DFDD1 /* CNLiveUploadYunSDK.framework in Frameworks */,
 				81B9CBA81F54207B009594FB /* KS3YunSDK.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -70,7 +70,7 @@
 		81B9CB7C1F542006009594FB = {
 			isa = PBXGroup;
 			children = (
-				D2FEF9D51FE763A900B217BD /* CNLiveUploadYunSDK.framework */,
+				D2DD1B301FDFDA6C001DFDD1 /* CNLiveUploadYunSDK.framework */,
 				81B9CBA31F54205E009594FB /* KS3YunSDK.framework */,
 				81B9CB871F542006009594FB /* CNLiveUploadYunSDKDemo */,
 				81B9CB861F542006009594FB /* Products */,
@@ -94,7 +94,7 @@
 				81B9CB8F1F542006009594FB /* ViewController.m */,
 				81B9CB9F1F54204F009594FB /* CNLiveUploadController.h */,
 				81B9CBA01F54204F009594FB /* CNLiveUploadController.m */,
-				81B9CBAD1F5421C6009594FB /* 7.6M.mov */,
+				D21D75D41FE0C9C600658839 /* cnlive.mp4 */,
 				81B9CB911F542006009594FB /* Main.storyboard */,
 				81B9CB941F542006009594FB /* Assets.xcassets */,
 				81B9CB961F542006009594FB /* LaunchScreen.storyboard */,
@@ -139,7 +139,7 @@
 		81B9CB7D1F542006009594FB /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0830;
+				LastUpgradeCheck = 0920;
 				ORGANIZATIONNAME = zhulin;
 				TargetAttributes = {
 					81B9CB841F542006009594FB = {
@@ -172,7 +172,7 @@
 			isa = PBXResourcesBuildPhase;
 			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 */,
@@ -225,7 +225,9 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
@@ -233,7 +235,11 @@
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -274,7 +280,9 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
@@ -282,7 +290,11 @@
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -319,7 +331,7 @@
 				INFOPLIST_FILE = CNLiveUploadYunSDKDemo/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = com.rd.XpkUISDKDemo;
+				PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.CNLiveUploadSDKDemo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Debug;
@@ -336,7 +348,7 @@
 				INFOPLIST_FILE = CNLiveUploadYunSDKDemo/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = com.rd.XpkUISDKDemo;
+				PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.CNLiveUploadSDKDemo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Release;
@@ -8,6 +8,7 @@
 #import <UIKit/UIKit.h>
+//在视讯云开放平台 open.cnlive.com 注册应用,配置bundleID以及权限得到AppId和AppKey
 #define AppId  @"60_jaxisljz90"
 #define AppKey @"1ee33b54e18a66b94eca7f8149408565b02f749d314926"
@@ -25,8 +25,10 @@
     self.window.rootViewController = nav;
     [self.window makeKeyAndVisible];
+    //设置地区
     [[CNLiveClient initialize] setBucketDomainWithRegion:CNLiveBucketBeijing];
-    [CNLiveUpload setAppId:AppId appKey:AppKey isTestEnvironment:YES];
+    //初始化云上传SDK
+    [CNLiveUpload setAppId:AppId appKey:AppKey isTestEnvironment:NO];
     return YES;
 }
@@ -9,6 +9,7 @@
 #import "CNLiveUploadController.h"
 #import <AssetsLibrary/AssetsLibrary.h>
 #import <CNLiveUploadYunSDK/CNLiveUploadYunSDK.h>
+#import <MobileCoreServices/MobileCoreServices.h>
 #define mScreenWidth          ([UIScreen mainScreen].bounds.size.width)
 #define mScreenHeight         ([UIScreen mainScreen].bounds.size.height)
@@ -19,21 +20,23 @@
 #define keyUploadPartNum @"partNum"    //需要app本地存储已经传成功的块号,demo为了演示，用NSUserDefaults存储，app可用数据库等
 #define keyUploadId @"uploadId"      //需要app本地存储已经初始化成功的uploadId，用于断点续传，demo为了演示，用NSUserDefaults存储,app可用数据库等
-@interface CNLiveUploadController ()<UITableViewDelegate,UITableViewDataSource,KingSoftServiceRequestDelegate>
+@interface CNLiveUploadController ()<UITableViewDelegate,UITableViewDataSource,KingSoftServiceRequestDelegate,UIImagePickerControllerDelegate,UINavigationControllerDelegate>
 {
-    NSString *_bucketName;//SP对应的bucketName
+    NSURL *_imageAssetUrl;//相册文件URL
+    CNLiveUploadType _uploadType;//选择文件方式type
     NSString *_bucketKey;//SP上传时用到的bucket里文件的路径(包含扩展名)
 }
-@property (nonatomic ,strong) UITableView *             tableView;
+@property (nonatomic ,strong) UITableView *             tableView;//列表
+@property (nonatomic ,strong) UIButton *                styleBtn;//上传方式按钮
-@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
@@ -43,76 +46,49 @@
     // Do any additional setup after loading the view.
     self.view.backgroundColor = [UIColor whiteColor];
     self.navigationItem.title = @"上传";
-    _arrItems = [NSArray arrayWithObjects:@"Multipart Upload", @"Abort Upload", @"Put Object", nil];
+    _arrItems = [NSArray arrayWithObjects:@"Multipart Upload", @"Abort Multipart Upload", @"Put Single Object", nil];
-    self.tableView = [[UITableView alloc] initWithFrame:self.view.bounds];
+    self.tableView = [[UITableView alloc] initWithFrame:CGRectMake(0, CGRectGetMinY(self.view.frame), mScreenWidth, mScreenHeight-100)];
     [self.tableView registerClass:[UITableViewCell class] forCellReuseIdentifier:@"CNLiveUpload"];
     [self.view addSubview:self.tableView];
     self.tableView.delegate = self;
     self.tableView.dataSource = self;
-    _bucketName = [CNLiveUpload getSPBucketName];
-    NSLog(@"bucketName:%@",_bucketName);
+    [self.view addSubview:self.styleBtn];
     [self getBucketKeyFromServer];
 }
-- (void)getBucketKeyFromServer
+/**
+ 从服务器获取BucketKey,BucketKey为文件路径
+ */
+- (NSString *)getBucketKeyFromServer
 {
-#warning 此处建议从server获取 上传文件对应的bucketKey(文件路径包含扩展名)
+#warning 此处建议从server获取,为每一个上传的文件分配唯一的bucketKey,上传文件对应的bucketKey(文件路径包含扩展名). 例:完整bucketKey为@"cnlive-test/cnlive.mp4",可由服务器返回@"cnlive-test/cnlive",扩展名@".mp4"由开发者拼接,组成完整的bucketKey
 #warning Demo为了演示 bucketKey用固定值
-    _bucketKey = @"cnlive12/test123-7.6M.mov";
+    _bucketKey = @"cnlive-uploadtest/cnlive.mp4";//本地工程文件
+    return _bucketKey;
 }
-#pragma mark 相册方法
-/*
- 这里，枚举模拟器相册所有的视频，模拟器只有一个只能获得开头传入的7.6M视频，
- 具体工程使用时根据具体逻辑，获取到Alasset即可
- KS3Client 方法：
- - (NSData *)getUploadPartDataWithPartNum:(NSInteger)partNum
- partLength:(NSInteger)partlength
- alassetURL:(NSURL *)alassetURL;
- 
- - (NSData *)getUploadPartDataWithPartNum:(NSInteger)partNum
- partLength:(NSInteger)partlength
- Alasset:(ALAsset *)assets;
- 
- - (ALAsset *)getAlassetFromAlassetURL:(NSURL *)alassetURL;
- 
- */
-- (ALAsset *)getAlasset
+- (NSString *)bucketKey
 {
-    ALAssetsLibrary *assetsLibrary = [[ALAssetsLibrary alloc]init];
-    __block ALAsset *assets ;
-    dispatch_semaphore_t sem= dispatch_semaphore_create(0);
-    dispatch_queue_t concurrentQueue = dispatch_queue_create("my.concurrent.queue", DISPATCH_QUEUE_SERIAL);
-    dispatch_async(concurrentQueue, ^{
-        [assetsLibrary enumerateGroupsWithTypes:ALAssetsGroupAll usingBlock:^(ALAssetsGroup *group, BOOL *stop) {
-            if (group) {
-                [group setAssetsFilter:[ALAssetsFilter allVideos]];
-                [group enumerateAssetsUsingBlock:^(ALAsset *result, NSUInteger index, BOOL *stop) {
-                    if (result) {
-                        assets = result;
-                        NSLog(@"url = %@",assets.defaultRepresentation.url);
-                        dispatch_semaphore_signal(sem);
-                        return ;
-                    }
-                }];
-                dispatch_semaphore_signal(sem);
-            }else
-            {
-                //                NSLog(@"group为空，枚举失败");
-            }
-            dispatch_semaphore_signal(sem);
-        } failureBlock:^(NSError *error) {
-            
-            NSLog(@"请到设置->隐私->照片中开启,访问照片库的权限");
-            dispatch_semaphore_signal(sem);
-        }];
-    });
-    
-    dispatch_semaphore_wait(sem, DISPATCH_TIME_FOREVER);
-    
-    return assets;
+    switch (_uploadType) {
+        case kCNLiveUploadNormal:
+        {//本地文件
+            _bucketKey = [self getBucketKeyFromServer];
+        }
+            break;
+        case kCNLiveUploadAlasset:
+        {//相册选取的文件,重新拼接扩展名
+            NSString *bucketKeyUnExt = [[self getBucketKeyFromServer] substringToIndex:_bucketKey.length - 4];
+            NSArray *arr = [_imageAssetUrl.absoluteString componentsSeparatedByString:@"ext="];
+            NSString *ext = arr[1];
+            _bucketKey = [NSString stringWithFormat:@"%@.%@",bucketKeyUnExt,ext];
+        }
+            break;
+        default:
+            break;
+    }
+    return  _bucketKey;
 }
 #pragma mark 上传方法
@@ -135,100 +111,107 @@
  */
 - (void)beginMultipartUpload
 {
-    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:^{
-        if (_muilt == nil) {
-            NSLog(@"####Init upload failed, please check access key, secret key and bucket name!####");
-            return ;
-        }
+        NSString *strKey = [self bucketKey];
+        _partSize = 5;    //  文件大于5M为最小5M一块
-        //选择相册还是普通方式
-        _muilt.uploadType = kCNLiveUploadNormal;
+        CNLiveAccessControlList *acl = [[CNLiveAccessControlList alloc] init];
+        [acl setContronAccess:CNLiveYun_Permission_Public_Read];
-        //根据文件路径不一样，有如下两种上传
-        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!####");
+        CNLiveInitiateMultipartUploadRequest *initMultipartUploadReq = [[CNLiveInitiateMultipartUploadRequest alloc] initWithKey:strKey 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];
+            
+            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 = _uploadType;
+            
+            //根据文件路径不一样，有如下两种上传
+            if (_muilt.uploadType == kCNLiveUploadNormal) { //如果是沙盒或者工程里的文件
+                //工程里，沙盒里，是沙盒路径
+                NSString *strFilePath = [[NSBundle mainBundle] pathForResource:@"cnlive" ofType:@"mp4"];
+                _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
+            {
+                //如果是相册里的，从这传
+                ALAsset *assets = [[CNLiveClient initialize] getAlassetFromAlassetURL:_imageAssetUrl];
+                ALAssetRepresentation *assetD = assets.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);
     }];
 }
@@ -243,7 +226,8 @@
         NSData *data = nil;
         if (_muilt.uploadType == kCNLiveUploadAlasset) {
             //相册信息
-            data = [[CNLiveClient initialize] getUploadPartDataWithPartNum:partNumber partLength:FileBlockSize Alasset:[self getAlasset]];
+            ALAsset *assets = [[CNLiveClient initialize] getAlassetFromAlassetURL:_imageAssetUrl];
+            data = [[CNLiveClient initialize] getUploadPartDataWithPartNum:partNumber partLength:FileBlockSize Alasset:assets];
         }else
         {
             //沙盒路径
@@ -313,45 +297,52 @@
 //最小支持但块上传小于5M，最大支持单块上传为5G
 - (void)beginSingleUpload:(NSInteger) row
 {
-    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:@"cnlive" ofType:@"mp4"];
+        putObjRequest.data = [NSData dataWithContentsOfFile:fileName options:NSDataReadingMappedIfSafe error:nil];
+        _fileSize = putObjRequest.data.length;
+        
+        putObjRequest.delegate = self;
+        putObjRequest.filename = [self 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);
     }];
+    
 }
-#pragma mark - Action
+#pragma mark -
+#pragma mark - ButtonAction
 - (void)uploadBtnClicked:(UIButton *)btn
 {
     btn.selected =! btn.selected;
@@ -364,6 +355,7 @@
             UIProgressView *progressView = (UIProgressView *)[self.view viewWithTag:199];
             progressView.progress = 0;
             [btn setTitle:@"开始" forState:UIControlStateNormal];
+            _uploadType = kCNLiveUploadNormal;
             return;
         }
         [_muilt pause];
@@ -371,6 +363,72 @@
     }
 }
+- (void)styleBtnAction
+{
+    [self uploadStyle];
+}
+
+- (void)uploadStyle
+{
+    UIAlertController *alert = [UIAlertController alertControllerWithTitle:@"上传方式" message:@"默认上传方式为本地文件" preferredStyle:UIAlertControllerStyleActionSheet];
+    UIAlertAction *localAlert = [UIAlertAction actionWithTitle:@"本地文件" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
+        _uploadType = kCNLiveUploadNormal;
+    }];
+    [alert addAction:localAlert];
+    UIAlertAction *albumAlert = [UIAlertAction actionWithTitle:@"相册文件" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
+        
+        UIImagePickerController *imagePicker = [[UIImagePickerController alloc] init];
+        imagePicker.delegate = self;
+        imagePicker.allowsEditing = YES;
+        imagePicker.sourceType = UIImagePickerControllerSourceTypeSavedPhotosAlbum;//相机相册
+        // 设置所支持的媒体功能，即只能拍照，或则只能录像，或者两者都可以
+#warning 此处需要区分视频还是图片文件,获取上传资源路径([CNLiveUpload getUploadResourceUrlWithBucketKey:uploadType:success:failure:])时需要用到此CNLiveYun_UploadType,Demo演示相册中 视频文件的上传
+        //        NSString *requiredMediaType = ( NSString *)kUTTypeImage;
+        NSString *requiredMediaType1 = ( NSString *)kUTTypeMovie;
+        NSArray *arrMediaTypes=[NSArray arrayWithObjects: requiredMediaType1,nil];//requiredMediaType
+        imagePicker.mediaTypes = arrMediaTypes;
+        [self presentViewController:imagePicker animated:YES completion:NULL];
+        
+        _uploadType = kCNLiveUploadAlasset;
+    }];
+    [alert addAction:albumAlert];
+    UIAlertAction *cancelAlert = [UIAlertAction actionWithTitle:@"取消" style:UIAlertActionStyleCancel handler:^(UIAlertAction * _Nonnull action) {
+        [self dismissViewControllerAnimated:YES completion:NULL];
+    }];
+    [alert addAction:cancelAlert];
+    [self presentViewController:alert animated:YES completion:NULL];
+}
+
+//#pragma mark 相册方法
+///*
+// 这里，枚举模拟器相册所有的视频，模拟器只有一个只能获得开头传入的cnlive.mp4视频，
+// 具体工程使用时根据具体逻辑，获取到Alasset即可
+//CNLiveClient 方法：
+// - (NSData *)getUploadPartDataWithPartNum:(NSInteger)partNum
+// partLength:(NSInteger)partlength
+// alassetURL:(NSURL *)alassetURL;
+//
+// - (NSData *)getUploadPartDataWithPartNum:(NSInteger)partNum
+// partLength:(NSInteger)partlength
+// Alasset:(ALAsset *)assets;
+//
+// - (ALAsset *)getAlassetFromAlassetURL:(NSURL *)alassetURL;
+//
+// */
+#pragma mark - UIImagePickerControllerDelegate
+- (void)imagePickerController:(UIImagePickerController *)picker didFinishPickingMediaWithInfo:(NSDictionary<NSString *,id> *)info
+{
+    NSURL *imageAssetUrl = [info objectForKey:UIImagePickerControllerReferenceURL];
+    _imageAssetUrl = imageAssetUrl;
+    [self dismissViewControllerAnimated:YES completion:NULL];
+}
+
+- (void)imagePickerControllerDidCancel:(UIImagePickerController *)picker
+{
+    [self dismissViewControllerAnimated:YES completion:NULL];
+    NSLog(@"cancel");
+}
+
 #pragma mark - UITableView datasource
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
 {
@@ -437,10 +495,11 @@
     if ([request isKindOfClass:[KS3PutObjectRequest class]]) {
         if (response.httpStatusCode == 200) {
             NSLog(@"单块上传成功");
-            [CNLiveUpload getUploadResourceUrlWithBucketKey:_bucketKey uploadType:CNLiveYun_UploadType_VideoFile success:^(NSString *resUrl) {
-                NSLog(@"succ:%@",resUrl);
+#warning 根据选择的文件类型更改CNLiveYun_UploadType,Demo演示视频路径的获取
+            [CNLiveUpload getUploadResourceUrlWithBucketKey:[self bucketKey] uploadType:CNLiveYun_UploadType_VideoFile success:^(NSString *resUrl) {
+                NSLog(@"资源路径: %@",resUrl);
             } failure:^(NSDictionary *error) {
-                NSLog(@"error%@",error);
+                NSLog(@"error: %@",error);
             }];
         }else
         {
@@ -490,8 +549,9 @@
                         [mUserDefaults setInteger:0 forKey:keyUploadPartNum];
                         _uploadNum = 0 ;
                         [mUserDefaults synchronize];
-                        [CNLiveUpload getUploadResourceUrlWithBucketKey:_bucketKey uploadType:CNLiveYun_UploadType_VideoFile success:^(NSString *resUrl) {
-                            NSLog(@"succ: %@",resUrl);
+#warning 根据选择的文件类型更改CNLiveYun_UploadType,Demo演示视频路径的获取
+                        [CNLiveUpload getUploadResourceUrlWithBucketKey:[self bucketKey] uploadType:CNLiveYun_UploadType_VideoFile success:^(NSString *resUrl) {
+                            NSLog(@"资源路径: %@",resUrl);
                         } failure:^(NSDictionary *error) {
                             NSLog(@"error: %@",error);
                         }];
@@ -567,11 +627,23 @@
     }
 }
+#pragma mark - Lazy
+- (UIButton *)styleBtn
+{
+    if (!_styleBtn)
+    {
+        _styleBtn = [[UIButton alloc] initWithFrame:CGRectMake(mScreenWidth *0.5-70, CGRectGetMaxY(self.tableView.frame) + 20, 140, 30)];
+        [_styleBtn setTitle:@"选择上传方式" forState:UIControlStateNormal];
+        [_styleBtn addTarget:self action:@selector(styleBtnAction) forControlEvents:UIControlEventTouchUpInside];
+        _styleBtn.backgroundColor = [UIColor redColor];
+    }
+    return _styleBtn;
+}
+
 - (void)didReceiveMemoryWarning {
     [super didReceiveMemoryWarning];
     // Dispose of any resources that can be recreated.
 }
-
 /*
  #pragma mark - Navigation
@@ -55,7 +55,6 @@
  */
 - (CNLivePutObjectResponse *)putObject:(CNLivePutObjectRequest *)putObjectRequest;
 ```
-**putObjectRequest.contentType**不设置默认为下载类型,[设置请参考contentType示例](http://tool.oschina.net/commons)
 * 分块上传
@@ -72,7 +71,6 @@
 ```
 调用这个接口会初始化一个分块上传，response会返回一个CNLiveMultipartUpload 对象,其属性有upload id, upload id 用来标识属于当前上传的具体的块，并且用来标识完成分块上传或者取消分块上传。
-**uploadPartRequest.contentType**不设置默认为下载类型,[设置请参考contentType示例](http://tool.oschina.net/commons)
 * 取消分块上传