|
@@ -114,10 +114,9 @@ class PQStuckPointEditerController: PQBaseViewController {
|
|
// 开始播放
|
|
// 开始播放
|
|
self?.settingPlayerView()
|
|
self?.settingPlayerView()
|
|
// 点击上报:选择节奏
|
|
// 点击上报:选择节奏
|
|
- if(self?.currentCreateStickersModel == .createStickersModelPoint){
|
|
|
|
|
|
+ if self?.currentCreateStickersModel == .createStickersModelPoint {
|
|
PQEventTrackViewModel.baseReportUpload(businessType: .bt_buttonClick, objectType: .ot_shanyinApp_musicVideoPreview_selectMusicVideoRhythm, pageSource: .sp_stuck_previewSyncedUp, extParams: nil, remindmsg: "点击上报:选择节奏")
|
|
PQEventTrackViewModel.baseReportUpload(businessType: .bt_buttonClick, objectType: .ot_shanyinApp_musicVideoPreview_selectMusicVideoRhythm, pageSource: .sp_stuck_previewSyncedUp, extParams: nil, remindmsg: "点击上报:选择节奏")
|
|
}
|
|
}
|
|
-
|
|
|
|
}
|
|
}
|
|
return sustomSwitchView
|
|
return sustomSwitchView
|
|
}()
|
|
}()
|
|
@@ -482,11 +481,11 @@ class PQStuckPointEditerController: PQBaseViewController {
|
|
// BFLog(message: "已经是选中状态")
|
|
// BFLog(message: "已经是选中状态")
|
|
// return “”
|
|
// return “”
|
|
// }
|
|
// }
|
|
-
|
|
|
|
- if(sender == jumpPointBtn && selectedTotalDuration < 6){
|
|
|
|
- cShowHUB(superView: self.view, msg: "素材时长需要大于6秒才\n可选择“跳跃卡点”模式")
|
|
|
|
- return
|
|
|
|
- }
|
|
|
|
|
|
+
|
|
|
|
+// if sender == jumpPointBtn && selectedTotalDuration < 6 {
|
|
|
|
+// cShowHUB(superView: view, msg: "素材时长需要大于6秒才\n可选择“跳跃卡点”模式")
|
|
|
|
+// return
|
|
|
|
+// }
|
|
lastEditModelBtn?.isSelected = false
|
|
lastEditModelBtn?.isSelected = false
|
|
sender.isSelected = !sender.isSelected
|
|
sender.isSelected = !sender.isSelected
|
|
lastEditModelBtn = sender
|
|
lastEditModelBtn = sender
|
|
@@ -532,8 +531,7 @@ class PQStuckPointEditerController: PQBaseViewController {
|
|
|
|
|
|
} else {
|
|
} else {
|
|
if sender.tag == 1 { // 快慢速
|
|
if sender.tag == 1 { // 快慢速
|
|
-
|
|
|
|
- speedSettingView.setSelectItem(index: lastSpeedSelectIndex, isSettingPlayer: false,setDisable: selectedTotalDuration < 6 ? true : false)
|
|
|
|
|
|
+ speedSettingView.setSelectItem(index: lastSpeedSelectIndex, isSettingPlayer: false, setDisable: selectedTotalDuration < 6 ? true : false)
|
|
} else if sender.tag == 2 { // 跳跃卡点
|
|
} else if sender.tag == 2 { // 跳跃卡点
|
|
speedSettingView.setSelectItem(index: lastJumpSpeedSelectIndex, isSettingPlayer: false)
|
|
speedSettingView.setSelectItem(index: lastJumpSpeedSelectIndex, isSettingPlayer: false)
|
|
} else if sender.tag == 3 { // 仅音乐
|
|
} else if sender.tag == 3 { // 仅音乐
|
|
@@ -592,8 +590,8 @@ class PQStuckPointEditerController: PQBaseViewController {
|
|
exportPhotoData()
|
|
exportPhotoData()
|
|
// 同步音乐数据
|
|
// 同步音乐数据
|
|
synchroMusicInfoData()
|
|
synchroMusicInfoData()
|
|
-
|
|
|
|
- //插入选择的音乐信息
|
|
|
|
|
|
+
|
|
|
|
+ // 插入选择的音乐信息
|
|
musicEditBGView.insertSearchMusic(model: stuckPointMusicData!)
|
|
musicEditBGView.insertSearchMusic(model: stuckPointMusicData!)
|
|
// 曝光上报:预览页面曝光上报
|
|
// 曝光上报:预览页面曝光上报
|
|
PQEventTrackViewModel.baseReportUpload(businessType: .bt_windowView, objectType: .ot_view_previewSyncedUp, pageSource: .sp_stuck_previewSyncedUp, extParams: nil, remindmsg: "卡点视频数据上报-(曝光上报:预览页面曝光上报)")
|
|
PQEventTrackViewModel.baseReportUpload(businessType: .bt_windowView, objectType: .ot_view_previewSyncedUp, pageSource: .sp_stuck_previewSyncedUp, extParams: nil, remindmsg: "卡点视频数据上报-(曝光上报:预览页面曝光上报)")
|
|
@@ -1259,14 +1257,13 @@ extension PQStuckPointEditerController {
|
|
var tempMaxSpeed: Float = 1
|
|
var tempMaxSpeed: Float = 1
|
|
var tempMinSpeed: Float = 1
|
|
var tempMinSpeed: Float = 1
|
|
if model == .createStickersModelSpeed {
|
|
if model == .createStickersModelSpeed {
|
|
-
|
|
|
|
// 改变速率,.只有快慢速且非只有图片素材时自动+1处理
|
|
// 改变速率,.只有快慢速且非只有图片素材时自动+1处理
|
|
if model == .createStickersModelSpeed && selectedDataCount != selectedImageDataCount {
|
|
if model == .createStickersModelSpeed && selectedDataCount != selectedImageDataCount {
|
|
stuckPointsTemp = getUsedStuckPoint(seed: (stuckPointMusicData?.speed ?? 0) + 1)
|
|
stuckPointsTemp = getUsedStuckPoint(seed: (stuckPointMusicData?.speed ?? 0) + 1)
|
|
} else {
|
|
} else {
|
|
stuckPointsTemp = getUsedStuckPoint(seed: (stuckPointMusicData?.speed ?? 0))
|
|
stuckPointsTemp = getUsedStuckPoint(seed: (stuckPointMusicData?.speed ?? 0))
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
tempMaxSpeed = maxSpeed
|
|
tempMaxSpeed = maxSpeed
|
|
tempMinSpeed = minSpeed
|
|
tempMinSpeed = minSpeed
|
|
} else {
|
|
} else {
|
|
@@ -1332,24 +1329,22 @@ extension PQStuckPointEditerController {
|
|
// if(model == .createStickersModelOnlyMusic){
|
|
// if(model == .createStickersModelOnlyMusic){
|
|
// sticker.clipCount = LACount
|
|
// sticker.clipCount = LACount
|
|
// }else{
|
|
// }else{
|
|
- sticker.clipCount = LACount + LBCount
|
|
|
|
|
|
+ sticker.clipCount = LACount + LBCount
|
|
// }
|
|
// }
|
|
-
|
|
|
|
|
|
+
|
|
// LACount + LBCount = 0 ? 11s视频x6倍速
|
|
// LACount + LBCount = 0 ? 11s视频x6倍速
|
|
- if(sticker.clipCount == 0){sticker.clipCount = 1}
|
|
|
|
|
|
+ if sticker.clipCount == 0 { sticker.clipCount = 1 }
|
|
for i in 0 ... sticker.clipCount {
|
|
for i in 0 ... sticker.clipCount {
|
|
-
|
|
|
|
let index = (i + Int(lastPointIndex ?? 0)) % stuckPointsTemp.count
|
|
let index = (i + Int(lastPointIndex ?? 0)) % stuckPointsTemp.count
|
|
var a = stuckPointsTemp[index]
|
|
var a = stuckPointsTemp[index]
|
|
-
|
|
|
|
|
|
+
|
|
// var b = Float((i + Int(lastPointIndex ?? 0) - 1) / stuckPointsTemp.count) * (stuckPointsTemp.first ?? 0)
|
|
// var b = Float((i + Int(lastPointIndex ?? 0) - 1) / stuckPointsTemp.count) * (stuckPointsTemp.first ?? 0)
|
|
- //和下位的差值
|
|
|
|
|
|
+ // 和下位的差值
|
|
// var b:Float = 0.0
|
|
// var b:Float = 0.0
|
|
- if(i >= stuckPointsTemp.count && (index + 1) < stuckPointsTemp.count){
|
|
|
|
- BFLog(message:"差值为:\(stuckPointsTemp[index + 1] - a) 最后一位为:\(finallyStuckPoints.last ?? 0.0)")
|
|
|
|
-
|
|
|
|
|
|
+ if i >= stuckPointsTemp.count && (index + 1) < stuckPointsTemp.count {
|
|
|
|
+ BFLog(message: "差值为:\(stuckPointsTemp[index + 1] - a) 最后一位为:\(finallyStuckPoints.last ?? 0.0)")
|
|
|
|
+
|
|
a = (stuckPointsTemp[index + 1] - a) + (finallyStuckPoints.last ?? 0.0)
|
|
a = (stuckPointsTemp[index + 1] - a) + (finallyStuckPoints.last ?? 0.0)
|
|
-
|
|
|
|
}
|
|
}
|
|
finallyStuckPoints.append(a)
|
|
finallyStuckPoints.append(a)
|
|
}
|
|
}
|
|
@@ -1393,7 +1388,7 @@ extension PQStuckPointEditerController {
|
|
|
|
|
|
// lastCyclesSelectIndex 应该是手动设置的值
|
|
// lastCyclesSelectIndex 应该是手动设置的值
|
|
if lastCyclesSelectIndex != 0 {
|
|
if lastCyclesSelectIndex != 0 {
|
|
- for i in 0 ... lastCyclesSelectIndex - 1{
|
|
|
|
|
|
+ for i in 0 ... lastCyclesSelectIndex - 1 {
|
|
var pointIndex = stuckPointsTemp.firstIndex(where: { (point) -> Bool in
|
|
var pointIndex = stuckPointsTemp.firstIndex(where: { (point) -> Bool in
|
|
(point == (finallyStuckPoints.last ?? 0).truncatingRemainder(dividingBy: (stuckPointsTemp.last ?? 0)))
|
|
(point == (finallyStuckPoints.last ?? 0).truncatingRemainder(dividingBy: (stuckPointsTemp.last ?? 0)))
|
|
})
|
|
})
|
|
@@ -1682,10 +1677,9 @@ extension PQStuckPointEditerController {
|
|
}
|
|
}
|
|
return
|
|
return
|
|
}
|
|
}
|
|
-
|
|
|
|
- //跳跃卡点不可用
|
|
|
|
- if(selectedTotalDuration < 6){
|
|
|
|
-
|
|
|
|
|
|
+
|
|
|
|
+ // 跳跃卡点不可用
|
|
|
|
+ if selectedTotalDuration < 6 {
|
|
jumpPointBtn.setImage(UIImage().BF_Image(named: "jumpPoint_disable"), for: .normal)
|
|
jumpPointBtn.setImage(UIImage().BF_Image(named: "jumpPoint_disable"), for: .normal)
|
|
jumpPointBtn.setImage(UIImage().BF_Image(named: "jumpPoint_disable"), for: .selected)
|
|
jumpPointBtn.setImage(UIImage().BF_Image(named: "jumpPoint_disable"), for: .selected)
|
|
jumpPointBtnGif.isHidden = true
|
|
jumpPointBtnGif.isHidden = true
|