提交0.1.19_添加上传失败使用系统导出

梁星国
1 parent e621f237
Showing 2 changed files with 70 additions and 8 deletions
CNLiveUploadManager.podspec
CNLiveUploadManager/Classes/CNLiveUploadManager.m
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLiveUploadManager'
-  s.version          = '0.1.18'
+  s.version          = '0.1.19'
   s.summary          = '压缩上传,组件化中加入新参数加入outPath,不在直接取'
 # This description is used to generate tags and improve search results.
@@ -1061,13 +1061,34 @@ static CNLiveUploadManager *_uploadManager;
         //不限制大小
         [strongSelf qnUploadVideoWithToken:token file:url.path progress:progress success:success failure:failure];
     } failure:^{
-        
-        dispatch_async(dispatch_get_main_queue(), ^{
-            NSError *returnError = [NSError errorWithDomain:@"压缩失败" code:105 userInfo:@{NSLocalizedDescriptionKey:@"压缩失败,请重新获取"}];
-            !failure ? : failure(nil,returnError);
-            return;
+
+#pragma mark - 更改七牛转码失败使用系统导出
+        __strong typeof(weakSelf) strongSelf = weakSelf;
+        [strongSelf zipSystemVideoWithAsset:asset outputPath:outputPath limitType:limitType progressCount:^(float progress) {
-        });
+            NSLog(@"transCoding progress: %f", progress);
+            BOOL isSucess = progress >= 1.0 ? YES : NO;
+            !transcode ? : transcode(progress,isSucess);
+            
+        } success:^(NSURL *url) {
+            
+            __strong typeof(weakSelf) strongSelf = weakSelf;
+            AVAsset *avAsset = [AVAsset assetWithURL:url];
+            NSLog(@"转码后时长%f",[[NSNumber numberWithFloat:CMTimeGetSeconds(avAsset.duration)] floatValue]);
+            NSLog(@"转码后数据大小%ldmb",[NSData dataWithContentsOfURL:url].length / (1024*1024));
+            //不限制大小
+            [strongSelf qnUploadVideoWithToken:token file:url.path progress:progress success:success failure:failure];
+            
+        } failure:^{
+            
+            dispatch_async(dispatch_get_main_queue(), ^{
+                NSError *returnError = [NSError errorWithDomain:@"压缩失败" code:105 userInfo:@{NSLocalizedDescriptionKey:@"压缩失败,请重新获取"}];
+                !failure ? : failure(nil,returnError);
+                return;
+                
+            });
+            
+        }];
     }];
@@ -1384,6 +1405,47 @@ static CNLiveUploadManager *_uploadManager;
 }
+
+
+#pragma mark - 系统视频压缩
+- (void )zipSystemVideoWithAsset:(id) asset outputPath:(NSString *)outputPath limitType:(AppPhototLimitType)limitType progressCount:(void(^)(float progress)) progressCount success:(void(^)(NSURL * url))success  failure:(void(^)(void))failure {
+    
+    PHVideoRequestOptions* options = [[PHVideoRequestOptions alloc] init];
+    options.version = PHVideoRequestOptionsVersionOriginal;
+    options.deliveryMode = PHVideoRequestOptionsDeliveryModeAutomatic;
+    options.networkAccessAllowed = YES;
+    options.progressHandler = ^(double progress, NSError * _Nullable error, BOOL * _Nonnull stop, NSDictionary * _Nullable info) {
+        NSLog(@"输出进度 = %f",progress);
+        NSLog(@"transCoding progress: %f", progress);
+        !progressCount ? : progressCount(progress);
+        
+    };
+    __weak typeof(self) weakSelf = self;
+    [[PHImageManager defaultManager] requestAVAssetForVideo:asset options:options resultHandler:^(AVAsset* avasset, AVAudioMix* audioMix, NSDictionary* info){
+        __strong typeof(weakSelf) strongSelf = weakSelf;
+        if (!strongSelf) {
+            
+            !failure ? : failure();
+            return;
+        }
+        
+        NSLog(@"Info:\n%@",info);
+        AVURLAsset *videoAsset = (AVURLAsset*)avasset;
+        //             NSLog(@"AVAsset URL: %@",myAsset.URL);
+        [strongSelf startExportVideoWithVideoAsset:videoAsset presetName:AVAssetExportPresetMediumQuality outputPath:outputPath success:^(NSString *outputPath) {
+            /// 不限制大小
+            NSURL *url = [NSURL URLWithString:outputPath];
+            !success ? : success(url);
+            
+        } failure:^(NSString *errorMessage, NSError *error) {
+            !failure ? : failure();
+            return;
+        }];
+    }];
+}
+
+
+
 /// (多张Asset - AssetArray - 压缩或原图 - 限制 - 筛选) 实现
 - (void)afUploadLimitWithDic:(NSDictionary *)dic url:(NSString *)url type:(CNLiveUploadType)type assetArray:(NSMutableArray *)assetArray isOriginal:(BOOL) isOriginal limitType:(AppPhototLimitType)limitType progress:(progressHandlerBlock)progress success:(successBlock)success failure:(failureBlock)failure {
@@ -2139,7 +2201,7 @@ static CNLiveUploadManager *_uploadManager;
                     case AVAssetExportSessionStatusCompleted: {
                         NSLog(@"AVAssetExportSessionStatusCompleted");
                         if (success) {
-                            success(outputPath);
+                            success(editOutputPath);
                         }
                     }  break;
                     case AVAssetExportSessionStatusFailed: {