修复21 张图未循环两边问题 > 10s

BFFramework/Classes/Stuckpoint/Controller/PQStuckPointEditerController.swift

@@ -1523,9 +1523,9 @@ extension PQStuckPointEditerController {
             oneSelectImageDuration = (finallyStuckPoints.last ?? 0) - (finallyStuckPoints.first ?? 0)
         }
 
-        // 3)素材全是图片时如果时长 < 10s要做轮播处理
-        if selectedDataCount == selectedImageDataCount && oneSelectImageDuration < 10 {
- 
+        // 3)素材全是图片处理
+        if selectedDataCount == selectedImageDataCount{
+           
             // lastCyclesSelectIndex != -1 已经设置过循环次数 应该是手动设置的值
             if lastCyclesSelectIndex != -1 {
                 // 纯图片时 已经默认添加一次循环 所以要用lastCyclesSelectIndex - 1
@@ -1533,30 +1533,33 @@ extension PQStuckPointEditerController {
                     clipPoint(clipCount: selectedImageDataCount * lastCyclesSelectIndex - 1, oldPoints: stuckPointsTemp)
                 }
            
-
             } else {
-                lastCyclesSelectIndex = 0
-                while oneSelectImageDuration < 10 {
-                    // 不够10S 时 一次加图片数量的卡点数
-                    clipPoint(clipCount: selectedImageDataCount - 1, oldPoints: stuckPointsTemp)
-                    oneSelectImageDuration = Float((finallyStuckPoints.last ?? 0) - (finallyStuckPoints.first ?? 0))
-
-                    lastCyclesSelectIndex = lastCyclesSelectIndex + 1
+                if(oneSelectImageDuration < 10 ){
+                    lastCyclesSelectIndex = 0
+                    while oneSelectImageDuration < 10 {
+                        // 不够10S 时 一次加图片数量的卡点数
+                        clipPoint(clipCount: selectedImageDataCount - 1, oldPoints: stuckPointsTemp)
+                        oneSelectImageDuration = Float((finallyStuckPoints.last ?? 0) - (finallyStuckPoints.first ?? 0))
+
+                        lastCyclesSelectIndex = lastCyclesSelectIndex + 1
+                    }
+                    speedSettingView.setSelectItem(index: lastCyclesSelectIndex, isSettingPlayer: false,enableInsert: true)
+                }else{
+                    lastCyclesSelectIndex = 0
                 }
-                speedSettingView.setSelectItem(index: lastCyclesSelectIndex, isSettingPlayer: false,enableInsert: true)
             }
-        } else {
-            // 设置速度选择的位置
-            if speedSettingView.viewType == 1 {
-                speedSettingView.setSelectItem(index: lastSpeedSelectIndex, isSettingPlayer: false)
-            } else if speedSettingView.viewType == 2 {
-                speedSettingView.setSelectItem(index: lastJumpSpeedSelectIndex, isSettingPlayer: false)
-            } else if speedSettingView.viewType == 3 {
-                if lastCyclesSelectIndex != -1 {
-                    speedSettingView.setSelectItem(index: lastCyclesSelectIndex, isSettingPlayer: false)
-                } else {
-                    speedSettingView.setSelectItem(index: 0, isSettingPlayer: false)
-                }
+        }
+        
+        // 设置速度选择的位置
+        if speedSettingView.viewType == 1 {
+            speedSettingView.setSelectItem(index: lastSpeedSelectIndex, isSettingPlayer: false)
+        } else if speedSettingView.viewType == 2 {
+            speedSettingView.setSelectItem(index: lastJumpSpeedSelectIndex, isSettingPlayer: false)
+        } else if speedSettingView.viewType == 3 {
+            if lastCyclesSelectIndex != -1 {
+                speedSettingView.setSelectItem(index: lastCyclesSelectIndex, isSettingPlayer: false)
+            } else {
+                speedSettingView.setSelectItem(index: 0, isSettingPlayer: false)
             }
         }