Merge pull request #33 from AkiChase/dev

Scrcpy Mask v0.4.2

package.json

@@ -1,7 +1,7 @@
 {
   "name": "scrcpy-mask",
   "private": true,
-  "version": "0.4.1",
+  "version": "0.4.2",
   "type": "module",
   "scripts": {
     "dev": "vite",

src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "scrcpy-mask"
-version = "0.4.1"
+version = "0.4.2"
 description = "A Tauri App"
 authors = ["AkiChase"]
 edition = "2021"

src-tauri/src/adb.rs

@@ -88,6 +88,7 @@ pub struct Adb;
 impl Adb {
     pub fn cmd_base() -> Command {
         let adb_path = share::ADB_PATH.lock().unwrap().clone();
+        println!("{}", &adb_path);
         #[cfg(target_os = "windows")]
         {
             let mut cmd = Command::new(adb_path);

src-tauri/src/main.rs

@@ -164,7 +164,10 @@ fn set_adb_path(adb_path: String, app: tauri::AppHandle) -> Result<(), String> {
     let path = std::path::PathBuf::from("store.bin");
     let store_res: Result<(), tauri_plugin_store::Error> =
         tauri_plugin_store::with_store(app, stores, path, |store| {
-            store.insert("adbPath".to_string(), serde_json::json!(adb_path))?;
+            store.insert(
+                "adbPath".to_string(),
+                serde_json::Value::String(adb_path.clone()),
+            )?;
             *share::ADB_PATH.lock().unwrap() = adb_path;
             Ok(())
         });
@@ -190,9 +193,14 @@ async fn main() {
             tauri_plugin_store::with_store(app.app_handle().clone(), stores, path, |store| {
                 // load adb path
                 match store.get("adbPath") {
-                    Some(value) => *share::ADB_PATH.lock().unwrap() = value.to_string(),
+                    Some(value) => {
+                        *share::ADB_PATH.lock().unwrap() = value.as_str().unwrap().to_string()
+                    }
                     None => store
-                        .insert("adbPath".to_string(), serde_json::json!("adb"))
+                        .insert(
+                            "adbPath".to_string(),
+                            serde_json::Value::String("adb".to_string()),
+                        )
                         .unwrap(),
                 };
 

src-tauri/tauri.conf.json

@@ -1,6 +1,6 @@
 {
   "productName": "scrcpy-mask",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "identifier": "com.akichase.mask",
   "build": {
     "beforeDevCommand": "pnpm dev",

src/components/Device.vue

@@ -79,7 +79,7 @@ onMounted(async () => {
           } else {
             store.screenSizeW = payload.width;
             store.screenSizeH = payload.height;
-            message.info("设备旋转");
+            message.info(t("pages.Device.deviceRotation"));
           }
           break;
         default:

src/components/Mask.vue

@@ -66,12 +66,14 @@ onActivated(async () => {
 });
 
 onMounted(async () => {
-  store.checkAdb = checkAdb;
-  await checkAdb();
   await loadLocalStore();
   store.checkUpdate = checkUpdate;
   store.showInputBox = showInputBox;
   if (store.checkUpdateAtStart) checkUpdate();
+  store.checkAdb = checkAdb;
+  setTimeout(() => {
+    checkAdb();
+  }, 500);
 });
 
 let checkAdbMessage: MessageReactive | null = null;

src/i18n/en-US.json

@@ -36,7 +36,8 @@
       "wsClose": "Close",
       "wsConnect": "Control",
       "adbDeviceError": "Unable to get available devices",
-      "adbConnectError": "Wireless connection failed"
+      "adbConnectError": "Wireless connection failed",
+      "deviceRotation": "Device rotation"
     },
     "Mask": {
       "inputBoxPlaceholder": "Input text and then press enter/esc",

src/i18n/zh-CN.json

@@ -36,7 +36,8 @@
       "wsClose": "断开",
       "wsConnect": "控制",
       "adbDeviceError": "无法获取可用设备",
-      "adbConnectError": "无线连接失败"
+      "adbConnectError": "无线连接失败",
+      "deviceRotation": "设备旋转"
     },
     "Mask": {
       "keyconfigException": "按键方案异常，请删除此方案",