fix: 修复不循环模式导致无法播放

Author: imsyy

src/components/player/FullPlayer/index.vue

@@ -448,7 +448,7 @@ const toggleLyric = (): void => {
                 variant="ghost"
                 circle
                 :disabled="!hasTrack"
-                @click="player.nextTrack()"
+                @click="player.nextTrack(true)"
               >
                 <template #icon><IconLucideSkipForward /></template>
               </SButton>

src/components/player/PlayerControls.vue

@@ -75,7 +75,7 @@ const hasTrack = computed(() => !!media.track);
       ripple
       :size="compact ? 34 : 38"
       :disabled="!hasTrack"
-      @click="player.nextTrack()"
+      @click="player.nextTrack(true)"
     >
       <template #icon><IconLucideSkipForward /></template>
     </SButton>

src/core/hotkey/registry.ts

@@ -27,7 +27,7 @@ export const buildRegistry = (): void => {
   // 播放/暂停
   handlers.set("player.togglePlay", () => player.togglePlay());
   // 下一曲
-  handlers.set("player.next", () => player.nextTrack());
+  handlers.set("player.next", () => player.nextTrack(true));
   // 上一曲
   handlers.set("player.prev", () => player.prevTrack());
   // 快进

src/core/player/events.ts

@@ -100,7 +100,7 @@ export const handleEvent = async (event: PlayerEvent): Promise<void> => {
       await pause();
       break;
     case "next":
-      await nextTrack();
+      await nextTrack(true);
       break;
     case "prev":
       await prevTrack();

src/core/player/index.ts

@@ -231,6 +231,10 @@ export const recoverFromSourceFailure = async (): Promise<void> => {
 /** 恢复播放 */
 export const play = async (): Promise<void> => {
   const status = useStatusStore();
+  if (status.state === "stopped" && status.currentTrack) {
+    await loadTrack(status.currentTrack);
+    return;
+  }
   const prev = status.state;
   status.state = "playing";
   playback.setPlaying(true);
@@ -453,8 +457,11 @@ export const dislikeFmTrack = async (): Promise<void> => {
   if (next) await loadTrack(next);
 };
 
-/** 播放下一首，队列末尾时根据循环模式决定行为 */
-export const nextTrack = async (): Promise<void> => {
+/**
+ * 播放下一首
+ * @param manual - 用户手动点下一曲
+ */
+export const nextTrack = async (manual = false): Promise<void> => {
   const status = useStatusStore();
   // 私人 FM
   if (status.fmMode) {
@@ -465,8 +472,8 @@ export const nextTrack = async (): Promise<void> => {
   if (queue.queueLength.value === 0) return;
   // 到末尾了
   if (status.playIndex >= queue.queueLength.value - 1) {
-    // 列表循环 / 单曲循环：回到首位继续播放
-    if (status.repeatMode === "list" || status.repeatMode === "one") {
+    // 列表循环 / 单曲循环，或用户手动点下一曲
+    if (status.repeatMode === "list" || status.repeatMode === "one" || manual) {
       if (status.shuffleMode === "on" && queue.queueLength.value > 1) {
         // 重新洗牌产生新顺序，当前歌在 index 0，从 1 开始避免重复
         queue.shuffleQueue(status.playIndex);