♻️ 初步更改，cargo build

2025-12-12 09:18:14 +08:00 · 2024-07-02 19:29:24 +08:00
parent ac63baed2c
commit 1214501691
16 changed files with 5679 additions and 1602 deletions
--- a/src-tauri/src/client/menu.rs
+++ b/src-tauri/src/client/menu.rs
@@ -1,11 +1,13 @@
 //! @file src/client/menu.rs
 //! @desc 客户端菜单模块，负责操作米游社客户端菜单
-//! @since Beta v0.4.5
+//! @since Beta v0.4.10

-use tauri::{AppHandle, CustomMenuItem, LogicalSize, Manager, Menu, Size, Submenu, WindowUrl};
+use tauri::menu::{Menu, MenuBuilder, MenuEvent, MenuItemBuilder, Submenu, SubmenuBuilder};
+use tauri::{AppHandle, LogicalSize, Manager, Size, Window, Wry};
+use tauri_utils::config::WebviewUrl;
 use url::Url;

-pub fn get_mhy_client_url(func: String) -> WindowUrl {
+pub fn get_mhy_client_url(func: String) -> WebviewUrl {
  let mut url_res: Url = "https://bbs.mihoyo.com/ys/".parse().unwrap();
  if func == "sign_in" {
    url_res = "https://webstatic.mihoyo.com/bbs/event/signin-ys/index.html?act_id=e202009291139501"
@@ -13,82 +15,87 @@ pub fn get_mhy_client_url(func: String) -> WindowUrl {
      .unwrap();
  } else if func == "game_record" {
    url_res =
-      "https://webstatic.mihoyo.com/app/community-game-records/index.html?bbs_presentation_style=fullscreen".parse().unwrap();
+            "https://webstatic.mihoyo.com/app/community-game-records/index.html?bbs_presentation_style=fullscreen".parse().unwrap();
  } else if func == "birthday" {
    url_res = "https://webstatic.mihoyo.com/ys/event/e20220303-birthday/index.html?activity_id=20220301153521"
-        .parse()
-        .unwrap();
+            .parse()
+            .unwrap();
  }
-  return WindowUrl::External(url_res);
+  return WebviewUrl::External(url_res);
 }

 // 创建子菜单-工具
-fn create_utils_menu() -> Menu {
-  let retry_bridge = CustomMenuItem::new("retry".to_string(), "重试桥接");
-  let mock_touch = CustomMenuItem::new("mock_touch".to_string(), "模拟触摸");
-  let remove_overlay = CustomMenuItem::new("remove_overlay".to_string(), "移除遮罩");
-  let rotate_window = CustomMenuItem::new("rotate_window".to_string(), "旋转窗口");
-  let switch_ua = CustomMenuItem::new("switch_ua".to_string(), "切换 UA");
-  return Menu::new()
-    .add_item(retry_bridge)
-    .add_item(mock_touch)
-    .add_item(remove_overlay)
-    .add_item(rotate_window);
+fn create_utils_menu(app: AppHandle) -> Submenu<Wry> {
+  let retry_bridge_submenu = MenuItemBuilder::with_id("retry", "重试桥接").build(&app).unwrap();
+  let mock_touch_submenu = MenuItemBuilder::with_id("mock_touch", "模拟触摸").build(&app).unwrap();
+  let remove_overlay_submenu =
+    MenuItemBuilder::with_id("remove_overlay", "移除遮罩").build(&app).unwrap();
+  let rotate_window_submenu =
+    MenuItemBuilder::with_id("rotate_window", "旋转窗口").build(&app).unwrap();
+  let utils_menu = SubmenuBuilder::new(&app, "工具")
+    .item(&retry_bridge_submenu)
+    .item(&mock_touch_submenu)
+    .item(&remove_overlay_submenu)
+    .item(&rotate_window_submenu)
+    .build()
+    .expect("failed to create utils_menu");
+  return utils_menu;
 }

 // 创建米游社客户端菜单
-pub fn create_mhy_menu(func: String) -> Menu {
-  let top = CustomMenuItem::new("top".to_string(), "置顶");
-  let cancel_top = CustomMenuItem::new("cancel_top".to_string(), "取消置顶");
-  let sign_in = CustomMenuItem::new("sign_in".to_string(), "用户登录");
-  let open_post = CustomMenuItem::new("open_post".to_string(), "打开帖子");
-  let utils_menu = Submenu::new("工具".to_string(), create_utils_menu());
+pub fn create_mhy_menu(func: String, app: AppHandle) -> Menu<Wry> {
+  let top_menu = MenuItemBuilder::with_id("top", "置顶").build(&app).unwrap();
+  let cancel_top_menu = MenuItemBuilder::with_id("cancel_top", "取消置顶").build(&app).unwrap();
+  let sign_in_menu = MenuItemBuilder::with_id("sign_in", "用户登录").build(&app).unwrap();
+  let open_post_menu = MenuItemBuilder::with_id("open_post", "打开帖子").build(&app).unwrap();
+  let utils_menu = create_utils_menu(app.clone());
  // 如果是登录
  if func == "config_sign_in" {
-    return Menu::new().add_item(sign_in);
+    return MenuBuilder::new(&app).item(&sign_in_menu).build().expect("failed to create mhy_menu");
  }
-  return Menu::new()
-    .add_item(top)
-    .add_item(cancel_top)
-    .add_item(open_post)
-    .add_submenu(utils_menu);
+  return MenuBuilder::new(&app)
+    .item(&top_menu)
+    .item(&cancel_top_menu)
+    .item(&open_post_menu)
+    .item(&utils_menu)
+    .build()
+    .expect("failed to create mhy_menu");
 }

 // 菜单栏事件处理
-pub fn handle_menu_event(app_handle: AppHandle, event: tauri::MenuEvent) {
-  match event.menu_item_id() {
-    "top" => handle_menu_top(app_handle),
-    "cancel_top" => handle_menu_cancel_top(app_handle),
-    "sign_in" => handle_menu_sign_in(app_handle),
-    "open_post" => handle_menu_open_post(app_handle),
-    "retry" => handle_menu_retry(app_handle),
-    "mock_touch" => handle_menu_mock_touch(app_handle),
-    "remove_overlay" => handle_menu_remove_overlay(app_handle),
-    "rotate_window" => handle_menu_rotate_window(app_handle),
-    "switch_ua" => handle_menu_switch_ua(app_handle),
+pub fn handle_menu_event(window: &Window, event: MenuEvent) {
+  match event.id.as_ref() {
+    "top" => handle_menu_top(window),
+    "cancel_top" => handle_menu_cancel_top(window),
+    "sign_in" => handle_menu_sign_in(window),
+    "open_post" => handle_menu_open_post(window),
+    "retry" => handle_menu_retry(window),
+    "mock_touch" => handle_menu_mock_touch(window),
+    "remove_overlay" => handle_menu_remove_overlay(window),
+    "rotate_window" => handle_menu_rotate_window(window),
    _ => {}
  }
 }

 // 处理置顶菜单
-fn handle_menu_top(app_handle: AppHandle) {
-  let window = app_handle.get_window("mhy_client");
+fn handle_menu_top(app_handle: &Window) {
+  let window = app_handle.get_webview_window("mhy_client");
  if window.is_some() {
    window.unwrap().set_always_on_top(true).unwrap();
  }
 }

 // 处理取消置顶菜单
-fn handle_menu_cancel_top(app_handle: AppHandle) {
-  let window = app_handle.get_window("mhy_client");
+fn handle_menu_cancel_top(app_handle: &Window) {
+  let window = app_handle.get_webview_window("mhy_client");
  if window.is_some() {
    window.unwrap().set_always_on_top(false).unwrap();
  }
 }

 // 处理用户登录菜单
-fn handle_menu_sign_in(app_handle: AppHandle) {
-  let window = app_handle.get_window("mhy_client");
+fn handle_menu_sign_in(app_handle: &Window) {
+  let window = app_handle.get_webview_window("mhy_client");
  let execute_js = r#"
  javascript:(async function(){
    // 首先检测是不是 user.mihoyo.com
@@ -110,8 +117,8 @@ fn handle_menu_sign_in(app_handle: AppHandle) {
 }

 // 处理打开帖子菜单
-fn handle_menu_open_post(app_handle: AppHandle) {
-  let window = app_handle.get_window("mhy_client");
+fn handle_menu_open_post(app_handle: &Window) {
+  let window = app_handle.get_webview_window("mhy_client");
  let execute_js = r#"
  javascript:(async function(){
    let url = new URL(window.location.href);
@@ -150,8 +157,8 @@ fn handle_menu_open_post(app_handle: AppHandle) {
 }

 // 处理重试桥接菜单
-fn handle_menu_retry(app_handle: AppHandle) {
-  let window = app_handle.get_window("mhy_client");
+fn handle_menu_retry(app_handle: &Window) {
+  let window = app_handle.get_webview_window("mhy_client");
  let execute_js = r#"
  javascript:(async function(){
    const arg = {
@@ -165,8 +172,8 @@ fn handle_menu_retry(app_handle: AppHandle) {
 }

 // 处理模拟触摸菜单
-fn handle_menu_mock_touch(app_handle: AppHandle) {
-  let window = app_handle.get_window("mhy_client");
+fn handle_menu_mock_touch(app_handle: &Window) {
+  let window = app_handle.get_webview_window("mhy_client");
  let execute_js = r#"
  javascript:(async function(){
    const arg = {
@@ -180,8 +187,8 @@ fn handle_menu_mock_touch(app_handle: AppHandle) {
 }

 // 处理移除遮罩菜单
-fn handle_menu_remove_overlay(app_handle: AppHandle) {
-  let window = app_handle.get_window("mhy_client");
+fn handle_menu_remove_overlay(app_handle: &Window) {
+  let window = app_handle.get_webview_window("mhy_client");
  let execute_js = r#"
  javascript:(async function(){
    const arg = {
@@ -195,8 +202,8 @@ fn handle_menu_remove_overlay(app_handle: AppHandle) {
 }

 // 处理旋转窗口菜单
-fn handle_menu_rotate_window(app_handle: AppHandle) {
-  let window_get = app_handle.get_window("mhy_client");
+fn handle_menu_rotate_window(app_handle: &Window) {
+  let window_get = app_handle.get_webview_window("mhy_client");
  if window_get == None {
    return;
  }
@@ -211,23 +218,3 @@ fn handle_menu_rotate_window(app_handle: AppHandle) {
  window.center().unwrap();
  window.set_focus().unwrap();
 }
-
-// 处理切换 UA 菜单
-fn handle_menu_switch_ua(app_handle: AppHandle) {
-  let window = app_handle.get_window("mhy_client");
-  let execute_js = r#"
-  javascript:(async function(){
-    const isPc = navigator.userAgent.includes("Windows NT");
-    const arg = {
-      method: 'teyvat_switch_ua',
-      payload: {
-        url: window.location.href,
-        isPc,
-      }
-    }
-    await window.__TAURI__.event.emit('post_mhy_client',JSON.stringify(arg));
-  })()"#;
-  if window.is_some() {
-    window.unwrap().eval(&execute_js).ok().unwrap();
-  }
-}
--- a/src-tauri/src/client/mod.rs
+++ b/src-tauri/src/client/mod.rs
@@ -1,25 +1,21 @@
 //! @file src/client/mod.rs
 //! @desc 客户端模块，负责操作米游社客户端
-//! @since Beta v0.4.5
+//! @since Beta v0.4.10

 mod menu;
 use tauri::async_runtime::block_on;
-use tauri::{AppHandle, Manager, WindowBuilder, WindowEvent, WindowUrl};
+use tauri::{AppHandle, Manager, WebviewWindowBuilder, WindowEvent};
+use tauri_utils::config::WebviewUrl;

 #[tauri::command]
 pub async fn create_mhy_client(handle: AppHandle, func: String, url: String) {
-  let mut mhy_window_config = handle.config().tauri.windows.get(1).unwrap().clone();
+  let mut mhy_window_config = handle.config().app.windows.get(1).unwrap().clone();
  mhy_window_config.visible = true;
  if url != "" {
-    mhy_window_config.url = WindowUrl::External(url.parse().unwrap());
+    mhy_window_config.url = WebviewUrl::External(url.parse().unwrap());
  } else {
    mhy_window_config.url = menu::get_mhy_client_url(func.clone());
  }
-  //   if pc {
-  //     let user_agent = mhy_window_config.user_agent.as_ref().unwrap();
-  //     let version = user_agent.split("/").last().unwrap();
-  //     mhy_window_config.user_agent = Some(format!("Mozilla/5.0 (Windows NT 10.0; Win64; x64) miHoYoBBS/{}", version));
-  //   }
  if func == "birthday"
    || func == "web_act"
    || url.starts_with("https://webstatic.mihoyo.com/ys/event/e20220303-birthday/index.html")
@@ -27,7 +23,7 @@ pub async fn create_mhy_client(handle: AppHandle, func: String, url: String) {
    mhy_window_config.width = 1280.0;
    mhy_window_config.height = 720.0;
  }
-  let window_get = handle.get_window("mhy_client");
+  let window_get = handle.get_webview_window("mhy_client");
  if window_get.is_some() {
    let mhy_client = window_get.unwrap();
    mhy_client.on_window_event(move |e| {
@@ -39,9 +35,10 @@ pub async fn create_mhy_client(handle: AppHandle, func: String, url: String) {
    mhy_client.close().unwrap();
    return;
  }
-  WindowBuilder::from_config(&handle, mhy_window_config)
-    .menu(menu::create_mhy_menu(func))
-    .build()
+  WebviewWindowBuilder::from_config(&handle, &mhy_window_config)
    .expect("failed to create mhy_client")
-    .on_menu_event(move |event| menu::handle_menu_event(handle.clone(), event));
+    .menu(menu::create_mhy_menu(func.clone(), handle.clone()))
+    .build()
+    .expect("failed to add menu")
+    .on_menu_event(move |app, event| menu::handle_menu_event(app, event));
 }
--- a/src-tauri/src/commands.rs
+++ b/src-tauri/src/commands.rs
@@ -1,8 +1,8 @@
 //! @file src/commands.rs
 //! @desc 命令模块，负责处理命令
-//! @since Beta v0.4.3
+//! @since Beta v0.4.10

-use tauri::{Manager, WindowBuilder};
+use tauri::{Manager, WebviewWindowBuilder};
 use tauri_utils::config::WindowConfig;

 // 放一个常数，用来判断应用是否初始化
@@ -18,40 +18,21 @@ pub async fn init_app(app_handle: tauri::AppHandle) {
    }
  }
  dbg!("init_app");
-  let _mhy = app_handle.get_window("mhy_client");
+  let _mhy = app_handle.get_webview_window("mhy_client");
  if _mhy.is_some() {
    std::thread::sleep(std::time::Duration::from_millis(1000));
    _mhy.unwrap().close().unwrap();
  }
-  app_handle.emit_all("initApp", ()).unwrap();
+  app_handle.emit("initApp", ()).unwrap();
  unsafe {
    APP_INITIALIZED = true;
  }
 }

-// 注册deep link
-#[tauri::command]
-pub async fn register_deep_link(app_handle: tauri::AppHandle) {
-  unsafe {
-    if DEEP_LINK_REGISTERED == true {
-      return;
-    }
-  }
-  dbg!("register_deep_link");
-  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::command]
 pub async fn create_window(app_handle: tauri::AppHandle, label: String, mut option: WindowConfig) {
-  let window_old = app_handle.get_window(&label);
+  let window_old = app_handle.get_webview_window(&label);
  option.label = label.clone();
  if window_old.is_some() {
    dbg!("window exists");
@@ -59,14 +40,14 @@ pub async fn create_window(app_handle: tauri::AppHandle, label: String, mut opti
    return;
  }
  let window_new =
-    Some(WindowBuilder::from_config(&app_handle, option).build().expect("failed to create window"));
+    Some(WebviewWindowBuilder::from_config(&app_handle, &option).expect("failed to create window"));
  window_new.unwrap();
 }

 // 执行 js
 #[tauri::command]
 pub async fn execute_js(app_handle: tauri::AppHandle, label: String, js: String) {
-  let window = app_handle.get_window(&label);
+  let window = app_handle.get_webview_window(&label);
  if window.is_some() {
    window.unwrap().eval(&js).ok().unwrap();
  }
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -1,6 +1,6 @@
 //! @file src/main.rs
 //! @desc 主模块，用于启动应用
-//! @since Beta v0.4.3
+//! @since Beta v0.4.10

 // Prevents additional console window on Windows in release, DO NOT REMOVE!!
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
@@ -12,35 +12,34 @@ mod plugins;
 mod utils;

 // 窗口事件处理
-fn window_event_handler(event: tauri::GlobalWindowEvent) -> () {
-  match event.event() {
+fn window_event_handler(app: &tauri::Window, event: &tauri::WindowEvent) {
+  match event {
    tauri::WindowEvent::CloseRequested { api, .. } => {
      api.prevent_close();
-      let window = event.window().clone();
-      if window.label() == "TeyvatGuide" {
+      if app.label() == "TeyvatGuide" {
        // 子窗口 label 的数组
        const SUB_WINDOW_LABELS: [&str; 3] = ["Sub_window", "Dev_JSON", "mhy_client"];
        for label in SUB_WINDOW_LABELS.iter() {
-          let sub = window.get_window(label);
+          let sub = app.get_webview_window(label);
          if sub.is_some() {
            sub.unwrap().close().unwrap();
          }
        }
      }
-      window.close().unwrap();
+      app.close().unwrap();
    }
    _ => {}
  }
 }

 fn main() {
-  tauri_plugin_deep_link::prepare("teyvatguide");
  tauri::Builder::default()
-    .on_window_event(|event| window_event_handler(event))
+    .on_window_event(move |app, event| window_event_handler(app, event))
    .plugin(plugins::build_sql_plugin())
    .plugin(plugins::build_log_plugin())
+    .plugin(tauri_plugin_deep_link::init())
    .setup(|_app| {
-      let _window = _app.get_window("TeyvatGuide");
+      let _window = _app.get_webview_window("TeyvatGuide");
      #[cfg(debug_assertions)]
      if _window.is_some() {
        _window.unwrap().open_devtools();
@@ -49,7 +48,6 @@ fn main() {
    })
    .invoke_handler(tauri::generate_handler![
      commands::init_app,
-      commands::register_deep_link,
      commands::create_window,
      commands::execute_js,
      commands::get_dir_size,
--- a/src-tauri/src/plugins.rs
+++ b/src-tauri/src/plugins.rs
@@ -1,12 +1,12 @@
 //! @file src/plugins.rs
 //! @desc 插件模块，用于注册插件
-//! @since Beta v0.4.4
+//! @since Beta v0.4.10

 use super::utils;
 use log::LevelFilter;
 use tauri::plugin::TauriPlugin;
 use tauri::Runtime;
-use tauri_plugin_log::{LogTarget, TimezoneStrategy};
+use tauri_plugin_log::{Target, TargetKind, TimezoneStrategy};
 use tauri_plugin_sql::PluginConfig;

 // sqlite 插件
@@ -18,15 +18,17 @@ pub fn build_sql_plugin<R: Runtime>() -> TauriPlugin<R, Option<PluginConfig>> {
 pub fn build_log_plugin<R: Runtime>() -> TauriPlugin<R> {
  if cfg!(debug_assertions) {
    return tauri_plugin_log::Builder::default()
-      .targets([LogTarget::Stdout])
+      .targets([Target::new(TargetKind::Webview)])
      .timezone_strategy(TimezoneStrategy::UseLocal)
      .level(LevelFilter::Debug)
      .build();
  }
  return tauri_plugin_log::Builder::default()
-    .targets([LogTarget::LogDir, LogTarget::Stdout])
+    .targets([
+      Target::new(TargetKind::Webview),
+      Target::new(TargetKind::LogDir { file_name: utils::get_current_date().into() }),
+    ])
    .timezone_strategy(TimezoneStrategy::UseLocal)
    .level(LevelFilter::Info)
-    .log_name(utils::get_current_date())
    .build();
 }