|
@@ -174,8 +174,8 @@ class PQStuckPointCuttingView: UIView {
|
|
addSubview(leftMaskView)
|
|
addSubview(leftMaskView)
|
|
addSubview(rightMaskView)
|
|
addSubview(rightMaskView)
|
|
videoCropView.addSubview(tatalTimeLabel)
|
|
videoCropView.addSubview(tatalTimeLabel)
|
|
-
|
|
|
|
addData()
|
|
addData()
|
|
|
|
+ videoCropView.frame = CGRect(x: (cScreenWidth - cropViewWidth) / 2, y: 0, width: cropViewWidth, height: 80)
|
|
|
|
|
|
tatalTimeLabel.snp.remakeConstraints { make in
|
|
tatalTimeLabel.snp.remakeConstraints { make in
|
|
make.width.equalTo(40)
|
|
make.width.equalTo(40)
|
|
@@ -241,9 +241,9 @@ class PQStuckPointCuttingView: UIView {
|
|
// 整倍数
|
|
// 整倍数
|
|
let waveTotalCount = Int(wavTotalCount) / cFrequency.count
|
|
let waveTotalCount = Int(wavTotalCount) / cFrequency.count
|
|
// 余多少个未画的
|
|
// 余多少个未画的
|
|
- var remainder = Int(ceil(CGFloat(wavTotalCount) - CGFloat(waveTotalCount * cFrequency.count)))
|
|
|
|
|
|
+ var remainder = Int(wavTotalCount % cFrequency.count)
|
|
var totalWave: [CGFloat] = Array<CGFloat>.init()
|
|
var totalWave: [CGFloat] = Array<CGFloat>.init()
|
|
- // 1,先画整倍数个竖线
|
|
|
|
|
|
+// 1,先画整倍数个竖线
|
|
for _ in 0 ..< waveTotalCount {
|
|
for _ in 0 ..< waveTotalCount {
|
|
totalWave = totalWave + cFrequency
|
|
totalWave = totalWave + cFrequency
|
|
}
|
|
}
|
|
@@ -252,7 +252,7 @@ class PQStuckPointCuttingView: UIView {
|
|
}
|
|
}
|
|
// 1,再画余数个竖线
|
|
// 1,再画余数个竖线
|
|
if remainder > 0 {
|
|
if remainder > 0 {
|
|
- totalWave = totalWave + cFrequency[0 ... remainder]
|
|
|
|
|
|
+ totalWave = totalWave + cFrequency[0 ... (remainder - 1)]
|
|
}
|
|
}
|
|
|
|
|
|
createWave(waveArr: totalWave)
|
|
createWave(waveArr: totalWave)
|
|
@@ -267,9 +267,7 @@ class PQStuckPointCuttingView: UIView {
|
|
return
|
|
return
|
|
}
|
|
}
|
|
let startIndex = scrollView.contentOffset.x / (frequencyWidth + frequencyMargin)
|
|
let startIndex = scrollView.contentOffset.x / (frequencyWidth + frequencyMargin)
|
|
-
|
|
|
|
-// HHZPrint("startIndex is:\(startIndex) stuckPointStartTime is: \(stuckPointStartTime)")
|
|
|
|
- let selectIndex = Int(ceil(startIndex + progress * CGFloat(wavSelectCount)))
|
|
|
|
|
|
+ let selectIndex = Int(floor(startIndex + progress * CGFloat(wavSelectCount)))
|
|
if(selectIndex < lineLayerArray.count){
|
|
if(selectIndex < lineLayerArray.count){
|
|
let drawLayer:CAShapeLayer = lineLayerArray[selectIndex]
|
|
let drawLayer:CAShapeLayer = lineLayerArray[selectIndex]
|
|
BFLog(message: "progress is \(progress) i \(selectIndex) 命中的位置:\(CGFloat(selectIndex) * oneMarginTime)")
|
|
BFLog(message: "progress is \(progress) i \(selectIndex) 命中的位置:\(CGFloat(selectIndex) * oneMarginTime)")
|