🐞 fix: 修复定时关闭失效

Author: imsyy

src/components/Modal/AutoClose.vue

@@ -81,6 +81,7 @@ const handleUpdate = (value: boolean) => {
   } else {
     statusStore.autoClose.enable = false;
     statusStore.autoClose.remainTime = statusStore.autoClose.time * 60;
+    statusStore.autoClose.endTime = 0;
   }
 };
 </script>

src/core/player/PlayerController.ts

@@ -904,26 +904,31 @@ class PlayerController {
   public startAutoCloseTimer(time: number, remainTime: number) {
     const statusStore = useStatusStore();
     if (!time || !remainTime) return;
-
+    // 清除已有定时器
     if (this.autoCloseInterval) {
       clearInterval(this.autoCloseInterval);
     }
-
+    // 计算目标结束时间戳
+    const endTime = Date.now() + remainTime * 1000;
     statusStore.autoClose.enable = true;
     statusStore.autoClose.time = time;
+    statusStore.autoClose.endTime = endTime;
     statusStore.autoClose.remainTime = remainTime;
-
+    // 定时器仅用于 UI 更新，实际计时基于系统时间
     this.autoCloseInterval = setInterval(() => {
-      if (statusStore.autoClose.remainTime <= 0) {
+      const now = Date.now();
+      const remaining = Math.max(0, Math.ceil((statusStore.autoClose.endTime - now) / 1000));
+      statusStore.autoClose.remainTime = remaining;
+      // 到达时间
+      if (remaining <= 0) {
         clearInterval(this.autoCloseInterval);
         if (!statusStore.autoClose.waitSongEnd) {
           this.pause();
           statusStore.autoClose.enable = false;
           statusStore.autoClose.remainTime = statusStore.autoClose.time * 60;
+          statusStore.autoClose.endTime = 0;
         }
-        return;
       }
-      statusStore.autoClose.remainTime--;
     }, 1000);
   }
 
@@ -938,6 +943,7 @@ class PlayerController {
       statusStore.autoClose.enable = false;
       // 重置时间
       statusStore.autoClose.remainTime = statusStore.autoClose.time * 60;
+      statusStore.autoClose.endTime = 0;
       return true;
     }
     return false;

src/stores/status.ts

@@ -98,6 +98,8 @@ interface StatusState {
     time: number;
     /** 剩余时长（秒） */
     remainTime: number;
+    /** 目标结束时间戳（毫秒） */
+    endTime: number;
     /** 等待歌曲结束 */
     waitSongEnd: boolean;
   };
@@ -146,6 +148,7 @@ export const useStatusStore = defineStore("status", {
       enable: false,
       time: 30,
       remainTime: 0,
+      endTime: 0,
       waitSongEnd: true,
     },
     developerMode: false,

src/utils/init.ts

@@ -46,7 +46,19 @@ const init = async () => {
   player.playModeSyncIpc();
   // 初始化自动关闭定时器
   if (statusStore.autoClose.enable) {
-    player.startAutoCloseTimer(statusStore.autoClose.time, statusStore.autoClose.remainTime);
+    const { endTime, time } = statusStore.autoClose;
+    const now = Date.now();
+
+    if (endTime > now) {
+      // 计算真实剩余时间
+      const realRemainTime = Math.ceil((endTime - now) / 1000);
+      player.startAutoCloseTimer(time, realRemainTime);
+    } else {
+      // 定时器已过期，重置状态
+      statusStore.autoClose.enable = false;
+      statusStore.autoClose.remainTime = time * 60;
+      statusStore.autoClose.endTime = 0;
+    }
   }
 
   if (isElectron) {