🌱 完善窗口处理，代码格式化

src-tauri/src/client.rs

@@ -2,45 +2,37 @@
 //! @desc 客户端模块，负责操作米游社客户端
 //! @since Beta v0.3.3
 
-use tauri::{AppHandle, Manager,WindowBuilder, WindowUrl};
+use tauri::{AppHandle, Manager, WindowBuilder, WindowUrl};
 use url::Url;
 
 // 获取米游社客户端入口地址
 fn get_mhy_client_url(func: String) -> WindowUrl {
-    let mut url_res: Url = "https://bbs.mihoyo.com/ys/".parse().unwrap();
+  let mut url_res: Url = "https://bbs.mihoyo.com/ys/".parse().unwrap();
-    if func == "sign_in" {
+  if func == "sign_in" {
-        url_res = "https://webstatic.mihoyo.com/bbs/event/signin-ys/index.html?act_id=e202009291139501".parse().unwrap();
+    url_res = "https://webstatic.mihoyo.com/bbs/event/signin-ys/index.html?act_id=e202009291139501"
-    } else if func == "game_record" {
+      .parse()
-        url_res = "https://webstatic.mihoyo.com/app/community-game-records/index.html".parse().unwrap();
+      .unwrap();
-    }
+  } else if func == "game_record" {
-    return WindowUrl::External(url_res);
+    url_res = "https://webstatic.mihoyo.com/app/community-game-records/index.html".parse().unwrap();
+  }
+  return WindowUrl::External(url_res);
 }
 
 // 操作米游社客户端
 #[tauri::command]
-pub async fn create_mhy_client(handle: AppHandle, func: String, arg: String) {
+pub async fn create_mhy_client(handle: AppHandle, func: String) {
-    dbg!(&arg);
+  let mut mhy_window_config = handle.config().tauri.windows.get(1).unwrap().clone();
-    let has_mhy_client = handle.get_window("mhy_client").is_some();
+  mhy_window_config.url = get_mhy_client_url(func.clone());
-    let mut mhy_client_config = handle.config().tauri.windows.get(1).unwrap().clone();
+  let has_mhy_client = handle.get_window("mhy_client").is_some();
-    mhy_client_config.url = get_mhy_client_url(func.clone());
+  if has_mhy_client {
-    let mhy_client;
+    return;
-    if has_mhy_client {
+  }
-        mhy_client = handle.get_window("mhy_client").unwrap();
+  let js_bridge = r#"
-        mhy_client.close().unwrap();
+          window.MiHoYoJSInterface = {
-    } else {
+            postMessage: function(arg) { window.__TAURI__.event.emit('post_mhy_client', arg) },
-        mhy_client = WindowBuilder::from_config(
+            closePage: function() { this.postMessage('{"method":"closePage"}') },
-                &handle,
+          };
-                mhy_client_config,
+      "#;
-            )
+  let mhy_client = WindowBuilder::from_config(&handle, mhy_window_config).build();
-            .build()
+  mhy_client.unwrap().eval(&js_bridge).ok().unwrap();
-            .unwrap();
+}
-        mhy_client.show().unwrap();
-        mhy_client.set_focus().unwrap();
-        let js_code = r#"
-            window.MiHoYoJSInterface = {
-              postMessage: function(arg) { window.__TAURI__.event.emit('post_mhy_client', arg) },
-              closePage: function() { this.postMessage('{"method":"closePage"}') },
-            };"#;
-        mhy_client.eval(&js_code).ok().unwrap();
-    }
-}

src-tauri/src/main.rs

@@ -1,3 +1,7 @@
+//! @file src/main.rs
+//! @desc 主模块，用于启动应用
+//! @since Beta v0.3.3
+
 // Prevents additional console window on Windows in release, DO NOT REMOVE!!
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
 
