|
@@ -482,10 +482,10 @@ class PQStuckPointEditerController: PQBaseViewController {
|
|
|
// return “”
|
|
|
// }
|
|
|
|
|
|
-// if sender == jumpPointBtn && selectedTotalDuration < 6 {
|
|
|
-// cShowHUB(superView: view, msg: "素材时长需要大于6秒才\n可选择“跳跃卡点”模式")
|
|
|
-// return
|
|
|
-// }
|
|
|
+ if sender == jumpPointBtn && selectedTotalDuration < 6 && selectedDataCount != selectedImageDataCount {
|
|
|
+ cShowHUB(superView: view, msg: "素材时长需要大于6秒才\n可选择“跳跃卡点”模式")
|
|
|
+ return
|
|
|
+ }
|
|
|
lastEditModelBtn?.isSelected = false
|
|
|
sender.isSelected = !sender.isSelected
|
|
|
lastEditModelBtn = sender
|
|
@@ -531,7 +531,7 @@ class PQStuckPointEditerController: PQBaseViewController {
|
|
|
|
|
|
} else {
|
|
|
if sender.tag == 1 { // 快慢速
|
|
|
- speedSettingView.setSelectItem(index: lastSpeedSelectIndex, isSettingPlayer: false, setDisable: selectedTotalDuration < 6 ? true : false)
|
|
|
+ speedSettingView.setSelectItem(index: lastSpeedSelectIndex, isSettingPlayer: false, setDisable: (selectedTotalDuration < 6 && selectedDataCount != selectedImageDataCount) ? true : false)
|
|
|
} else if sender.tag == 2 { // 跳跃卡点
|
|
|
speedSettingView.setSelectItem(index: lastJumpSpeedSelectIndex, isSettingPlayer: false)
|
|
|
} else if sender.tag == 3 { // 仅音乐
|
|
@@ -1679,11 +1679,11 @@ extension PQStuckPointEditerController {
|
|
|
}
|
|
|
|
|
|
// 跳跃卡点不可用
|
|
|
-// if selectedTotalDuration < 6 {
|
|
|
-// jumpPointBtn.setImage(UIImage().BF_Image(named: "jumpPoint_disable"), for: .normal)
|
|
|
-// jumpPointBtn.setImage(UIImage().BF_Image(named: "jumpPoint_disable"), for: .selected)
|
|
|
-// jumpPointBtnGif.isHidden = true
|
|
|
-// }
|
|
|
+ if selectedTotalDuration < 6 && selectedDataCount != selectedImageDataCount {
|
|
|
+ jumpPointBtn.setImage(UIImage().BF_Image(named: "jumpPoint_disable"), for: .normal)
|
|
|
+ jumpPointBtn.setImage(UIImage().BF_Image(named: "jumpPoint_disable"), for: .selected)
|
|
|
+ jumpPointBtnGif.isHidden = true
|
|
|
+ }
|
|
|
|
|
|
/*
|
|
|
文档规则 https://w42nne6hzg.feishu.cn/docs/doccnQZm1uCfkU4QtJb5fLxYk4d#
|