|
@@ -335,21 +335,21 @@ class PQStuckPointEditerController: PQBaseViewController {
|
|
|
|
|
|
// 固定速度 UI
|
|
|
lazy var speedSettingView: PQSpeedSettingView = {
|
|
|
- let speedSettingView = PQSpeedSettingView()
|
|
|
- speedSettingView.backgroundColor = .clear
|
|
|
- speedSettingView.selectSpeedCallBack = { [weak self] maxSpeed, minSpeed, selectIndex, isSettingPlayer in
|
|
|
+ let speedSetView = PQSpeedSettingView()
|
|
|
+ speedSetView.backgroundColor = .clear
|
|
|
+ speedSetView.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
|
|
|
- self?.customSpeedSettingView.viewType = speedSettingView.viewType
|
|
|
+ self?.customSpeedSettingView.viewType = self?.speedSettingView.viewType ?? 2
|
|
|
} else {
|
|
|
if maxSpeed != 0.0 {
|
|
|
// 更新最后一次选择的位置恢复时使用
|
|
|
- if speedSettingView.viewType == 1 {
|
|
|
+ if self?.speedSettingView.viewType == 1 {
|
|
|
self?.lastSpeedSelectIndex = selectIndex
|
|
|
- } else if speedSettingView.viewType == 2 {
|
|
|
+ } else if self?.speedSettingView.viewType == 2 {
|
|
|
self?.lastJumpSpeedSelectIndex = selectIndex
|
|
|
} else {
|
|
|
self?.lastCyclesSelectIndex = selectIndex
|
|
@@ -364,7 +364,7 @@ class PQStuckPointEditerController: PQBaseViewController {
|
|
|
self?.settingPlayerView()
|
|
|
}
|
|
|
}
|
|
|
- return speedSettingView
|
|
|
+ return speedSetView
|
|
|
|
|
|
}()
|
|
|
|
|
@@ -379,9 +379,9 @@ class PQStuckPointEditerController: PQBaseViewController {
|
|
|
|
|
|
// 自定义速度
|
|
|
lazy var customSpeedSettingView: PQCustomSpeedSettingView = {
|
|
|
- let customSpeedSettingView = PQCustomSpeedSettingView(frame: CGRect(x: 0, y: cScreenHeigth - 354, width: cScreenWidth, height: 354))
|
|
|
- customSpeedSettingView.isHidden = true
|
|
|
- customSpeedSettingView.selectSpeedCallBack = { [weak self] maxSpeed, minSpeed, isJumpSpeedModel, isCancle in
|
|
|
+ let customSpeedSetView = PQCustomSpeedSettingView(frame: CGRect(x: 0, y: cScreenHeigth - 354, width: cScreenWidth, height: 354))
|
|
|
+ customSpeedSetView.isHidden = true
|
|
|
+ customSpeedSetView.selectSpeedCallBack = { [weak self, weak customSpeedSetView] maxSpeed, minSpeed, isJumpSpeedModel, isCancle in
|
|
|
if !isCancle {
|
|
|
self?.maxSpeed = maxSpeed
|
|
|
self?.minSpeed = minSpeed
|
|
@@ -410,10 +410,10 @@ class PQStuckPointEditerController: PQBaseViewController {
|
|
|
self?.speedSettingView.setSelectItem(index: self?.lastCyclesSelectIndex ?? 0, isSettingPlayer: false)
|
|
|
}
|
|
|
|
|
|
- customSpeedSettingView.isHidden = true
|
|
|
+ customSpeedSetView?.isHidden = true
|
|
|
}
|
|
|
}
|
|
|
- return customSpeedSettingView
|
|
|
+ return customSpeedSetView
|
|
|
|
|
|
}()
|
|
|
|