@@ -10,68 +14,77 @@ static mut DEEP_LINK_REGISTERED: bool = false;
 
 #[tauri::command]
 async fn init_app(app_handle: tauri::AppHandle) {
-    dbg!("init_app");
+  dbg!("init_app");
-    unsafe {
+  unsafe {
-        if APP_INITIALIZED == true && DEEP_LINK_REGISTERED == true {
+    if APP_INITIALIZED == true && DEEP_LINK_REGISTERED == true {
-            return;
+      return;
-        }
-    }
-    app_handle.emit_all("initApp", ()).unwrap();
-    unsafe {
-        APP_INITIALIZED = true;
     }
+  }
+  app_handle.emit_all("initApp", ()).unwrap();
+  unsafe {
+    APP_INITIALIZED = true;
+  }
 }
 
 #[tauri::command]
 async fn register_deep_link(app_handle: tauri::AppHandle) {
-    dbg!("register_deep_link");
+  dbg!("register_deep_link");
-    unsafe {
+  unsafe {
-        if DEEP_LINK_REGISTERED == true {
+    if DEEP_LINK_REGISTERED == true {
-            return;
+      return;
-        }
-    }
-    tauri_plugin_deep_link::register(
-        "teyvatguide",
-        move |request| {
-            dbg!(&request);
-            app_handle.emit_all("active_deep_link", request).unwrap();
-        },
-    )
-    .unwrap();
-    unsafe {
-        DEEP_LINK_REGISTERED = true;
     }
+  }
+  tauri_plugin_deep_link::register("teyvatguide", move |request| {
+    dbg!(&request);
+    app_handle.emit_all("active_deep_link", request).unwrap();
+  })
+  .unwrap();
+  unsafe {
+    DEEP_LINK_REGISTERED = true;
+  }
+}
+
+// 执行 js
+#[tauri::command]
+async fn execute_js(app_handle: tauri::AppHandle, label: String, js: String) {
+  let window = app_handle.get_window(&label).unwrap();
+  window.eval(&js).ok().unwrap();
 }
 
 fn main() {
-    tauri_plugin_deep_link::prepare("teyvatguide");
+  tauri_plugin_deep_link::prepare("teyvatguide");
-    tauri::Builder::default()
+  tauri::Builder::default()
-        .on_window_event(|event| {
+    .on_window_event(|event| {
-            match event.event() {
+      match event.event() {
-                tauri::WindowEvent::CloseRequested { api, .. } => {
+        tauri::WindowEvent::CloseRequested { api, .. } => {
-                    api.prevent_close();
+          api.prevent_close();
-                    let window = event.window().clone();
+          let window = event.window().clone();
-                    if window.label() == "TeyvatGuide" {
+          if window.label() == "TeyvatGuide" {
-                        // 子窗口 label 的数组
+            // 子窗口 label 的数组
-                        const SUB_WINDOW_LABELS: [&str; 3] = ["Sub_window", "Dev_JSON", "mhy_client"];
+            const SUB_WINDOW_LABELS: [&str; 3] = ["Sub_window", "Dev_JSON", "mhy_client"];
-                        for label in SUB_WINDOW_LABELS.iter() {
+            for label in SUB_WINDOW_LABELS.iter() {
-                            let sub = window.get_window(label).unwrap();
+              let sub = window.get_window(label).unwrap();
-                            sub.close().unwrap();
+              sub.close().unwrap();
-                        }
-                    }
-                    window.close().unwrap();
-                },
-                _ => {}
             }
-        })
+          }
-        .plugin(tauri_plugin_sql::Builder::default().build())
+          window.close().unwrap();
-        .invoke_handler(tauri::generate_handler![register_deep_link, init_app, client::create_mhy_client])
+        }
-        .setup(|_app| {
+        _ => {}
-            let _window = _app.get_window("TeyvatGuide").unwrap();
+      }
-            #[cfg(debug_assertions)] // only include this code on debug builds
+    })
-                _window.open_devtools(); // open the devtools on startup
+    .plugin(tauri_plugin_sql::Builder::default().build())
-            Ok(())
+    .invoke_handler(tauri::generate_handler![
-        })
+      register_deep_link,
-        .run(tauri::generate_context!())
+      init_app,
-        .expect("error while running tauri application");
+      execute_js,
+      client::create_mhy_client,
+    ])
+    .setup(|_app| {
+      let _window = _app.get_window("TeyvatGuide").unwrap();
+      #[cfg(debug_assertions)] // only include this code on debug builds
+      _window.open_devtools(); // open the devtools on startup
+      Ok(())
+    })
+    .run(tauri::generate_context!())
+    .expect("error while running tauri application");
 }

src/components/hutaoAbyss/hta-tab-team.vue

@@ -104,14 +104,13 @@ onMounted(async () => {
 
 .hta-tuf-box {
   display: flex;
+  overflow: hidden auto;
   width: 100%;
   max-height: 100%;
   flex-direction: column;
   align-items: center;
   justify-content: center;
   border-radius: 5px;
-  overflow-x: hidden;
-  overflow-y: auto;
   row-gap: 10px;
 }
 

src/pages/common/Test.vue

@@ -41,7 +41,7 @@ async function getGC(): Promise<void> {
 }
 
 async function tryNewWindow(): Promise<void> {
-  await mhyClient.open("game_record", "test");
+  await mhyClient.open("game_record");
 }
 </script>
 <style lang="css" scoped>

src/utils/TGClient.ts

@@ -1,11 +1,14 @@
 /**
  * @file utils/TGClient.ts
  * @desc 负责米游社客户端的 callback 处理
- * @since Beta v0.3.3
+ * @since Beta v0.3.4
  */
 
 import { event, invoke } from "@tauri-apps/api";
 import type { Event } from "@tauri-apps/api/event";
+import { WebviewWindow } from "@tauri-apps/api/window";
+
+import TGSqlite from "../plugins/Sqlite";
 
 // 正常 arg 参数
 interface NormalArg {
@@ -14,9 +17,14 @@ interface NormalArg {
   callback: string;
 }
 
+// invoke 参数
+interface InvokeArg {
+  func: string;
+}
+
 /**
  * @class TGClient
- * @since Beta v0.3.3
+ * @since Beta v0.3.4
  * @description 米游社客户端
  */
 class TGClient {
@@ -27,53 +35,106 @@ class TGClient {
    * @memberof TGClient
    */
   private listener: any;
+
+  /**
+   * @private 窗口实例
+   * @since Beta v0.3.4
+   * @type {WebviewWindow}
+   * @memberof TGClient
+   */
+  private window: WebviewWindow | null;
+
+  /**
+   * @constructor
+   * @since Beta v0.3.4
+   * @description 构造函数
+   * @memberof TGClient
+   */
+  constructor() {
+    try {
+      this.window = WebviewWindow.getByLabel("mhy_client");
+    } catch (error) {
+      this.window = null;
+    }
+  }
+
   /**
    * @func run
-   * @since Beta v0.3.3
+   * @since Beta v0.3.4
    * @desc 运行米游社客户端
    * @returns {void} - 无返回值
    */
   async run(): Promise<void> {
     if (this.listener === undefined) {
-      this.listener = await event.listen("post_mhy_client", (arg: Event<string>) => {
+      this.listener = await event.listen("post_mhy_client", async (arg: Event<string>) => {
-        this.handleCallback(arg);
+        await this.handleCallback(arg);
       });
-    } else {
-      console.log("已经监听了");
     }
   }
 
   /**
    * @func open
-   * @since Beta v0.3.3
+   * @since Beta v0.3.4
    * @desc 打开米游社客户端
    * @param {string} func - 方法名
-   * @param {string} params - 参数
    * @returns {void} - 无返回值
    */
-  async open(func: string, params: string): Promise<void> {
+  async open(func: string): Promise<void> {
-    await invoke("create_mhy_client", { func, arg: params });
+    if (this.window !== null) {
+      await this.window.close();
+    }
+    await invoke<InvokeArg>("create_mhy_client", { func });
+    this.window = WebviewWindow.getByLabel("mhy_client");
+    await this.window?.show();
   }
 
   /**
    * @func handleCallback
-   * @since Beta v0.3.3
+   * @since Beta v0.3.4
    * @desc 处理米游社客户端的 callback
    * @param {Event<string>} arg - 事件参数
    * @returns {any} - 返回值
    */
-  handleCallback(arg: Event<string>): any {
+  async handleCallback(arg: Event<string>): Promise<any> {
     console.log(`[${arg.windowLabel}] ${arg.payload}`);
     const { method, payload, callback } = <NormalArg>JSON.parse(arg.payload);
     console.log(method, payload, callback);
     switch (method) {
       case "getStatusBarHeight":
-        return 0;
+        this.getStatusBarHeight(callback);
+        break;
       case "getCookieInfo":
-        this.getCookieInfo(callback);
+        await this.getCookieInfo(callback);
+        break;
     }
   }
 
+  /**
+   * @func callback
+   * @since Beta v0.3.4
+   * @desc 回调函数
+   * @param {string} callback - 回调函数名
+   * @param {string} payload - 回调函数参数
+   * @returns {void} - 无返回值
+   */
+  async callback(callback: string, payload?: string): Promise<void> {
+    const js = `javascript:mhyWebBridge("${callback}", ${payload ?? ""})`;
+    await invoke("create_mhy_client");
+    await invoke("execute_js", { label: "mhy_client", js });
+  }
+
+  /**
+   * @func getStatusBarHeight
+   * @since Beta v0.3.4
+   * @desc 获取状态栏高度
+   * @param {string} callback - 回调函数名
+   * @returns {void} - 无返回值
+   */
+  getStatusBarHeight(callback: string): void {
+    console.log("getStatusBarHeight");
+    console.log(callback);
+  }
+
   /**
    * @func getCookieInfo
    * @since Beta v0.3.3
@@ -81,9 +142,10 @@ class TGClient {
    * @param {string} callback - 回调函数名
    * @returns {void} - 无返回值
    */
-  getCookieInfo(callback: string): void {
+  async getCookieInfo(callback: string): Promise<void> {
     console.log("getCookieInfo");
-    console.log(callback);
+    const cookie = await TGSqlite.getCookie();
+    await this.callback(callback, JSON.stringify(cookie));
   }
 }
 

tsconfig.json

@@ -20,9 +20,9 @@
     ".yml",
     "package.json",
     "src/**/*.d.ts",
-    "src/data/**/*.json",
     "src/**/*.ts",
     "src/**/*.vue",
+    "src/data/**/*.json",
     "tsconfig.json",
     "vite.config.ts"
   ]