Browse Source

拍摄Vc接入

Chris 5 years ago
parent
commit
24897a0e55

+ 4 - 0
RainbowPlanet/RainbowPlanet/Macro/RainbowPlanet-Bridging-Header.h

@@ -68,4 +68,8 @@
 #import "QUProgressView.h"
 
 
+#import "AliyunMagicCameraViewController.h"
+
+
+
 #endif /* RainbowPlanet_Bridging_Header_h */

+ 3 - 1
RainbowPlanet/RainbowPlanet/Modules/PublishModule/AliyunVideo/AlivcShortVideo/ShortVideoFile/VideoRecord/Controller/AliyunMagicCameraViewController.h

@@ -9,7 +9,9 @@
 #import <UIKit/UIKit.h>
 #import "AlivcShortVideoRoute.h"
 
-@interface AliyunMagicCameraViewController : UIViewController
+@protocol JXSegmentedListContainerViewListDelegate;
+
+@interface AliyunMagicCameraViewController : UIViewController <JXSegmentedListContainerViewListDelegate>
 
 /**
  视频参数配置

+ 18 - 1
RainbowPlanet/RainbowPlanet/Modules/PublishModule/AliyunVideo/AlivcShortVideo/ShortVideoFile/VideoRecord/Controller/AliyunMagicCameraViewController.m

@@ -38,7 +38,10 @@
 #import "UIView+AlivcHelper.h"
 #import "AlivcMacro.h"
 
-@interface AliyunMagicCameraViewController () <AliyunMusicPickViewControllerDelegate,UIGestureRecognizerDelegate,UIAlertViewDelegate,AliyunIRecorderDelegate,AliyunEffectFilter2ViewDelegate>
+#import "RainbowPlanet-Swift.h"
+
+
+@interface AliyunMagicCameraViewController () <AliyunMusicPickViewControllerDelegate, UIGestureRecognizerDelegate, UIAlertViewDelegate, AliyunIRecorderDelegate, AliyunEffectFilter2ViewDelegate>
 
 /**
  SDK录制类
@@ -1038,4 +1041,18 @@
     return _filterView;
 }
 
+#pragma mark - JXSegmentedDelegate
+
+- (UIView *)listView {
+    return self.view;
+}
+
+- (void)listDidAppear {
+//    recorder.startPreview()
+}
+
+- (void)listDidDisappear {
+//    recorder.stopPreview()
+}
+
 @end

+ 33 - 15
RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishViewController.swift

@@ -11,6 +11,20 @@ import JXSegmentedView
 
 class PublishViewController: BaseViewController {
     
+    // 视频选择页参数配置类
+    var mediaConfig: AliyunMediaConfig {
+        //默认配置
+        let mediaConfig = AliyunMediaConfig.default()
+        mediaConfig?.minDuration = 2.0
+        mediaConfig?.maxDuration = 10.0 * 60
+        mediaConfig?.fps = 25
+        mediaConfig?.gop = 5
+        mediaConfig?.cutMode = AliyunMediaCutMode.scaleAspectFill
+        mediaConfig?.videoOnly = false
+        mediaConfig?.backgroundColor = UIColor.black
+        return mediaConfig!
+    }
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         setupViews()
@@ -169,21 +183,25 @@ extension PublishViewController :JXSegmentedListContainerViewDataSource {
             }
             return mediaVc
         case 1:
-            let videoVc = PublishVideoRecorderController()
-            videoVc.dismissClosure = {
-                [weak self] in
-                self?.dismiss(animated: true, completion: nil)
-            }
-            videoVc.editClosure = {
-                [weak self] in
-                let editVc = PublishEditController()
-                self?.navigationController?.pushViewController(editVc, animated: true)
-            }
-            videoVc.hideSegmentClosure = {
-                [weak self] (isHidden) in
-                self?.segmentedView.isHidden = isHidden
-            }
-            return videoVc        
+            let videoVc = AliyunMagicCameraViewController()
+            videoVc.quVideo = mediaConfig
+            return videoVc
+            
+//            let videoVc = PublishVideoRecorderController()
+//            videoVc.dismissClosure = {
+//                [weak self] in
+//                self?.dismiss(animated: true, completion: nil)
+//            }
+//            videoVc.editClosure = {
+//                [weak self] in
+//                let editVc = PublishEditController()
+//                self?.navigationController?.pushViewController(editVc, animated: true)
+//            }
+//            videoVc.hideSegmentClosure = {
+//                [weak self] (isHidden) in
+//                self?.segmentedView.isHidden = isHidden
+//            }
+//            return videoVc
         default:
             let photoVc = PublishTakePhotoController()
             photoVc.dismissClosure = {