|
@@ -300,7 +300,7 @@ class PQStuckPointEditerController: PQBaseViewController {
|
|
|
//
|
|
|
lazy var speedStuckBtnGif: UIImageView = {
|
|
|
let speedStuckBtnGif = UIImageView()
|
|
|
- speedStuckBtnGif.kf.setImage(with: URL(fileURLWithPath: Bundle().BF_mainbundle().path(forResource: "speedstuck_h", ofType: ".gif")!))
|
|
|
+ speedStuckBtnGif.kf.setImage(with: URL(fileURLWithPath: Bundle().BF_mainbundle().path(forResource: "speedstuck_h", ofType: "gif")!))
|
|
|
speedStuckBtnGif.isHidden = true
|
|
|
return speedStuckBtnGif
|
|
|
|
|
@@ -319,7 +319,7 @@ class PQStuckPointEditerController: PQBaseViewController {
|
|
|
|
|
|
lazy var jumpPointBtnGif: UIImageView = {
|
|
|
let jumpPointBtnGif = UIImageView()
|
|
|
- jumpPointBtnGif.kf.setImage(with: URL(fileURLWithPath: Bundle().BF_mainbundle().path(forResource: "jumpPoint_n", ofType: ".gif")!))
|
|
|
+ jumpPointBtnGif.kf.setImage(with: URL(fileURLWithPath: Bundle().BF_mainbundle().path(forResource: "jumpPoint_n", ofType: "gif")!))
|
|
|
jumpPointBtnGif.isHidden = true
|
|
|
return jumpPointBtnGif
|
|
|
|
|
@@ -646,8 +646,8 @@ class PQStuckPointEditerController: PQBaseViewController {
|
|
|
PQEventTrackViewModel.baseReportUpload(businessType: .bt_buttonClick, objectType: .ot_shanyinApp_musicVideoPreview_selectPatternBgm, pageSource: .sp_shanyinApp_main, extParams: nil, remindmsg: "")
|
|
|
}
|
|
|
}
|
|
|
- speedStuckBtnGif.kf.setImage(with: URL(fileURLWithPath: Bundle().BF_mainbundle().path(forResource: speedStuckBtnGifName, ofType: ".gif")!))
|
|
|
- jumpPointBtnGif.kf.setImage(with: URL(fileURLWithPath: Bundle().BF_mainbundle().path(forResource: jumpPointBtnGifName, ofType: ".gif")!))
|
|
|
+ speedStuckBtnGif.kf.setImage(with: URL(fileURLWithPath: Bundle().BF_mainbundle().path(forResource: speedStuckBtnGifName, ofType: "gif")!))
|
|
|
+ jumpPointBtnGif.kf.setImage(with: URL(fileURLWithPath: Bundle().BF_mainbundle().path(forResource: jumpPointBtnGifName, ofType: "gif")!))
|
|
|
|
|
|
speedStuckBtnGif.isHidden = false
|
|
|
jumpPointBtnGif.isHidden = false
|
|
@@ -673,6 +673,8 @@ class PQStuckPointEditerController: PQBaseViewController {
|
|
|
|
|
|
musicEditBGView.pausePlayer()
|
|
|
PQNotification.removeObserver(self)
|
|
|
+
|
|
|
+ self.synchroMarskView.removeMarskView()
|
|
|
}
|
|
|
|
|
|
override func viewDidLoad() {
|
|
@@ -1836,12 +1838,12 @@ extension PQStuckPointEditerController {
|
|
|
// 1 生成默认参数值
|
|
|
/*
|
|
|
- 当素材总时长∈[0-6)s 时,提示推荐仅配乐模式 or 快慢速模式
|
|
|
- - 当素材总时长∈[6-80)s 时,卡点抛留倍数为1x,即留1抛1
|
|
|
- - 当素材总时长∈[80,120)s 时,卡点抛留倍数为2x,即留1抛2
|
|
|
- - 当素材总时长∈[120,160)s 时,卡点抛留倍数为3x,即留1抛3
|
|
|
- - 当素材总时长∈[160,200)s 时,卡点抛留倍数为4x,即留1抛4
|
|
|
- - 当素材总时长∈[200,240)s 时,卡点抛留倍数为5x,即留1抛5
|
|
|
- - 当素材总时长∈[240,∞)s 时,卡点抛留倍数为5x,即留1抛5
|
|
|
+ - 当素材总时长∈[6-80)s 时,卡点抛留倍数为1x
|
|
|
+ - 当素材总时长∈[80,120)s 时,卡点抛留倍数为2x
|
|
|
+ - 当素材总时长∈[120,160)s 时,卡点抛留倍数为3x
|
|
|
+ - 当素材总时长∈[160,200)s 时,卡点抛留倍数为4x
|
|
|
+ - 当素材总时长∈[200,240)s 时,卡点抛留倍数为5x
|
|
|
+ - 当素材总时长∈[240,∞)s 时,卡点抛留倍数为5x
|
|
|
*/
|
|
|
// 1.1) 生成跳跃卡点的默认值
|
|
|
if selectedTotalDuration >= 6 && selectedTotalDuration < 80 {
|