Merge pull request #5 from SPlayer-Dev/lyric-land

feat: 灵动岛歌词

Author: imsyy

electron.vite.config.ts

@@ -51,6 +51,7 @@ export default defineConfig({
         input: {
           index: resolve(__dirname, "index.html"),
           "desktop-lyric": resolve(__dirname, "windows/desktop-lyric/index.html"),
+          "dynamic-island": resolve(__dirname, "windows/dynamic-island/index.html"),
         },
       },
     },

electron/main/ipc/config.ts

@@ -11,6 +11,9 @@ import {
   setTaskbarProgress,
   applyDesktopLyricLock,
   applyDesktopLyricAlwaysOnTop,
+  applyDynamicIslandAlwaysOnTop,
+  applyDynamicIslandSnapCentered,
+  applyDynamicIslandNonOcclusive,
 } from "@main/window";
 import { broadcast } from "@main/utils/broadcast";
 
@@ -37,11 +40,24 @@ const applyConfigChange = (keyPath: string, value: unknown): void => {
     case "desktopLyric.alwaysOnTop":
       applyDesktopLyricAlwaysOnTop(value as boolean);
       break;
+    case "dynamicIsland.alwaysOnTop":
+      applyDynamicIslandAlwaysOnTop(value as boolean);
+      break;
+    case "dynamicIsland.snapCentered":
+      applyDynamicIslandSnapCentered(value as boolean);
+      break;
+    case "dynamicIsland.nonOcclusive":
+      applyDynamicIslandNonOcclusive(value as boolean);
+      break;
   }
   // 桌面歌词配置变更广播到所有窗口
   if (keyPath.startsWith("desktopLyric.")) {
     broadcast("desktopLyric:configChange", store.get("desktopLyric"));
   }
+  // 灵动岛配置变更广播到所有窗口
+  if (keyPath.startsWith("dynamicIsland.")) {
+    broadcast("dynamicIsland:configChange", store.get("dynamicIsland"));
+  }
 };
 
 /** 注册配置相关 IPC */

electron/main/ipc/window.ts

@@ -1,4 +1,5 @@
 import { ipcMain } from "electron";
