提交0.0.14

梁星国
1 parent efd54936
Showing 2 changed files with 73 additions and 47 deletions
CNLiveUploadManager.podspec
CNLiveUploadManager/Classes/CNLiveUploadManager.m
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLiveUploadManager'
-  s.version          = '0.1.13'
+  s.version          = '0.1.14'
   s.summary          = '压缩上传,组件化中加入新参数加入outPath,不在直接取'
 # This description is used to generate tags and improve search results.
@@ -2202,33 +2202,45 @@ static CNLiveUploadManager *_uploadManager;
     shortVideoTranscoder.rotateOrientation = PLSPreviewOrientationPortrait; //视频显示
     shortVideoTranscoder.videoSelectedRect = CGRectZero; //视频剪裁区域
     shortVideoTranscoder.videoFrameRate = 0; //帧率
-    //成功
-    [shortVideoTranscoder setCompletionBlock:^(NSURL *url){
-        NSLog(@"输出转码后视频路径%@",url.path);
-        NSLog(@"输出转码后数据大小%ld",[NSData dataWithContentsOfURL:url].length / (1024*1024));
-        dispatch_async(dispatch_get_main_queue(), ^{
-            !success ? : success(url);
-        });
-        
-    }];
-    //失败
-    [shortVideoTranscoder setFailureBlock:^(NSError *error){
-        NSLog(@"输出错误%@",error);
-        dispatch_async(dispatch_get_main_queue(), ^{
-            !failure ? : failure();
-        });
-        
+    [PLShortVideoRecorder checkAuthentication:^(PLSAuthenticationResult result) {
+           
+           if (PLSAuthenticationResultAuthorized == result) {//授权
+               //成功
+                 [shortVideoTranscoder setCompletionBlock:^(NSURL *url){
+                     NSLog(@"输出转码后视频路径%@",url.path);
+                     NSLog(@"输出转码后数据大小%ld",[NSData dataWithContentsOfURL:url].length / (1024*1024));
+                     dispatch_async(dispatch_get_main_queue(), ^{
+                         !success ? : success(url);
+                     });
+                     
+                 }];
+                 
+                 //失败
+                 [shortVideoTranscoder setFailureBlock:^(NSError *error){
+                     NSLog(@"输出错误%@",error);
+                     dispatch_async(dispatch_get_main_queue(), ^{
+                         !failure ? : failure();
+                     });
+                     
+                 }];
+                 
+                 [shortVideoTranscoder setProcessingBlock:^(float progress){
+                     // 更新压缩进度的 UI
+                     
+                     NSLog(@"transCoding progress: %f", progress);
+                     !progressCount ? : progressCount(progress);
+                 }];
+                 
+                 [shortVideoTranscoder startTranscoding];
+           }else {
+               dispatch_async(dispatch_get_main_queue(), ^{
+                   !failure ? : failure();
+               });
+           }
     }];
-    [shortVideoTranscoder setProcessingBlock:^(float progress){
-        // 更新压缩进度的 UI
-        
-        NSLog(@"transCoding progress: %f", progress);
-        !progressCount ? : progressCount(progress);
-    }];
-    
-    [shortVideoTranscoder startTranscoding];
+  
 }
@@ -2278,33 +2290,47 @@ static CNLiveUploadManager *_uploadManager;
     shortVideoTranscoder.videoSelectedRect = CGRectZero; //视频剪裁区域
     shortVideoTranscoder.videoFrameRate = 0; //帧率
-    dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
-    //成功
-    [shortVideoTranscoder setCompletionBlock:^(NSURL *url){
-        NSLog(@"输出转码后视频路径%@",url.path);
-        NSLog(@"输出转码后数据大小%ld",[NSData dataWithContentsOfURL:url].length / (1024*1024));
-        !success ? : success(url);
-        dispatch_semaphore_signal(semaphore);
-        
-    }];
-    //失败
-    [shortVideoTranscoder setFailureBlock:^(NSError *error){
-        NSLog(@"输出错误%@",error);
-        !failure ? : failure();
-        dispatch_semaphore_signal(semaphore);
-        
-    }];
-    [shortVideoTranscoder setProcessingBlock:^(float progress){
-        // 更新压缩进度的 UI
+    [PLShortVideoRecorder checkAuthentication:^(PLSAuthenticationResult result) {
+        
+        if (PLSAuthenticationResultAuthorized == result) {//授权
+
+            dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
+            //成功
+            [shortVideoTranscoder setCompletionBlock:^(NSURL *url){
+                NSLog(@"输出转码后视频路径%@",url.path);
+                NSLog(@"输出转码后数据大小%ld",[NSData dataWithContentsOfURL:url].length / (1024*1024));
+                !success ? : success(url);
+                dispatch_semaphore_signal(semaphore);
+                
+            }];
+            
+            //失败
+            [shortVideoTranscoder setFailureBlock:^(NSError *error){
+                NSLog(@"输出错误%@",error);
+                !failure ? : failure();
+                dispatch_semaphore_signal(semaphore);
+                
+            }];
+            
+            [shortVideoTranscoder setProcessingBlock:^(float progress){
+                // 更新压缩进度的 UI
+                
+                NSLog(@"transCoding progress: %f", progress);
+                !progressCount ? : progressCount(progress);
+            }];
+            
+            [shortVideoTranscoder startTranscoding];
+            dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER);
+        }else{//未授权
+            
+            !failure ? : failure();
+        }
+        
-        NSLog(@"transCoding progress: %f", progress);
-        !progressCount ? : progressCount(progress);
     }];
-    [shortVideoTranscoder startTranscoding];
-    dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER);
 }