@@ -597,3 +598,14 @@ onBeforeUnmount(() => {
}
}
+
+
diff --git a/src/stores/status.ts b/src/stores/status.ts
index c1690ba..a170209 100644
--- a/src/stores/status.ts
+++ b/src/stores/status.ts
@@ -52,6 +52,8 @@ interface StatusState {
playIndex: number;
/** 歌词播放索引 */
lyricIndex: number;
+ /** 歌词加载状态 */
+ lyricLoading: boolean;
/** 当前播放时间 */
currentTime: number;
/** 歌曲总时长 */
@@ -116,6 +118,7 @@ export const useStatusStore = defineStore("status", {
spectrumsData: [],
playIndex: -1,
lyricIndex: -1,
+ lyricLoading: false,
playRate: 1,
playVolume: 0.7,
playVolumeMute: 0,
diff --git a/src/utils/lyric.ts b/src/utils/lyric.ts
index 1a6851d..9f6d94e 100644
--- a/src/utils/lyric.ts
+++ b/src/utils/lyric.ts
@@ -44,6 +44,8 @@ export const resetSongLyric = () => {
// 重置歌词数据
musicStore.setSongLyric({}, true);
statusStore.usingTTMLLyric = false;
+ // 标记为加载中（切歌时防止显示上一首歌词）
+ statusStore.lyricLoading = true;
// 重置歌词索引
statusStore.lyricIndex = -1;
};
@@ -109,6 +111,8 @@ export const parsedLyricsData = (lyricData: any, skipExclude: boolean = false):
);
// 重置歌词索引
statusStore.lyricIndex = -1;
+ // 歌词已加载完成
+ statusStore.lyricLoading = false;
};
/**
diff --git a/src/utils/player-utils/lyric.ts b/src/utils/player-utils/lyric.ts
index 742ba1b..945ef45 100644
--- a/src/utils/player-utils/lyric.ts
+++ b/src/utils/player-utils/lyric.ts
@@ -13,50 +13,69 @@ export const getLyricData = async (id: number) => {
const musicStore = useMusicStore();
const settingStore = useSettingStore();
const statusStore = useStatusStore();
+ // 切歌或重新获取时，先标记为加载中
+ statusStore.lyricLoading = true;
if (!id) {
statusStore.usingTTMLLyric = false;
resetSongLyric();
+ statusStore.lyricLoading = false;
return;
}
try {
// 检测本地歌词覆盖
const getLyric = getLyricFun(settingStore.localLyricPath, id);
- const [{ lyric: lyricRes, isLocal: lyricLocal }, { lyric: ttmlContent, isLocal: ttmlLocal }] =
- await Promise.all([
- getLyric("lrc", songLyric),
- settingStore.enableTTMLLyric ? getLyric("ttml", songLyricTTML) : getLyric("ttml"),
- ]);
+ // 先加载 LRC，不阻塞到 TTML 完成
+ const lrcPromise = getLyric("lrc", songLyric);
+ const ttmlPromise = settingStore.enableTTMLLyric ? getLyric("ttml", songLyricTTML) : null;
+
+ const { lyric: lyricRes, isLocal: lyricLocal } = await lrcPromise;
parsedLyricsData(lyricRes, lyricLocal && !settingStore.enableExcludeLocalLyrics);
- if (ttmlContent) {
- const parsedResult = parseTTML(ttmlContent);
- if (!parsedResult?.lines?.length) {
- statusStore.usingTTMLLyric = false;
- return;
- }
- const skipExcludeLocal = ttmlLocal && !settingStore.enableExcludeLocalLyrics;
- const skipExcludeTTML = !settingStore.enableExcludeTTML;
- const skipExclude = skipExcludeLocal || skipExcludeTTML;
- const ttmlLyric = parseTTMLToAMLL(parsedResult, skipExclude);
- const ttmlYrcLyric = parseTTMLToYrc(parsedResult, skipExclude);
- console.log("TTML lyrics:", ttmlLyric, ttmlYrcLyric);
- // 合并数据
- const updates: Partial<{ yrcAMData: LyricLine[]; yrcData: LyricType[] }> = {};
- if (ttmlLyric?.length) {
- updates.yrcAMData = ttmlLyric;
- console.log("✅ TTML AMLL lyrics success");
- }
- if (ttmlYrcLyric?.length) {
- updates.yrcData = ttmlYrcLyric;
- console.log("✅ TTML Yrc lyrics success");
- }
- if (Object.keys(updates).length) {
- musicStore.setSongLyric(updates);
- statusStore.usingTTMLLyric = true;
- } else {
- statusStore.usingTTMLLyric = false;
- }
+ // LRC 到达后即可认为加载完成
+ statusStore.lyricLoading = false;
+
+ // TTML 并行加载，完成后增量更新，不阻塞整体流程
+ if (ttmlPromise) {
+ statusStore.usingTTMLLyric = false;
+ void ttmlPromise
+ .then(({ lyric: ttmlContent, isLocal: ttmlLocal }) => {
+ if (!ttmlContent) {
+ statusStore.usingTTMLLyric = false;
+ return;
+ }
+ const parsedResult = parseTTML(ttmlContent);
+ if (!parsedResult?.lines?.length) {
+ statusStore.usingTTMLLyric = false;
+ return;
+ }
+ const skipExcludeLocal = ttmlLocal && !settingStore.enableExcludeLocalLyrics;
+ const skipExcludeTTML = !settingStore.enableExcludeTTML;
+ const skipExclude = skipExcludeLocal || skipExcludeTTML;
+ const ttmlLyric = parseTTMLToAMLL(parsedResult, skipExclude);
+ const ttmlYrcLyric = parseTTMLToYrc(parsedResult, skipExclude);
+ console.log("TTML lyrics:", ttmlLyric, ttmlYrcLyric);
+ // 合并数据
+ const updates: Partial<{ yrcAMData: LyricLine[]; yrcData: LyricType[] }> = {};
+ if (ttmlLyric?.length) {
+ updates.yrcAMData = ttmlLyric;
+ console.log("✅ TTML AMLL lyrics success");
+ }
+ if (ttmlYrcLyric?.length) {
+ updates.yrcData = ttmlYrcLyric;
+ console.log("✅ TTML Yrc lyrics success");
+ }
+ if (Object.keys(updates).length) {
+ musicStore.setSongLyric(updates);
+ statusStore.usingTTMLLyric = true;
+ } else {
+ statusStore.usingTTMLLyric = false;
+ }
+ })
+ .catch((err) => {
+ console.error("❌ Error loading TTML lyrics:", err);
+ statusStore.usingTTMLLyric = false;
+ });
} else {
statusStore.usingTTMLLyric = false;
}
@@ -66,6 +85,7 @@ export const getLyricData = async (id: number) => {
console.error("❌ Error loading lyrics:", error);
statusStore.usingTTMLLyric = false;
resetSongLyric();
+ statusStore.lyricLoading = false;
}
};
diff --git a/src/utils/player.ts b/src/utils/player.ts
index d74bfcf..0a4bd34 100644
--- a/src/utils/player.ts
+++ b/src/utils/player.ts
@@ -647,7 +647,10 @@ class Player {
window.$message.warning("当前列表歌曲无法播放，请更换歌曲");
} else {
window.$message.error("该歌曲暂无音源，跳至下一首");
- this.nextOrPrev("next");
+ // 防止切歌保护状态阻塞跳转
+ this.switching = false;
+ await this.nextOrPrev("next");
+ return;
}
}
} else {
@@ -658,7 +661,10 @@ class Player {
window.$message.warning("当前列表歌曲无法播放，请更换歌曲");
} else {
window.$message.error("该歌曲暂无音源，跳至下一首");
- this.nextOrPrev("next");
+ // 防止切歌保护状态阻塞跳转
+ this.switching = false;
+ await this.nextOrPrev("next");
+ return;
}
}
} else {
@@ -668,7 +674,9 @@ class Player {
return;
} else {
window.$message.error("该歌曲无法播放，跳至下一首");
- this.nextOrPrev();
+ // 防止切歌保护状态阻塞跳转
+ this.switching = false;
+ await this.nextOrPrev();
return;
}
}