From f5bb9189af2caa4af005023cef75260e9876358a Mon Sep 17 00:00:00 2001 From: lyswhut Date: Fri, 14 Jan 2022 17:24:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=92=AD=E6=94=BE=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E7=9A=84=E6=8F=90=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- publish/changeLog.md | 1 + .../core/useApp/usePlayer/usePlayEvent.js | 20 +++++++------------ .../core/useApp/usePlayer/usePlayer.js | 7 ++----- 3 files changed, 10 insertions(+), 18 deletions(-) diff --git a/publish/changeLog.md b/publish/changeLog.md index ea80df8f..1ee62647 100644 --- a/publish/changeLog.md +++ b/publish/changeLog.md @@ -12,6 +12,7 @@ - 修复代理不生效的问题 - 修复`openDevTools`选项无效的问题 +- 修复播放状态的提示问题 ### 其他 diff --git a/src/renderer/core/useApp/usePlayer/usePlayEvent.js b/src/renderer/core/useApp/usePlayer/usePlayEvent.js index 759e5e33..be0ae5f1 100644 --- a/src/renderer/core/useApp/usePlayer/usePlayEvent.js +++ b/src/renderer/core/useApp/usePlayer/usePlayEvent.js @@ -5,7 +5,7 @@ import { musicInfo, musicInfoItem, playMusicInfo } from '@renderer/core/share/pl export default ({ playNext, - setStatus, + setAllStatus, setUrl, }) => { const { t } = useI18n() @@ -50,18 +50,15 @@ export default ({ const handleLoadstart = () => { startLoadingTimeout() - const status = t('player__loading') - setStatus(status, status) + setAllStatus(t('player__loading')) } const handleLoadeddata = () => { - const status = t('player__loading') - setStatus(status, status) + setAllStatus(t('player__loading')) } const handleCanplay = () => { - const status = '' - setStatus(status, status) + setAllStatus('') } const handlePlaying = () => { @@ -74,8 +71,7 @@ export default ({ } const handleWating = () => { - const status = t('player__buffering') - setStatus(status, status) + setAllStatus(t('player__buffering')) } const handleError = errCode => { @@ -85,13 +81,11 @@ export default ({ // console.log(this.retryNum) retryNum++ setUrl(musicInfoItem.value, true) - const status = t('player__refresh_url') - setStatus(status, status) + setAllStatus(t('player__refresh_url')) return } - const status = t('player__error') - setStatus(status, status) + setAllStatus(t('player__error')) addDelayNextTimeout() } diff --git a/src/renderer/core/useApp/usePlayer/usePlayer.js b/src/renderer/core/useApp/usePlayer/usePlayer.js index ca71fdfe..f0a64c9b 100644 --- a/src/renderer/core/useApp/usePlayer/usePlayer.js +++ b/src/renderer/core/useApp/usePlayer/usePlayer.js @@ -22,8 +22,6 @@ import { requestMsg } from '@renderer/utils/message' import { isPlay, setPlay, - setStatus, - setStatusText, setAllStatus, musicInfo, setMusicInfo, @@ -164,7 +162,7 @@ export default ({ setting }) => { useMediaSessionInfo({ playPrev, playNext }) usePlayEvent({ playNext, - setStatus, + setAllStatus, setUrl, }) useLyric({ @@ -204,8 +202,7 @@ export default ({ setting }) => { const setStopStatus = () => { setPlay(false) setTitle() - setStatus('') - setStatusText('') + setAllStatus('') setMusicInfo({ songmid: null, img: null,