Merge branch 'dev' of https://github.com/imsyy/SPlayer into dev

Author: imsyy

scripts/dev.mjs

@@ -39,8 +39,18 @@ if (isWindows) {
 } else {
   // macOS 和 Linux 环境
   console.log(`🐧 ${isMacOS ? "macOS" : "Linux"} 环境 - 正在设置 UTF-8 编码`);
-  env.LC_ALL = "en_US.UTF-8";
-  env.LANG = "en_US.UTF-8";
+  const langVar = env.LC_ALL || env.LANG;
+  if (langVar.endsWith("UTF-8")) {
+    console.log("✅ 当前环境已设置 UTF-8 编码");
+  } else {
+    if (langVar.startsWith("zh_CN")) {
+      env.LC_ALL = "zh_CN.UTF-8";
+      env.LANG = "zh_CN.UTF-8";
+    } else {
+      env.LC_ALL = "en_US.UTF-8";
+      env.LANG = "en_US.UTF-8";
+    }
+  }
   setTimeout(() => startElectronVite(), 0);
 }
 

src/components/Player/MainAMLyric.vue

@@ -85,8 +85,11 @@ const jumpSeek = (line: any) => {
 };
 
 // 处理歌词语言
-const processLyricLanguage = () => {
-  const lyricLinesEl = lyricPlayerRef.value?.lyricPlayer?.lyricLinesEl ?? [];
+const processLyricLanguage = (player = lyricPlayerRef.value) => {
+  const lyricLinesEl = player?.lyricPlayer?.lyricLinesEl;
+  if (!lyricLinesEl || lyricLinesEl.length === 0) {
+    return;
+  }
   // 遍历歌词行
   for (let e of lyricLinesEl) {
     // 获取歌词行内容 (合并逐字歌词为一句)
@@ -99,15 +102,16 @@ const processLyricLanguage = () => {
 };
 
 // 切换歌曲时处理歌词语言
-watch(amLyricsData, () => {
-  nextTick(() => processLyricLanguage());
+watch(amLyricsData, (data) => {
+  if (data) nextTick(() => processLyricLanguage());
+});
+watch(lyricPlayerRef, (player) => {
+  if (player) nextTick(() => processLyricLanguage(player));
 });
 
 onMounted(() => {
   // 恢复进度
   resumeSeek();
-  // 处理歌词语言
-  nextTick(() => processLyricLanguage());
 });
 
 onBeforeUnmount(() => {