|
@@ -30,8 +30,7 @@ class PQStuckPointCuttingView: UIView {
|
|
|
|
|
|
// 播放进度
|
|
|
private var videoProgress: CGFloat = 0
|
|
|
- // 最大时长 默认 40s
|
|
|
- private var maxCutTime: CGFloat = cDefaultMargin * 400
|
|
|
+
|
|
|
// 最小时长 默认 10s
|
|
|
private var minCutTime: CGFloat = 10
|
|
|
/// 时间间隔
|
|
@@ -154,10 +153,7 @@ class PQStuckPointCuttingView: UIView {
|
|
|
init(frame: CGRect, duration: CGFloat, startTime: CGFloat, endTime: CGFloat) {
|
|
|
super.init(frame: frame)
|
|
|
videoDuration = duration
|
|
|
- if videoDuration < maxCutTime {
|
|
|
- maxCutTime = videoDuration
|
|
|
- }
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
|
|
|
/// 更新卡点值
|
|
@@ -166,7 +162,7 @@ class PQStuckPointCuttingView: UIView {
|
|
|
func updateEndTime(startTime: CGFloat, endTime: CGFloat) {
|
|
|
stuckPointStartTime = startTime
|
|
|
stuckPointEndTime = endTime
|
|
|
- BFLog(message: "推荐开始\(stuckPointStartTime) 结束\(stuckPointEndTime) 时长为:\(stuckPointEndTime - stuckPointStartTime)")
|
|
|
+ BFLog(message: "推荐开始\(stuckPointStartTime) 结束\(stuckPointEndTime) 时长为:\(stuckPointEndTime - stuckPointStartTime) 音乐总时长为:\(videoDuration)")
|
|
|
backgroundColor = PQBFConfig.shared.styleBackGroundColor
|
|
|
addSubview(scrollView)
|
|
|
|
|
@@ -188,7 +184,7 @@ class PQStuckPointCuttingView: UIView {
|
|
|
}
|
|
|
|
|
|
func addData() {
|
|
|
- // 1,选择区内的线个数
|
|
|
+ // 1,选择区内的线个数 ,划动区域后 个数会变???
|
|
|
wavSelectCount = Int(cropViewWidth / (frequencyWidth + frequencyMargin))
|
|
|
|
|
|
// 2竖线一个间隔代表多少 S 是动态的
|