🐞 fix: 修复心动模式，将心动模式移出切换循环中

Author: imsyy

src/core/player/PlayModeManager.ts

@@ -77,10 +77,13 @@ export class PlayModeManager {
 
   /**
    * 计算下一个随机模式
+   * 注意：心跳模式只能通过菜单开启，不能通过点击随机按钮进入
    */
   public calculateNextShuffleMode(currentMode: ShuffleModeType): ShuffleModeType {
     if (currentMode === "off") return "on";
-    if (currentMode === "on") return "heartbeat";
+    if (currentMode === "on") return "off";
+    // 如果是心跳模式，点击随机按钮时退出心跳模式
+    if (currentMode === "heartbeat") return "off";
     return "off";
   }
 
@@ -127,31 +130,36 @@ export class PlayModeManager {
     }
 
     this.loadingMessage = window.$message.loading("心动模式开启中...", {
-      duration: 0, // 不自动关闭，必须手动 destroy
+      duration: 0,
     });
 
-    const pid =
-      musicStore.playPlaylistId || (await dataStore.getUserLikePlaylist())?.detail?.id || 0;
-    const currentSongId = musicStore.playSong?.id || 0;
-
-    if (!currentSongId) throw new Error("无播放歌曲");
+    try {
+      const pid =
+        musicStore.playPlaylistId || (await dataStore.getUserLikePlaylist())?.detail?.id || 0;
+      if (!musicStore.playSong) throw new Error("无播放歌曲");
+      // 获取当前歌曲ID，如果不是纯数字则生成随机10位数
+      let currentSongId = musicStore.playSong.id;
+      if (!Number.isInteger(currentSongId) || currentSongId <= 0) {
+        currentSongId = Math.floor(Math.random() * 9000000000) + 1000000000;
+      }
 
-    const res = await heartRateList(currentSongId, pid, undefined, signal);
-    if (res.code !== 200) throw new Error("获取推荐失败");
+      const res = await heartRateList(currentSongId, pid, undefined, signal);
+      if (res.code !== 200) throw new Error("获取推荐失败");
 
-    const recList = formatSongsList(res.data);
+      const recList = formatSongsList(res.data);
 
-    // 混合列表
-    const currentList = [...dataStore.playList];
-    const mixedList = interleaveLists(currentList, recList);
+      // 混合列表
+      const currentList = [...dataStore.playList];
+      const mixedList = interleaveLists(currentList, recList);
 
-    await dataStore.setPlayList(mixedList);
+      await dataStore.setPlayList(mixedList);
 
-    const idx = mixedList.findIndex((s) => s.id === currentSongId);
-    if (idx !== -1) statusStore.playIndex = idx;
-
-    this.clearLoadingMessage();
-    window.$message.success("心动模式已开启");
+      const idx = mixedList.findIndex((s) => s.id === currentSongId);
+      if (idx !== -1) statusStore.playIndex = idx;
+      window.$message.success("心动模式已开启");
+    } finally {
+      this.clearLoadingMessage();
+    }
   }
 
   /**

src/core/player/PlayerController.ts

@@ -950,7 +950,8 @@ class PlayerController {
 
   /**
    * 切换随机模式
-   * @param mode 可选，直接设置目标模式。如果不传则按 Off -> On -> Heartbeat -> Off 顺序轮转
+   * @param mode 可选，直接设置目标模式。如果不传则按 Off -> On -> Off 顺序轮转
+   * @note 心跳模式只能通过菜单开启（传入 "heartbeat" 参数），点击随机按钮不会进入心跳模式
    * @note 当播放列表包含本地歌曲时，跳过心动模式，只在 Off 和 On 之间切换
    */
   public async toggleShuffle(mode?: ShuffleModeType) {
@@ -969,15 +970,6 @@ class PlayerController {
       nextMode = "off";
     }
 
-    // 已经是心动模式，再次触发心动模式并播放
-    if (currentMode === "heartbeat" && nextMode === "heartbeat") {
-      if (!statusStore.playStatus) {
-        await this.play();
-      }
-      statusStore.showFullPlayer = true;
-      return;
-    }
-
     // 如果模式确实改变了，才让 Manager 进行繁重的数据处理
     if (currentMode !== nextMode) {
       await this.playModeManager.toggleShuffle(nextMode);

src/stores/status.ts

@@ -255,13 +255,12 @@ export const useStatusStore = defineStore("status", {
     },
     /**
      * 切换随机模式
-     * 顺序: Off -> On -> Heartbeat -> Off
+     * 顺序: Off -> On -> Off
+     * @deprecated 心跳模式只能通过菜单开启，不再通过此方法切换
      */
     toggleShuffle() {
       if (this.shuffleMode === "off") {
         this.shuffleMode = "on";
-      } else if (this.shuffleMode === "on") {
-        this.shuffleMode = "heartbeat";
       } else {
         this.shuffleMode = "off";
       }