|
@@ -569,7 +569,7 @@ class PQStuckPointEditerController: PQBaseViewController {
|
|
|
|
|
|
self.musicEditBGView.pausePlayer()
|
|
|
|
|
|
- if sender == jumpPointBtn && selectedTotalDuration < 6 && selectedDataCount != selectedImageDataCount {
|
|
|
+ if sender == jumpPointBtn && selectedTotalDuration < 6 && selectedDataCount != selectedImageDataCount && reCreateVideoData == nil{
|
|
|
cShowHUB(superView: view, msg: "素材时长需要大于6秒才\n可选择“跳跃卡点”模式")
|
|
|
return
|
|
|
}
|
|
@@ -1241,9 +1241,7 @@ extension PQStuckPointEditerController {
|
|
|
if(clipFilters.count > finallyStuckPoints.count){
|
|
|
|
|
|
clipPoint(clipNum: clipFilters.count - finallyStuckPoints.count, oldPoints: finallyStuckPoints)
|
|
|
-
|
|
|
-
|
|
|
- let asset = AVURLAsset(url: URL(fileURLWithPath: documensDirectory + (stuckPointMusicData?.localPath ?? "")), options: nil)
|
|
|
+
|
|
|
|
|
|
}else if(clipFilters.count < finallyStuckPoints.count){
|
|
|
|
|
@@ -1959,8 +1957,7 @@ extension PQStuckPointEditerController {
|
|
|
}else{
|
|
|
editModelClick(sender: lastEditModelBtn ?? jumpPointBtn, reportLog: false)
|
|
|
}
|
|
|
-
|
|
|
- updateTimeInfomation()
|
|
|
+
|
|
|
|
|
|
}
|
|
|
}
|