From d5ec4b1b0e84ce02a61cc23e9ca418b2a2b77d8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=9B=AE=E6=A3=83?= <BT-Muli@outlook.com>
Date: Sat, 7 Dec 2024 19:13:32 +0800
Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E7=AA=97=E5=8F=A3=E6=98=BE=E7=A4=BA=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue           | 71 +++++++++++++++++++++----------------------
 src/utils/TGWindow.ts |  4 +--
 src/views/t-post.vue  |  3 +-
 3 files changed, 37 insertions(+), 41 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 535800cc..9a337036 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -3,9 +3,7 @@
     <TSidebar v-if="isMain" />
     <v-main>
       <v-container :fluid="true" class="app-container">
-        <Suspense>
-          <router-view />
-        </Suspense>
+        <router-view />
       </v-container>
     </v-main>
     <TBackTop />
@@ -13,9 +11,10 @@
 </template>
 
 <script lang="ts" setup>
-import { app, core, event, webviewWindow, window as TauriWindow } from "@tauri-apps/api";
+import { app, core, event, webviewWindow } from "@tauri-apps/api";
 import { PhysicalSize } from "@tauri-apps/api/dpi";
 import { Event, UnlistenFn } from "@tauri-apps/api/event";
+import { currentMonitor, getCurrentWindow } from "@tauri-apps/api/window";
 import { mkdir } from "@tauri-apps/plugin-fs";
 import { storeToRefs } from "pinia";
 import { computed, onBeforeMount, onMounted, onUnmounted, ref } from "vue";
@@ -33,18 +32,17 @@ import { getBuildTime } from "./utils/TGBuild.js";
 import TGLogger from "./utils/TGLogger.js";
 import OtherApi from "./web/request/otherReq.js";
 
-const appStore = useAppStore();
 const router = useRouter();
+const { theme, needResize, deviceInfo, isLogin, userDir, buildTime } = storeToRefs(useAppStore());
 const { uid, briefInfo, account, cookie } = storeToRefs(useUserStore());
 const isMain = ref<boolean>(false);
