✨ feat: 优化状态栏状态展示

Author: imsyy

electron/main/ipc/ipc-window.ts

@@ -118,33 +118,84 @@ const initWindowsIpc = (): void => {
     mainWin.webContents.send(eventName, ...args);
   });
 
-  // 显示进度
-  ipcMain.on("set-bar", (_event, val: number | "none" | "indeterminate" | "error" | "paused") => {
+  // 进度条状态
+  let currentProgress = -1;
+  let currentMode: "normal" | "paused" | "error" | "indeterminate" = "normal";
+
+  // 更新进度条
+  const updateProgressBar = () => {
     const mainWin = mainWindow.getWin();
     if (!mainWin) return;
-    switch (val) {
-      case "none":
-        mainWin?.setProgressBar(-1);
-        break;
-      case "indeterminate":
-        mainWin?.setProgressBar(2, { mode: "indeterminate" });
-        break;
-      case "error":
-        mainWin?.setProgressBar(1, { mode: "error" });
-        break;
-      case "paused":
-        mainWin?.setProgressBar(1, { mode: "paused" });
-        break;
-      default:
-        if (typeof val === "number") {
-          mainWin?.setProgressBar(val / 100);
-        } else {
-          mainWin?.setProgressBar(-1);
-        }
-        break;
+
+    if (currentProgress < 0) {
+      mainWin.setProgressBar(-1);
+    } else {
+      mainWin.setProgressBar(currentProgress, { mode: currentMode as any });
     }
+  };
+
+  // 设置进度
+  ipcMain.on("set-bar-progress", (_event, progress: number | "none") => {
+    if (progress === "none") {
+      currentProgress = -1;
+    } else {
+      currentProgress = progress / 100;
+    }
+    updateProgressBar();
+  });
+
+  // 设置模式
+  ipcMain.on("set-bar-mode", (_event, mode: "normal" | "paused" | "error" | "indeterminate") => {
+    currentMode = mode;
+    updateProgressBar();
   });
 
+  // 显示进度 (兼容旧版，建议使用 set-bar-progress 和 set-bar-mode)
+  ipcMain.on(
+    "set-bar",
+    (
+      _event,
+      val:
+        | number
+        | "none"
+        | "indeterminate"
+        | "error"
+        | "paused"
+        | { progress: number; mode: "normal" | "paused" | "error" | "indeterminate" },
+    ) => {
+      if (typeof val === "object" && val !== null) {
+        currentProgress = val.progress / 100;
+        currentMode = val.mode === "normal" ? "normal" : val.mode;
+        updateProgressBar();
+        return;
+      }
+
+      switch (val) {
+        case "none":
+          currentProgress = -1;
+          break;
+        case "indeterminate":
+          currentProgress = 2; // Electron treat > 1 as indeterminate usually, but let's stick to mode
+          currentMode = "indeterminate";
+          break;
+        case "error":
+          currentMode = "error";
+          break;
+        case "paused":
+          currentMode = "paused";
+          break;
+        default:
+          if (typeof val === "number") {
+            currentProgress = val / 100;
+          } else {
+            currentProgress = -1;
+          }
+          break;
+      }
+      updateProgressBar();
+    },
+  );
+
   // 开启控制台
   ipcMain.on("open-dev-tools", () => {
     const mainWin = mainWindow.getWin();

src/core/player/PlayerController.ts

@@ -174,6 +174,15 @@ class PlayerController {
       await audioManager.play(url, { fadeIn: !!fadeTime, fadeDuration: fadeTime, autoPlay });
       // 恢复进度
       if (seek > 0) audioManager.seek(seek / 1000);
+      // 如果不自动播放，设置任务栏暂停状态
+      if (!autoPlay) {
+        playerIpc.sendTaskbarMode("paused");
+        if (seek > 0) {
+          const duration = this.getDuration();
+          const progress = calculateProgress(seek, duration);
+          playerIpc.sendTaskbarProgress(progress);
+        }
+      }
     } catch (error) {
       console.error("❌ 音频播放失败:", error);
       throw error;
@@ -315,6 +324,8 @@ class PlayerController {
       lastfmScrobbler.resume();
       // IPC 通知
       playerIpc.sendPlayStatus(true);
+      playerIpc.sendTaskbarMode("normal");
+      playerIpc.sendTaskbarProgress(statusStore.progress);
       // ipcService.sendSongChange(playTitle, name || "", artist || "", album || "");
       console.log(`▶️ [${musicStore.playSong?.id}] 歌曲播放:`, name);
     });
@@ -328,6 +339,8 @@ class PlayerController {
       }
       if (!isElectron) window.document.title = "SPlayer";
       playerIpc.sendPlayStatus(false);
+      playerIpc.sendTaskbarMode("paused");
+      playerIpc.sendTaskbarProgress(statusStore.progress);
       lastfmScrobbler.pause();
       console.log(`⏸️ [${musicStore.playSong?.id}] 歌曲暂停`);
     });
@@ -416,6 +429,11 @@ class PlayerController {
       window.$message.error("本地文件无法播放");
       statusStore.playLoading = false;
       this.retryInfo.count = 0;
+      // 如果列表只有一首，直接停止
+      if (dataStore.playList.length <= 1) {
+        this.pause(true);
+        return;
+      }
       await this.nextOrPrev("next");
       return;
     }

src/core/player/PlayerIpc.ts

@@ -34,18 +34,28 @@ export const sendSongChange = (title: string, name: string, artist: string, albu
 };
 
 /**
- * 发送进度
+ * 发送状态栏进度
  * @param progress 进度
  */
 export const sendTaskbarProgress: (progress: number | "none") => void = throttle(
   (progress: number | "none") => {
     if (isElectron) {
-      window.electron.ipcRenderer.send("set-bar", progress);
+      window.electron.ipcRenderer.send("set-bar-progress", progress);
     }
   },
   1000,
 );
 
+/**
+ * 发送状态栏模式
+ * @param mode 模式
+ */
+export const sendTaskbarMode = (mode: "normal" | "paused" | "error" | "indeterminate") => {
+  if (isElectron) {
+    window.electron.ipcRenderer.send("set-bar-mode", mode);
+  }
+};
+
 /**
  * 发送 Socket 实时进度
  */