|
@@ -110,6 +110,7 @@ class PQStuckPointEditerController: PQBaseViewController {
|
|
|
sustomSwitchView.switchChangeHandle = { [weak self] sender in
|
|
|
// 改变速率,.只有快慢速且非只有图片素材时自动+1处理
|
|
|
self?.stuckPointMusicData?.speed = sender.tag
|
|
|
+ self?.musicEditBGView.pausePlayer()
|
|
|
|
|
|
self?.projectModel.sData?.getBGMSession()?.sectionTimeline?.audioTrack?.audioTrackMaterials.first?.bgmInfo?.rhythmMusicSpeed = sender.tag
|
|
|
// 播放前先暂停
|
|
@@ -145,6 +146,8 @@ class PQStuckPointEditerController: PQBaseViewController {
|
|
|
stuckPointCuttingView.videoDidEndDragging = { [weak self] type, startTime, endTime, progress in
|
|
|
BFLog(message: "拖拽结束返回--type = \(type),startTime = \(startTime),endTime = \(endTime),progress = \(progress)")
|
|
|
self?.playerView.pause()
|
|
|
+ self?.musicEditBGView.pausePlayer()
|
|
|
+
|
|
|
// 修改最新值
|
|
|
self?.stuckPointMusicData?.startTime = Float64(startTime)
|
|
|
self?.stuckPointMusicData?.endTime = Float64(endTime)
|
|
@@ -336,6 +339,7 @@ class PQStuckPointEditerController: PQBaseViewController {
|
|
|
speedSettingView.backgroundColor = .clear
|
|
|
speedSettingView.selectSpeedCallBack = { [weak self] maxSpeed, minSpeed, selectIndex, isSettingPlayer in
|
|
|
BFLog(message: "固定maxSpeed is\(maxSpeed) minSpeed \(minSpeed)")
|
|
|
+ self?.musicEditBGView.pausePlayer()
|
|
|
|
|
|
if maxSpeed == -1.0 && minSpeed == -1.0 {
|
|
|
self?.customSpeedSettingView.isHidden = false
|
|
@@ -373,6 +377,7 @@ class PQStuckPointEditerController: PQBaseViewController {
|
|
|
self?.maxSpeed = maxSpeed
|
|
|
self?.minSpeed = minSpeed
|
|
|
BFLog(message: "自定义速度maxSpeed is\(maxSpeed) minSpeed \(minSpeed) \(isJumpSpeedModel)")
|
|
|
+ self?.musicEditBGView.pausePlayer()
|
|
|
|
|
|
// 自定定义的更新一下最后的选择位置
|
|
|
if self?.speedSettingView.viewType == 1 {
|
|
@@ -548,6 +553,8 @@ class PQStuckPointEditerController: PQBaseViewController {
|
|
|
// return “”
|
|
|
// }
|
|
|
|
|
|
+ self.musicEditBGView.pausePlayer()
|
|
|
+
|
|
|
if sender == jumpPointBtn && selectedTotalDuration < 6 && selectedDataCount != selectedImageDataCount {
|
|
|
cShowHUB(superView: view, msg: "素材时长需要大于6秒才\n可选择“跳跃卡点”模式")
|
|
|
return
|