|
@@ -69,7 +69,7 @@ export default defineComponent({
|
|
|
}
|
|
|
}
|
|
|
res.push(prev)
|
|
|
- console.log(res, 'formatEffectiveTime')
|
|
|
+ // console.log(res, 'formatEffectiveTime')
|
|
|
|
|
|
return formatEffectiveTimeToAfter(res)
|
|
|
}
|
|
@@ -81,21 +81,26 @@ export default defineComponent({
|
|
|
const endNode = forms.pointVideo.endNode
|
|
|
res.forEach((item: any) => {
|
|
|
// 开始时间大于 设置时间
|
|
|
+
|
|
|
if (item[0] >= startNode && item[1] <= endNode) {
|
|
|
+ // console.log(1)
|
|
|
effective.push(item)
|
|
|
}
|
|
|
- if (item[0] >= startNode && item[1] < endNode) {
|
|
|
- effective.push([item[0], item[1]])
|
|
|
- }
|
|
|
+ // if (item[0] >= startNode && item[1] < endNode) {
|
|
|
+ // console.log(2)
|
|
|
+ // effective.push([item[0], item[1]])
|
|
|
+ // }
|
|
|
if (item[0] >= startNode && item[1] > endNode) {
|
|
|
+ // console.log(3)
|
|
|
effective.push([item[0], endNode])
|
|
|
}
|
|
|
if (item[0] < startNode && item[1] > startNode && item[1] < endNode) {
|
|
|
+ // console.log(4)
|
|
|
effective.push(startNode, item[1])
|
|
|
}
|
|
|
})
|
|
|
|
|
|
- console.log(effective, 'effective')
|
|
|
+ // console.log(effective, 'effective')
|
|
|
return effective
|
|
|
}
|
|
|
|
|
@@ -106,7 +111,7 @@ export default defineComponent({
|
|
|
*/
|
|
|
const formatTimer = (intervals: any[]) => {
|
|
|
const afterIntervals = formatEffectiveTime(intervals)
|
|
|
- console.log(afterIntervals, 'afterIntervals')
|
|
|
+ // console.log(afterIntervals, 'afterIntervals')
|
|
|
let time = 0
|
|
|
afterIntervals.forEach((t: any) => {
|
|
|
time += t[1] - t[0]
|
|
@@ -418,8 +423,12 @@ export default defineComponent({
|
|
|
videoIntervalRef.counter.value = 0
|
|
|
}, 10000)
|
|
|
|
|
|
- const arr = [[0, 20]]
|
|
|
- console.log(formatEffectiveTime(arr))
|
|
|
+ // const arr = [
|
|
|
+ // [0, 8],
|
|
|
+ // [9, 12],
|
|
|
+ // [1, 12]
|
|
|
+ // ]
|
|
|
+ // console.log(formatEffectiveTime(arr))
|
|
|
} catch {
|
|
|
//
|
|
|
}
|
|
@@ -444,7 +453,7 @@ export default defineComponent({
|
|
|
}
|
|
|
|
|
|
const onPageShow = () => {
|
|
|
- console.log(forms.isPageHide, 'showInfo')
|
|
|
+ // console.log(forms.isPageHide, 'showInfo')
|
|
|
if (forms.isPageHide) {
|
|
|
window.location.reload()
|
|
|
}
|
|
@@ -453,7 +462,7 @@ export default defineComponent({
|
|
|
window.addEventListener('pageshow', onPageShow)
|
|
|
|
|
|
const onPageHide = () => {
|
|
|
- console.log(forms.isPageHide, 'showInfo')
|
|
|
+ // console.log(forms.isPageHide, 'showInfo')
|
|
|
forms.isPageHide = true
|
|
|
}
|
|
|
window.addEventListener('pagehide', onPageHide)
|