Merge pull request #1074 from abkkkbb/codex/fix-desktop-lyric-loading

fix: 修复滞后加载状态覆盖桌面歌词的问题

Author: imsyy

src/core/player/PlayerController.ts

@@ -211,7 +211,13 @@ class PlayerController {
     // 通知桌面歌词
     if (isElectron) {
       window.electron.ipcRenderer.send("desktop-lyric:update-data", {
+        currentTime: startSeek,
         lyricLoading: true,
+        songId: song.id,
+        songOffset: statusStore.getSongOffset(song.id),
+        lrcData: [],
+        yrcData: [],
+        lyricIndex: -1,
       });
     }
     // 更新任务栏歌词窗口的元数据

src/utils/initIpc.ts

@@ -140,6 +140,9 @@ const initIpc = () => {
       const statusStore = useStatusStore();
       if (player) {
         const { name, artist } = getPlayerInfoObj() || {};
+        const songLyric = statusStore.lyricLoading
+          ? { lrcData: [], yrcData: [] }
+          : toRaw(musicStore.songLyric);
         window.electron.ipcRenderer.send(
           "desktop-lyric:update-data",
           cloneDeep({
@@ -149,8 +152,8 @@ const initIpc = () => {
             currentTime: statusStore.currentTime,
             songId: musicStore.playSong?.id,
             songOffset: statusStore.getSongOffset(musicStore.playSong?.id),
-            lrcData: musicStore.songLyric.lrcData ?? [],
-            yrcData: musicStore.songLyric.yrcData ?? [],
+            lrcData: songLyric.lrcData ?? [],
+            yrcData: songLyric.yrcData ?? [],
             lyricIndex: statusStore.lyricIndex,
             lyricLoading: statusStore.lyricLoading,
           }),

src/views/DesktopLyric/index.vue

@@ -182,6 +182,15 @@ const lyricData = reactive<LyricData>({
   lyricIndex: -1,
 });
 
+const hasLyricLines = (data: Pick<LyricData, "lrcData" | "yrcData">) =>
+  Boolean(data.lrcData?.length || data.yrcData?.length);
+
+const shouldIgnoreLoadingUpdate = (data: LyricData) => {
+  if (data.lyricLoading !== true) return false;
+  if (hasLyricLines(data) || !hasLyricLines(lyricData)) return false;
+  return data.songId === undefined || data.songId === lyricData.songId;
+};
+
 // 锚点时间（毫秒）与锚点帧时间，用于插值推进
 let baseMs = 0;
 let anchorTick = 0;
@@ -306,7 +315,7 @@ const renderLyricLines = computed<RenderLine[]>(() => {
     return placeholder("SPlayer Desktop Lyric");
   }
   // 加载中
-  if (lyricData.lyricLoading) return placeholder("歌词加载中...");
+  if (lyricData.lyricLoading && !lyrics?.length) return placeholder("歌词加载中...");
   // 纯音乐
   if (!lyrics?.length) return placeholder("纯音乐，请欣赏");
   // 获取当前歌词索引
@@ -708,6 +717,12 @@ onMounted(() => {
   window.electron.ipcRenderer.on(
     "desktop-lyric:update-data",
     (_event, data: LyricData & { sendTimestamp?: number }) => {
+      if (shouldIgnoreLoadingUpdate(data)) {
+        if (isInitializing.value) {
+          isInitializing.value = false;
+        }
+        return;
+      }
       Object.assign(lyricData, data);
       // 首次接收到歌词数据时，立即结束初始化状态
       if (isInitializing.value) {