From 7120745211cd63d32b893a36a8d172dce5f5cc08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=9B=AE=E6=A3=83?= <BT-Muli@outlook.com>
Date: Fri, 2 Feb 2024 17:29:27 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20=E4=BF=AE=E5=A4=8D=E5=A4=96?=
 =?UTF-8?q?=E9=83=A8=E5=94=A4=E8=B5=B7=E5=A4=B1=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                       | 13 ++++++++-----
 src/pages/common/Achievements.vue |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index c600d7ce..f56eddd7 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -12,6 +12,7 @@
 
 <script lang="ts" setup>
 import { app, event, fs, tauri, window as TauriWindow } from "@tauri-apps/api";
+import { UnlistenFn } from "@tauri-apps/api/helpers/event";
 import { storeToRefs } from "pinia";
 import { computed, onBeforeMount, onMounted, onUnmounted, ref } from "vue";
 import { useRouter } from "vue-router";
@@ -36,7 +37,8 @@ const vuetifyTheme = computed(() => {
   return appStore.theme === "dark" ? "dark" : "light";
 });
 
-let themeListener: () => void;
+let themeListener: UnlistenFn;
+let urlListener: UnlistenFn;
 
 onBeforeMount(async () => {
   const win = TauriWindow.getCurrent();
@@ -46,6 +48,7 @@ onBeforeMount(async () => {
     await win.setTitle(title);
     await listenOnInit();
     await tauri.invoke("init_app");
+    urlListener = await getDeepLink();
   }
 });
 
@@ -64,7 +67,6 @@ onMounted(async () => {
 async function listenOnInit(): Promise<void> {
   await event.listen("initApp", async () => {
     await tauri.invoke("register_deep_link");
-    await getDeepLink();
     await checkAppLoad();
     await checkDeviceFp();
     try {
@@ -164,8 +166,8 @@ async function checkUserLoad(): Promise<void> {
   await fs.createDir(appStore.userDir, { recursive: true });
 }
 
-async function getDeepLink(): Promise<void> {
-  await event.listen("active_deep_link", async (e) => {
+async function getDeepLink(): Promise<UnlistenFn> {
+  return await event.listen("active_deep_link", async (e) => {
     const windowGet = new TauriWindow.WebviewWindow("TeyvatGuide");
     if (await windowGet.isMinimized()) {
       await windowGet.unminimize();
@@ -229,7 +231,8 @@ async function checkUpdate(): Promise<void> {
 }
 
 onUnmounted(() => {
-  themeListener();
+  if (themeListener) themeListener();
+  if (urlListener) urlListener();
 });
 </script>
 <style lang="css">
diff --git a/src/pages/common/Achievements.vue b/src/pages/common/Achievements.vue
index 7fce8555..152d7cf1 100644
--- a/src/pages/common/Achievements.vue
+++ b/src/pages/common/Achievements.vue
@@ -172,7 +172,7 @@ async function switchHideFin() {
   });
   if (!res) {
     showSnackbar({
-      color: "warn",
+      color: "cancel",
       text: "已取消切换",
     });
     return;