|
@@ -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 = {
|