Merge branch 'master' into release

Author: lanxiuyun

.gitignore

@@ -210,3 +210,7 @@ cython_debug/
 
 # PyPI configuration file
 .pypirc
+
+# CLAUDE
+CLAUDE.md
+.claude/

package.json

@@ -20,6 +20,7 @@
     "@mediapipe/tasks-vision": "^0.10.22-rc.20250304",
     "@tauri-apps/api": "^2",
     "@tauri-apps/plugin-autostart": "^2.2.0",
+    "@tauri-apps/plugin-http": "^2.5.6",
     "@tauri-apps/plugin-notification": "^2.2.2",
     "@tauri-apps/plugin-opener": "^2.2.6",
     "@tauri-apps/plugin-process": "^2.3.0",

pnpm-lock.yaml

@@ -18,14 +18,15 @@ crate-type = ["staticlib", "cdylib", "rlib"]
 tauri-build = { version = "2", features = [] }
 
 [dependencies]
-tauri = { version = "2", features = ["devtools"] }
+tauri = { version = "2", features = ["devtools", "tray-icon"] }
 tauri-plugin-opener = "2"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 tauri-plugin-shell = "2"
 tauri-plugin-store = "2"
 tauri-plugin-notification = "2"
 tauri-plugin-process = "2"
+tauri-plugin-http = "2"
 
 [target.'cfg(not(any(target_os = "android", target_os = "ios")))'.dependencies]
 tauri-plugin-autostart = "2"

src-tauri/Cargo.toml

@@ -39,6 +39,14 @@
     "core:window:allow-set-size",
 
     "updater:default",
-    "process:default"
+    "process:default",
+
+    {
+      "identifier": "http:default",
+      "allow": [
+        { "url": "http://localhost:62334/*" }
+      ]
+    },
+    "http:allow-fetch"
   ]
 }

src-tauri/capabilities/default.json

@@ -24,9 +24,10 @@ async fn run_sidecar(app: tauri::AppHandle) -> Result<String, String> {
     start_sidecar(app).await
 }
 
+use tauri::menu::{Menu, MenuItem};
+use tauri::tray::{MouseButton, MouseButtonState, TrayIconBuilder, TrayIconEvent};
+use tauri::{Emitter, Manager};
 use tauri_plugin_autostart::MacosLauncher;
-use tauri_plugin_autostart::ManagerExt;
-use tauri_plugin_shell::process::CommandEvent;
 use tauri_plugin_shell::ShellExt;
 
 #[cfg_attr(mobile, tauri::mobile_entry_point)]
@@ -43,6 +44,7 @@ pub fn run() {
         ))
         .plugin(tauri_plugin_shell::init())
         .plugin(tauri_plugin_opener::init())
+        .plugin(tauri_plugin_http::init())
         .setup(|app| {
             // 在应用启动时自动启动sidecar
             let app_handle = app.handle().clone();
@@ -52,6 +54,46 @@ pub fn run() {
                     Err(e) => eprintln!("启动sidecar失败: {}", e),
                 }
             });
+
+            // 创建系统托盘
+            let show_item = MenuItem::with_id(app, "show", "显示窗口", true, None::<&str>)?;
+            let quit_item = MenuItem::with_id(app, "quit", "退出", true, None::<&str>)?;
+            let menu = Menu::with_items(app, &[&show_item, &quit_item])?;
+
+            let _tray = TrayIconBuilder::new()
+                .icon(app.default_window_icon().unwrap().clone())
+                .menu(&menu)
+                .show_menu_on_left_click(false)
+                .on_menu_event(|app, event| match event.id.as_ref() {
+                    "show" => {
+                        if let Some(window) = app.get_webview_window("main") {
+                            let _ = window.show();
+                            let _ = window.unminimize();
+                            let _ = window.set_focus();
+                        }
+                    }
+                    "quit" => {
+                        let _ = app.emit("tray-quit-requested", ());
+                    }
+                    _ => {}
+                })
+                .on_tray_icon_event(|tray, event| {
+                    if let TrayIconEvent::Click {
+                        button: MouseButton::Left,
+                        button_state: MouseButtonState::Up,
+                        ..
+                    } = event
+                    {
+                        let app = tray.app_handle();
+                        if let Some(window) = app.get_webview_window("main") {
+                            let _ = window.show();
+                            let _ = window.unminimize();
+                            let _ = window.set_focus();
+                        }
+                    }
+                })
+                .build(app)?;
+
             Ok(())
         })
         .invoke_handler(tauri::generate_handler![greet, run_sidecar])

src-tauri/src/lib.rs

@@ -1,7 +1,7 @@
 {
   "$schema": "https://schema.tauri.app/config/2",
   "productName": "Lazyeat",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "identifier": "com.Lazyeat.maplelost",
   "build": {
     "beforeDevCommand": "npm run dev",