Bladeren bron

1,固定速度设置的值回调修改 2, 自定义速度取消后重新选择上次设置的速度

jsonwang 3 jaren geleden
bovenliggende
commit
d0c8a411c9
1 gewijzigde bestanden met toevoegingen van 32 en 14 verwijderingen
  1. 32 14
      BFFramework/Classes/Stuckpoint/Controller/PQStuckPointEditerController.swift

+ 32 - 14
BFFramework/Classes/Stuckpoint/Controller/PQStuckPointEditerController.swift

@@ -318,19 +318,21 @@ class PQStuckPointEditerController: PQBaseViewController {
         speedSettingView.backgroundColor = .clear
         speedSettingView.selectSpeedCallBack = { [weak self] maxSpeed, minSpeed, selectIndex, isSettingPlayer,isCancle in
             BFLog(message: "固定maxSpeed is\(maxSpeed) minSpeed \(minSpeed)")
-            // 更新最后一次选择的位置恢复时使用
-            if speedSettingView.viewType == 1 {
-                self?.lastSpeedSelectIndex = selectIndex
-            } else if speedSettingView.viewType == 2 {
-                self?.lastJumpSpeedSelectIndex = selectIndex
-            } else {
-                self?.lastCyclesSelectIndex = selectIndex
-            }
-            self?.maxSpeed = maxSpeed
-            self?.minSpeed = minSpeed
+         
             if maxSpeed == -1.0 && minSpeed == -1.0 {
                 self?.customSpeedSettingView.isHidden = false
                 self?.customSpeedSettingView.viewType = speedSettingView.viewType
+            }else{
+                // 更新最后一次选择的位置恢复时使用
+                if speedSettingView.viewType == 1 {
+                    self?.lastSpeedSelectIndex = selectIndex
+                } else if speedSettingView.viewType == 2 {
+                    self?.lastJumpSpeedSelectIndex = selectIndex
+                } else {
+                    self?.lastCyclesSelectIndex = selectIndex
+                }
+                self?.maxSpeed = maxSpeed
+                self?.minSpeed = minSpeed
             }
             if isSettingPlayer {
                 self?.settingPlayerView()
@@ -345,10 +347,26 @@ class PQStuckPointEditerController: PQBaseViewController {
         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
-            self?.maxSpeed = maxSpeed
-            self?.minSpeed = minSpeed
-            BFLog(message: "自定义速度maxSpeed is\(maxSpeed) minSpeed \(minSpeed) \(isJumpSpeedModel)")
-            self?.settingPlayerView()
+            if(!isCancle){
+                self?.maxSpeed = maxSpeed
+                self?.minSpeed = minSpeed
+                BFLog(message: "自定义速度maxSpeed is\(maxSpeed) minSpeed \(minSpeed) \(isJumpSpeedModel)")
+                self?.settingPlayerView()
+            }else{
+                
+                //取消后恢复上一次选择的位置
+                if self?.speedSettingView.viewType == 1{
+                    self?.speedSettingView.setSelectItem(index: self?.lastSpeedSelectIndex ?? 0, isSettingPlayer: false)
+                }else if self?.speedSettingView.viewType == 2{
+                    self?.speedSettingView.setSelectItem(index: self?.lastJumpSpeedSelectIndex ?? 0, isSettingPlayer: false)
+                }else{
+                    self?.speedSettingView.setSelectItem(index: self?.lastCyclesSelectIndex ?? 0, isSettingPlayer: false)
+                }
+      
+               
+            }
+            
+
         }
         return customSpeedSettingView