设置速度逻辑调整

BFFramework/Classes/Stuckpoint/Controller/PQStuckPointEditerController.swift

@@ -318,7 +318,6 @@ class PQStuckPointEditerController: PQBaseViewController {
     lazy var speedSettingView: PQSpeedSettingView = {
         let speedSettingView = PQSpeedSettingView()
         speedSettingView.backgroundColor = .clear
-        speedSettingView.viewType = 1
         speedSettingView.selectSpeedCallBack = { [weak self] maxSpeed, minSpeed,selectIndex ,isSettingPlayer in
             BFLog(message: "固定maxSpeed is\(maxSpeed) minSpeed \(minSpeed)")
             //更新最后一次选择的位置恢复时使用
@@ -527,9 +526,10 @@ class PQStuckPointEditerController: PQBaseViewController {
                 make.height.equalTo(30)
             }
             
-            speedSettingView.isHidden = !(selectedDataCount == selectedImageDataCount)
-            editModelLineView.isHidden = !(selectedDataCount == selectedImageDataCount)
-          
+            speedSettingView.isHidden = false
+            editModelLineView.isHidden = false
+            speedTitleLab.isHidden = false
+            sustomSwitchView.isHidden = false
             speedSettingView.setSelectItem(index: lastCyclesSelectIndex,isSettingPlayer:false)
             
         }else{
@@ -541,7 +541,6 @@ class PQStuckPointEditerController: PQBaseViewController {
                 speedSettingView.setSelectItem(index: lastJumpSpeedSelectIndex,isSettingPlayer:false)
             } else if sender.tag == 3 { // 仅音乐
                 customSpeedSettingView.isJumpSpeedModel = false
-                speedSettingView.viewType = 2
             }
             
            
@@ -1393,6 +1392,9 @@ extension PQStuckPointEditerController {
          //3)素材全是图片时如果时长 < 10s要做轮播处理
          if(selectedDataCount == selectedImageDataCount && selectedTotalDuration < 10 ){
             //已经设置过循环次数
+            speedSettingView.viewType = 3
+            
+            //lastCyclesSelectIndex 应该是手动设置的值
             if(lastCyclesSelectIndex != 0){
                 for i in 0...lastCyclesSelectIndex {
                     

BFFramework/Classes/Stuckpoint/View/PQSpeedSettingView.swift

@@ -37,6 +37,11 @@ class PQSpeedSettingView: UIView {
     // view 初化的类型 1, 快慢速度卡点  2，跳跃卡点 ,3,循环设置
     var viewType: Int = 0 {
         didSet {
+            
+            if(viewType == oldValue){
+                return
+            }
+            
             titleCollectionView.snp.remakeConstraints { make in
                 make.right.equalToSuperview()
                 make.width.equalToSuperview()
@@ -64,7 +69,7 @@ class PQSpeedSettingView: UIView {
                 }
 
             } else {
-                var str:String = (viewType == 2) ? "跳跃" : "循环"
+                let str:String = (viewType == 2) ? "跳跃" : "循环"
                 let tempTitle =
                     ["\(str)1x",
                      "2x",
@@ -105,8 +110,8 @@ class PQSpeedSettingView: UIView {
     func setSelectItem(index:Int,isSettingPlayer:Bool = true) {
        BFLog(message: "setSelectItem is \(index)")
         lastSelectModel?.isSelected = false
-        if(viewType == 4){
-            if(index > 4){
+        if(viewType == 3){
+            if(index > 4 && datas.count < 7){
                 let model = PQSpeedTitleModel()
                 model.title = "\(index + 1)x"
                 model.maxSpeed = Float(index + 1)