🦄 refactor: 优化封装

Author: apoint123

src/core/player/PlayModeManager.ts

@@ -78,11 +78,7 @@ export class PlayModeManager {
   /**
    * 计算下一个随机模式
    */
-  private calculateNextShuffleMode(
-    currentMode: ShuffleModeType,
-    targetMode?: ShuffleModeType,
-  ): ShuffleModeType {
-    if (targetMode) return targetMode;
+  public calculateNextShuffleMode(currentMode: ShuffleModeType): ShuffleModeType {
     if (currentMode === "off") return "on";
     if (currentMode === "on") return "heartbeat";
     return "off";
@@ -114,11 +110,7 @@ export class PlayModeManager {
   /**
    * 执行开启心动模式的操作
    */
-  private async applyHeartbeatMode(
-    signal: AbortSignal,
-    previousMode: ShuffleModeType,
-    playAction?: () => Promise<void>,
-  ) {
+  private async applyHeartbeatMode(signal: AbortSignal, previousMode: ShuffleModeType) {
     const statusStore = useStatusStore();
     const musicStore = useMusicStore();
     const dataStore = useDataStore();
@@ -134,12 +126,6 @@ export class PlayModeManager {
       return;
     }
 
-    if (previousMode === "heartbeat") {
-      if (playAction) await playAction();
-      statusStore.showFullPlayer = true;
-      return;
-    }
-
     this.loadingMessage = window.$message.loading("心动模式开启中...", {
       duration: 0, // 不自动关闭，必须手动 destroy
     });
@@ -194,15 +180,14 @@ export class PlayModeManager {
 
   /**
    * 切换随机模式
-   * @param mode 可选，直接设置目标模式。如果不传则按 Off -> On -> Heartbeat -> Off 顺序轮转
-   * @param playAction 回调函数，用于在心动模式下触发播放。通常你应该传入 PlayerController.play，或者其他类似的方法
+   * @param mode 要切换到的随机模式
    */
-  public async toggleShuffle(mode?: ShuffleModeType, playAction?: () => Promise<void>) {
+  public async toggleShuffle(mode: ShuffleModeType) {
     const statusStore = useStatusStore();
     const signal = this.resetCurrentTask();
 
+    const nextMode = mode;
     const currentMode = statusStore.shuffleMode;
-    const nextMode = this.calculateNextShuffleMode(currentMode, mode);
 
     if (nextMode === currentMode) return;
 
@@ -220,7 +205,7 @@ export class PlayModeManager {
             await this.applyShuffleOn(signal);
             break;
           case "heartbeat":
-            await this.applyHeartbeatMode(signal, previousMode, playAction);
+            await this.applyHeartbeatMode(signal, previousMode);
             break;
           default:
             await this.applyShuffleOff();
@@ -263,10 +248,10 @@ export class PlayModeManager {
    * 专门处理 SMTC 的随机按钮事件
    * @param playAction 播放回调
    */
-  public handleSmtcShuffle(playAction?: () => Promise<void>) {
+  public handleSmtcShuffle() {
     const statusStore = useStatusStore();
     const nextMode = statusStore.shuffleMode === "off" ? "on" : "off";
-    this.toggleShuffle(nextMode, playAction);
+    this.toggleShuffle(nextMode);
   }
 
   /**

src/core/player/PlayerController.ts

@@ -825,7 +825,7 @@ class PlayerController {
    * 专门处理 SMTC 的随机按钮事件
    */
   public handleSmtcShuffle() {
-    this.playModeManager.handleSmtcShuffle(this.play.bind(this));
+    this.playModeManager.handleSmtcShuffle();
   }
 
   /**
@@ -953,7 +953,25 @@ class PlayerController {
    * @param mode 可选，直接设置目标模式。如果不传则按 Off -> On -> Heartbeat -> Off 顺序轮转
    */
   public async toggleShuffle(mode?: ShuffleModeType) {
-    await this.playModeManager.toggleShuffle(mode, this.play.bind(this));
+    const statusStore = useStatusStore();
+    const currentMode = statusStore.shuffleMode;
+
+    // 预判下一个模式
+    const nextMode = mode ?? this.playModeManager.calculateNextShuffleMode(currentMode);
+
+    // 已经是心动模式，再次触发心动模式并播放
+    if (currentMode === "heartbeat" && nextMode === "heartbeat") {
+      if (!statusStore.playStatus) {
+        await this.play();
+      }
+      statusStore.showFullPlayer = true;
+      return;
+    }
+
+    // 如果模式确实改变了，才让 Manager 进行繁重的数据处理
+    if (currentMode !== nextMode) {
+      await this.playModeManager.toggleShuffle(nextMode);
+    }
   }
 
   /**