|
@@ -1417,8 +1417,7 @@ extension PQStuckPointEditerController {
|
|
|
|
|
|
break
|
|
break
|
|
}
|
|
}
|
|
- // 拼接图片所使用的时长
|
|
|
|
- // 选择一组图片 按图片数量计算卡点的总时长
|
|
|
|
|
|
+ // 拼接图片所使用的时长.选择一组图片 按图片数量计算卡点的总时长
|
|
var oneSelectImageDuration:Float = 0.0
|
|
var oneSelectImageDuration:Float = 0.0
|
|
if selectedImageDataCount > 0 {
|
|
if selectedImageDataCount > 0 {
|
|
//二,最一个卡点在原数组中的位置,从这个位置开始拼接图片所要使用的卡点
|
|
//二,最一个卡点在原数组中的位置,从这个位置开始拼接图片所要使用的卡点
|
|
@@ -1429,7 +1428,7 @@ extension PQStuckPointEditerController {
|
|
|
|
|
|
var tempStartTime:Float = -1
|
|
var tempStartTime:Float = -1
|
|
var tempEndTime:Float = -1
|
|
var tempEndTime:Float = -1
|
|
- for i in 0 ... selectedImageDataCount {
|
|
|
|
|
|
+ for i in 0 ... selectedImageDataCount - 1 {
|
|
let a = stuckPointsTemp[(i + Int(pointIndex ?? 0)) % stuckPointsTemp.count]
|
|
let a = stuckPointsTemp[(i + Int(pointIndex ?? 0)) % stuckPointsTemp.count]
|
|
let b = Float((i + Int(pointIndex ?? 0)) / stuckPointsTemp.count) * (stuckPointsTemp.first ?? 0)
|
|
let b = Float((i + Int(pointIndex ?? 0)) / stuckPointsTemp.count) * (stuckPointsTemp.first ?? 0)
|
|
finallyStuckPoints.append(a + b)
|
|
finallyStuckPoints.append(a + b)
|
|
@@ -1464,14 +1463,14 @@ extension PQStuckPointEditerController {
|
|
}
|
|
}
|
|
|
|
|
|
} else {
|
|
} else {
|
|
- lastCyclesSelectIndex = 1
|
|
|
|
|
|
+ lastCyclesSelectIndex = 0
|
|
while oneSelectImageDuration < 10 {
|
|
while oneSelectImageDuration < 10 {
|
|
// 不够10S 时 一次加图片数量的卡点数
|
|
// 不够10S 时 一次加图片数量的卡点数
|
|
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)))
|
|
})
|
|
})
|
|
pointIndex = (pointIndex ?? 0) + 1
|
|
pointIndex = (pointIndex ?? 0) + 1
|
|
- for i in 0 ... selectedImageDataCount {
|
|
|
|
|
|
+ for i in 0 ... selectedImageDataCount - 1 {
|
|
let a = stuckPointsTemp[(i + Int(pointIndex ?? 0)) % stuckPointsTemp.count]
|
|
let a = stuckPointsTemp[(i + Int(pointIndex ?? 0)) % stuckPointsTemp.count]
|
|
let b = Float((i + Int(pointIndex ?? 0)) / stuckPointsTemp.count) * (stuckPointsTemp.first ?? 0)
|
|
let b = Float((i + Int(pointIndex ?? 0)) / stuckPointsTemp.count) * (stuckPointsTemp.first ?? 0)
|
|
finallyStuckPoints.append(a + b)
|
|
finallyStuckPoints.append(a + b)
|