From 0f5d2189e0e84d6a5747e26d227e22ac67c3d2e7 Mon Sep 17 00:00:00 2001
From: lyswhut <lyswhut@qq.com>
Date: Mon, 13 Dec 2021 14:07:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=A0=E6=B3=95=E5=85=B3?=
 =?UTF-8?q?=E9=97=AD=E7=8A=B6=E6=80=81=E6=A0=8F=E6=AD=8C=E6=9B=B2=E8=BF=9B?=
 =?UTF-8?q?=E5=BA=A6=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/useApp/usePlayer/usePlayProgress.js       | 14 +++++++++-----
 src/renderer/utils/tools.js                        |  2 +-
 .../views/setting/components/SettingPlay.vue       |  5 +----
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/renderer/core/useApp/usePlayer/usePlayProgress.js b/src/renderer/core/useApp/usePlayer/usePlayProgress.js
index c52ea94d..95707e21 100644
--- a/src/renderer/core/useApp/usePlayer/usePlayProgress.js
+++ b/src/renderer/core/useApp/usePlayer/usePlayProgress.js
@@ -62,13 +62,17 @@ export default ({ setting, playNext }) => {
     // if (!isPlay) audio.play()
   }
 
+  const handleSetTaskBarState = (progress, status) => {
+    if (setting.value.player.isShowTaskProgess) setTaskBarProgress(progress, status)
+  }
+
   const handlePlay = () => {
     prevProgressStatus = 'normal'
-    setTaskBarProgress(playProgress.progress, prevProgressStatus)
+    handleSetTaskBarState(playProgress.progress, prevProgressStatus)
   }
   const handlePause = () => {
     prevProgressStatus = 'paused'
-    setTaskBarProgress(playProgress.progress, prevProgressStatus)
+    handleSetTaskBarState(playProgress.progress, prevProgressStatus)
     clearBufferTimeout()
   }
 
@@ -76,13 +80,13 @@ export default ({ setting, playNext }) => {
     setNowPlayTime(0)
     setMaxplayTime(0)
     prevProgressStatus = 'none'
-    setTaskBarProgress(playProgress.progress, prevProgressStatus)
+    handleSetTaskBarState(playProgress.progress, prevProgressStatus)
   }
 
   const handleError = () => {
     if (!restorePlayTime) restorePlayTime = getCurrentTime() // 记录出错的播放时间
     prevProgressStatus = 'error'
-    setTaskBarProgress(playProgress.progress, prevProgressStatus)
+    handleSetTaskBarState(playProgress.progress, prevProgressStatus)
   }
 
   const handleLoadeddata = () => {
@@ -135,7 +139,7 @@ export default ({ setting, playNext }) => {
 
   watch(() => playProgress.progress, (newValue, oldValue) => {
     if (newValue.toFixed(2) === oldValue.toFixed(2)) return
-    setTaskBarProgress(newValue, prevProgressStatus)
+    handleSetTaskBarState(newValue, prevProgressStatus)
   })
   watch(() => playProgress.nowPlayTime, (newValue, oldValue) => {
     if (Math.abs(newValue - oldValue) > 2) window.eventHub.emit(eventPlayerNames.activeTransition)
diff --git a/src/renderer/utils/tools.js b/src/renderer/utils/tools.js
index 13ae6405..f36492f7 100644
--- a/src/renderer/utils/tools.js
+++ b/src/renderer/utils/tools.js
@@ -137,7 +137,7 @@ export const onGetDesktopLyricInfo = callback => {
 
 export const setTaskBarProgress = (status, mode) => {
   rendererSend(NAMES.mainWindow.progress, {
-    status: status < 0.01 ? 0.01 : status,
+    status: status < 0 ? status : Math.max(0.01, status),
     mode: mode || 'normal',
   })
 }
diff --git a/src/renderer/views/setting/components/SettingPlay.vue b/src/renderer/views/setting/components/SettingPlay.vue
index c6dc28e4..543c52a3 100644
--- a/src/renderer/views/setting/components/SettingPlay.vue
+++ b/src/renderer/views/setting/components/SettingPlay.vue
@@ -47,10 +47,7 @@ export default {
     watch(() => currentStting.value.player.isShowTaskProgess, val => {
       if (val) return
       nextTick(() => {
-        setTaskBarProgress({
-          status: -1,
-          mode: 'normal',
-        })
+        setTaskBarProgress(-1, 'normal')
       })
     })