Fix: 初次登录托盘状态错误

KiWi233333 · Nov 9, 2024 · 7d7c897 · 7d7c897
1 parent 1974cbc
commit 7d7c897
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/composables/tauri/window.ts b/composables/tauri/window.ts
@@ -27,8 +27,6 @@ export async function useFlashTray() {
   const onlineUrl = await resolveResource("./res/online.png");
   const offlineUrl = await resolveResource("./res/offline.png");
   const msgUrl = await resolveResource("./res/msg.png");
-  console.log("tray icon urls", onlineUrl, offlineUrl, msgUrl);
-
   async function setTrayIcon(icon: string | null) {
     const tray = await TrayIcon.getById(TrayIconId).catch((err) => {
       console.error("获取托盘图标失败", err);
@@ -73,6 +71,12 @@ export async function useFlashTray() {
     }
   };
 
+  watch(activeIcon, (newVal, oldVal) => {
+    if (newVal === oldVal)
+      return;
+    setTrayIcon(newVal);
+  }, { immediate: true });
+
   return {
     iconUrl,
     onlineUrl,

diff --git a/init/init.ts b/init/init.ts
@@ -145,7 +145,7 @@ export async function useMsgBoxWebViewInit() {
     immediate: true,
     debounce: 300,
   });
-  watch(() => user.isLogin, async (newVal, oldVal) => {
+  watch(() => user.isLogin, (newVal, oldVal) => {
     activeIcon.value = newVal ? onlineUrl : offlineUrl;
   }, {
     immediate: true,