+import { store } from "@main/store";
 import {
   toggleDesktopLyricWindow,
   closeDesktopLyricWindow,
@@ -7,6 +8,13 @@ import {
   applyDesktopLyricMouseIgnore,
   moveDesktopLyricWindow,
   saveDesktopLyricState,
+  toggleDynamicIslandWindow,
+  closeDynamicIslandWindow,
+  getDynamicIslandWindow,
+  moveDynamicIslandWindow,
+  saveDynamicIslandState,
+  applyDynamicIslandWidth,
+  applyDynamicIslandHeight,
 } from "@main/window";
 
 /** 窗口管理 IPC */
@@ -39,4 +47,39 @@ export const registerWindowIpc = (): void => {
   ipcMain.on("desktopLyric:saveState", () => {
     saveDesktopLyricState();
   });
+
+  // 切换灵动岛窗口
+  ipcMain.handle("window:toggleDynamicIsland", () => toggleDynamicIslandWindow());
+
+  // 关闭灵动岛窗口
+  ipcMain.handle("window:closeDynamicIsland", () => closeDynamicIslandWindow());
+
+  // 查询灵动岛窗口是否打开
+  ipcMain.handle("window:isDynamicIslandOpen", () => !!getDynamicIslandWindow());
+
+  // 灵动岛拖拽移动
+  ipcMain.on("dynamicIsland:move", (_event, x: number, y: number) => {
+    moveDynamicIslandWindow(x, y);
+  });
+
+  // 灵动岛拖拽结束：主进程判定吸附并持久化
+  ipcMain.on("dynamicIsland:saveState", () => {
+    saveDynamicIslandState();
+  });
+
+  // 灵动岛宽度变化：渲染端上报目标宽度
+  ipcMain.on("dynamicIsland:resize", (_event, width: number) => {
+    applyDynamicIslandWidth(width);
+  });
+
+  // 灵动岛高度变化
+  ipcMain.on("dynamicIsland:setHeight", (_event, height: number) => {
+    applyDynamicIslandHeight(height);
+  });
+
+  // 灵动岛查询当前吸附模式（HMR 后渲染端主动拉取）
+  ipcMain.handle("dynamicIsland:getMode", () => {
+    const saved = store.get("windowStates.dynamicIsland");
+    return saved.mode === "floating" ? "floating" : "snapped";
+  });
 };

electron/main/services/thumbar.ts

@@ -3,7 +3,6 @@ import { broadcast } from "@main/utils/broadcast";
 import { loadThemedIcon } from "@main/utils/icon";
 import { t } from "@main/utils/i18n";
 import { thumbarLog } from "@main/utils/logger";
-import { getMainWindow } from "@main/window/main";
 
 export interface Thumbar {
   clearThumbar(): void;
@@ -88,10 +87,8 @@ class ThumbarImpl implements Thumbar {
 }
 
 /** 初始化缩略图工具栏 */
-export const initThumbar = (): Thumbar | null => {
+export const initThumbar = (win: BrowserWindow): Thumbar | null => {
   if (process.platform !== "win32") return null;
-  const win = getMainWindow();
-  if (!win) return null;
   try {
     thumbarLog.info("初始化缩略图工具栏");
     thumbar = new ThumbarImpl(win);

electron/main/services/tray.ts

@@ -5,7 +5,7 @@ import { appName } from "@main/utils/config";
 import { loadIcon, loadThemedIcon } from "@main/utils/icon";
 import { t } from "@main/utils/i18n";
 import { trayLog } from "@main/utils/logger";
-import { toggleDesktopLyricWindow, focusMainWindow } from "@main/window";
+import { toggleDesktopLyricWindow, toggleDynamicIslandWindow, focusMainWindow } from "@main/window";
 
 type PlayState = "playing" | "paused";
 
@@ -15,6 +15,7 @@ let songName = "";
 let repeatMode: RepeatMode = "list";
 let shuffleMode: ShuffleMode = "off";
 let desktopLyricOpen = false;
+let dynamicIslandOpen = false;
 
 const repeatLabel = (mode: RepeatMode): string =>
   ({ list: t("repeatList"), one: t("repeatOne"), off: t("repeatOff") })[mode];
@@ -107,6 +108,11 @@ const buildMenu = (): Menu => {
       icon: menuIcon("lyric"),
       click: () => toggleDesktopLyricWindow(),
     },
+    {
+      label: dynamicIslandOpen ? t("closeDynamicIsland") : t("openDynamicIsland"),
+      icon: menuIcon("lyric"),
+      click: () => toggleDynamicIslandWindow(),
+    },
     { type: "separator" },
     {
       label: t("quit"),
@@ -184,6 +190,13 @@ export const setTrayDesktopLyric = (open: boolean): void => {
   refreshTray();
 };
 
+/** 同步灵动岛窗口开关状态到托盘 */
+export const setTrayDynamicIsland = (open: boolean): void => {
+  if (dynamicIslandOpen === open) return;
+  dynamicIslandOpen = open;
+  refreshTray();
+};
+
 /** 销毁托盘 */
 export const destroyTray = (): void => {
   tray?.destroy();

electron/main/utils/i18n.ts

@@ -12,6 +12,8 @@ interface MainMessages {
   repeatOff: string;
   openDesktopLyric: string;
   closeDesktopLyric: string;
+  openDynamicIsland: string;
+  closeDynamicIsland: string;
   quit: string;
 }
 
@@ -28,6 +30,8 @@ const messages: Record<LocaleCode, MainMessages> = {
     repeatOff: "不循环",
     openDesktopLyric: "开启桌面歌词",
     closeDesktopLyric: "关闭桌面歌词",
+    openDynamicIsland: "开启灵动岛",
+    closeDynamicIsland: "关闭灵动岛",
     quit: "退出",
   },
   "en-US": {
@@ -42,6 +46,8 @@ const messages: Record<LocaleCode, MainMessages> = {
     repeatOff: "No Repeat",
     openDesktopLyric: "Open Desktop Lyric",
     closeDesktopLyric: "Close Desktop Lyric",
+    openDynamicIsland: "Open Dynamic Island",
+    closeDynamicIsland: "Close Dynamic Island",
     quit: "Quit",
   },
 };