修复禁用切歌时歌曲播放完毕后的歌曲信息显示问题

This commit is contained in:
lyswhut
2023-01-06 14:39:08 +08:00
parent 399208429d
commit 1db54195f5
5 changed files with 43 additions and 24 deletions
@@ -61,7 +61,7 @@ export default () => {
const setProgress = (time: number, maxTime?: number) => {
if (!musicInfo.id) return
console.log('setProgress', time, maxTime)
restorePlayTime = time
if (time > 0) restorePlayTime = time
if (mediaBuffer.playTime) {
clearBufferTimeout()
mediaBuffer.playTime = time
@@ -106,12 +106,6 @@ export default () => {
const handleLoadeddata = () => {
setMaxplayTime(getDuration())
console.log('handleLoadeddata', restorePlayTime)
if (restorePlayTime) {
setCurrentTime(restorePlayTime)
restorePlayTime = 0
}
if (playMusicInfo.musicInfo && 'source' in playMusicInfo.musicInfo && !playMusicInfo.musicInfo.interval) {
console.log(formatPlayTime2(playProgress.maxPlayTime))
@@ -128,12 +122,15 @@ export default () => {
}
const handleCanplay = () => {
console.log('handleCanplay', mediaBuffer.playTime)
console.log('handleCanplay', mediaBuffer.playTime, restorePlayTime)
clearBufferTimeout()
if (mediaBuffer.playTime) {
let playTime = mediaBuffer.playTime
mediaBuffer.playTime = 0
setCurrentTime(playTime)
} else if (restorePlayTime) {
setCurrentTime(restorePlayTime)
restorePlayTime = 0
}
}
const handleWating = () => {
@@ -20,7 +20,7 @@ import {
setAllStatus,
addPlayedList,
clearPlayedList,
resetPlayerMusicInfo,
// resetPlayerMusicInfo,
} from '@renderer/store/player/action'
import { appSetting } from '@renderer/store/setting'
@@ -68,9 +68,12 @@ export default () => {
}
const handleEnded = () => {
// setTimeout(() => {
if (window.lx.isPlayedStop) return setAllStatus(t('player__end'))
resetPlayerMusicInfo()
window.app_event.stop()
if (window.lx.isPlayedStop) {
setAllStatus(t('player__end'))
return
}
// resetPlayerMusicInfo()
// window.app_event.stop()
setAllStatus(t('player__end'))
void playNext(true)
// })