-const theme = ref<string>(appStore.theme);
-const vuetifyTheme = computed<string>(() => (appStore.theme === "dark" ? "dark" : "light"));
+const vuetifyTheme = computed<string>(() => (theme.value === "dark" ? "dark" : "light"));
 
 let themeListener: UnlistenFn | null = null;
 let urlListener: UnlistenFn | null = null;
 
 onBeforeMount(async () => {
-  const win = webviewWindow.getCurrentWebviewWindow();
+  const win = getCurrentWindow();
   isMain.value = win.label === "TeyvatGuide";
   if (isMain.value) {
     const title = "Teyvat Guide v" + (await app.getVersion()) + " Beta";
@@ -53,17 +51,28 @@ onBeforeMount(async () => {
     await core.invoke("init_app");
     urlListener = await getDeepLink();
   }
-  if (appStore.needResize !== "false") await checkResize();
-  await win.show();
+  if (needResize.value !== "false") await checkResize();
+  document.documentElement.className = theme.value;
+});
+
+onMounted(async () => {
+  await getCurrentWindow().show();
+  themeListener = await event.listen("readTheme", async (e: Event<string>) => {
+    const themeGet = e.payload;
+    if (theme.value !== themeGet) {
+      theme.value = themeGet;
+      document.documentElement.className = theme.value;
+    }
+  });
 });
 
 async function checkResize(): Promise<void> {
-  const screen = await TauriWindow.currentMonitor();
+  const screen = await currentMonitor();
   if (screen === null) {
     showSnackbar.error("获取屏幕信息失败！", 3000);
     return;
   }
-  const windowCur = await webviewWindow.getCurrentWebviewWindow();
+  const windowCur = webviewWindow.getCurrentWebviewWindow();
   if (await windowCur.isMaximized()) return;
   const designSize = getSize(windowCur.label);
   const widthScale = screen.size.width / 1920;
@@ -85,17 +94,6 @@ function getSize(label: string): PhysicalSize {
   return new PhysicalSize(1280, 720);
 }
 
-onMounted(async () => {
-  document.documentElement.className = theme.value;
-  themeListener = await event.listen("readTheme", async (e: Event<string>) => {
-    const themeGet = e.payload;
-    if (theme.value !== themeGet) {
-      theme.value = themeGet;
-      document.documentElement.className = theme.value;
-    }
-  });
-});
-
 // 启动后只执行一次的监听
 function listenOnInit(): void {
   console.info("[App][listenOnInit] 监听初始化事件！");
@@ -129,35 +127,34 @@ async function checkAppLoad(): Promise<void> {
 // 检测 deviceFp
 async function checkDeviceFp(): Promise<void> {
   const appData = await TGSqlite.getAppData();
-  const deviceLocal = appStore.deviceInfo;
   const deviceFind = appData.find((item) => item.key === "deviceInfo");
   if (typeof deviceFind === "undefined") {
-    if (deviceLocal.device_fp === "0000000000000") {
-      appStore.deviceInfo = await OtherApi.fp(appStore.deviceInfo);
+    if (deviceInfo.value.device_fp === "0000000000000") {
+      deviceInfo.value = await OtherApi.fp(deviceInfo.value);
     }
-    await TGSqlite.saveAppData("deviceInfo", JSON.stringify(deviceLocal));
+    await TGSqlite.saveAppData("deviceInfo", JSON.stringify(deviceInfo.value));
     return;
   }
-  if (JSON.parse(deviceFind.value) !== deviceLocal) {
-    appStore.deviceInfo = JSON.parse(deviceFind.value);
+  if (JSON.parse(deviceFind.value) !== deviceInfo.value) {
+    deviceInfo.value = JSON.parse(deviceFind.value);
   }
 }
 
 async function checkUserLoad(): Promise<void> {
   // 检测用户数据目录
   const appData = await TGSqlite.getAppData();
-  const userDir = appData.find((item) => item.key === "userDir")?.value;
-  if (typeof userDir === "undefined") await TGSqlite.saveAppData("userDir", appStore.userDir);
-  else if (userDir !== appStore.userDir) appStore.userDir = userDir;
-  await mkdir(appStore.userDir, { recursive: true });
+  const userDirGet = appData.find((item) => item.key === "userDir")?.value;
+  if (typeof userDirGet === "undefined") await TGSqlite.saveAppData("userDir", userDir.value);
+  else if (userDirGet !== userDir.value) userDir.value = userDirGet;
+  await mkdir(userDir.value, { recursive: true });
   // 检测用户数据
   const uidDB = await TSUserAccount.account.getAllUid();
-  if (uidDB.length === 0 && appStore.isLogin) {
+  if (uidDB.length === 0 && isLogin.value) {
     showSnackbar.warn("未检测到可用UID，请重新登录！");
-    appStore.isLogin = false;
+    isLogin.value = false;
     return;
   }
-  if (!appStore.isLogin) appStore.isLogin = true;
+  if (!isLogin.value) isLogin.value = true;
   // 然后获取最近的UID
   if (uid.value === undefined || !uidDB.includes(uid.value)) {
     uid.value = uidDB[0];
@@ -252,7 +249,7 @@ async function checkUpdate(): Promise<void> {
       showSnackbar.error("请到设置页手动更新数据库！", 3000);
       return;
     }
-    appStore.buildTime = getBuildTime();
+    buildTime.value = getBuildTime();
     await TGSqlite.update();
     showSnackbar.success("数据库已更新！", 3000);
     window.open("https://app.btmuli.ink/docs/TeyvatGuide/changelogs.html");
diff --git a/src/utils/TGWindow.ts b/src/utils/TGWindow.ts
index 7bffd9cd..2b11c218 100644
--- a/src/utils/TGWindow.ts
+++ b/src/utils/TGWindow.ts
@@ -66,9 +66,7 @@ export async function createPost(
   }
   const postPath = `/post_detail/${postId}`;
   await createTGWindow(postPath, "Sub_window", postTitle, 960, 720, false, false);
-  TGLogger.Info(`[createPost][${postId}] 打开帖子`).catch((err) => {
-    console.error(err);
-  });
+  await TGLogger.Info(`[createPost][${postId}] 打开帖子`);
 }
 
 /**
diff --git a/src/views/t-post.vue b/src/views/t-post.vue
index 06069e26..c33d05a6 100644
--- a/src/views/t-post.vue
+++ b/src/views/t-post.vue
@@ -105,7 +105,7 @@ import TGLogger from "../utils/TGLogger.js";
 import { createTGWindow } from "../utils/TGWindow.js";
 import TGConstant from "../web/constant/TGConstant.js";
 
-const appVersion = await app.getVersion();
+const appVersion = ref<string>();
 const postId = Number(useRoute().params.post_id);
 const showCollection = ref<boolean>(false);
 const shareTime = ref<number>(Math.floor(Date.now() / 1000));
@@ -121,6 +121,7 @@ function getGameIcon(gameId: number): string {
 }
 
 onMounted(async () => {
+  appVersion.value = await app.getVersion();
   showLoading.start(`正在加载帖子数据...`);
   // 检查数据
   if (!postId) {