feat: env resolve define

Author: modstart

electron/lib/env.ts

@@ -37,7 +37,8 @@ const tryFirst = (functionList: (() => any)[]) => {
     for (const fun of functionList) {
         try {
             return fun();
-        } catch (e) {}
+        } catch (e) {
+        }
     }
     return null;
 };
@@ -106,20 +107,20 @@ export const platformUUID = () => {
     return platformUUIDCache;
 };
 
-export const buildResolve = (value: string) => {
+export const buildResolve = (value: string): string => {
     return resolve(`electron/resources/build/${value}`);
 };
 
-export const binResolve = (value: string) => {
+export const binResolve = (value: string): string => {
     return resolve(process.resourcesPath, "bin", value);
 };
 
-export const extraResolve = (filePath: string) => {
+export const extraResolve = (filePath: string): string => {
     const basePath = isPackaged ? process.resourcesPath : "electron/resources";
     return resolve(basePath, "extra", filePath);
 };
 
-export const extraResolveBin = (filePath: string) => {
+export const extraResolveBin = (filePath: string): string => {
     if (isWin) {
         if (!filePath.endsWith(".exe")) {
             filePath += ".exe";

electron/mapi/adb/render.ts

@@ -19,12 +19,16 @@ const destroy = () => {
     }
 };
 
-const getBinPath = async () => {
+const getBinPath = async (returnEmptyWhenDefault: boolean = false): Promise<string> => {
     const binPath = await Config.get("common.adbPath");
+    const binPathDefault = extraResolveBin("scrcpy/adb");
+    if (returnEmptyWhenDefault && (!binPath || binPath === binPathDefault)) {
+        return '';
+    }
     if (binPath) {
         return binPath;
     }
-    return extraResolveBin("scrcpy/adb");
+    return binPathDefault;
 };
 
 const setBinPath = async (binPath: string) => {

electron/mapi/scrcpy/render.ts

@@ -4,12 +4,16 @@ import {Apps} from "../app";
 import {ADB} from "../adb/render";
 import {IconvUtil} from "../../lib/util";
 
-const getBinPath = async () => {
+const getBinPath = async (returnEmptyWhenDefault: boolean = false):Promise<string> => {
     const binPath = await Config.get("common.scrcpyPath");
+    const binPathDefault = extraResolveBin("scrcpy/scrcpy");
+    if (returnEmptyWhenDefault && (!binPath || binPath === binPathDefault)) {
+        return '';
+    }
     if (binPath) {
         return binPath;
     }
-    return extraResolveBin('scrcpy/scrcpy')
+    return binPathDefault
 };
 
 const setBinPath = async (binPath: string) => {
@@ -39,7 +43,7 @@ const spawnShell = async (
     }, option);
     option.env["ADB"] = await ADB.getBinPath();
     if (isWin) {
-        option.env["ADB"] = IconvUtil.convert(option.env["ADB"], "gbk");
+        // option.env["ADB"] = IconvUtil.convert(option.env["ADB"], "gbk");
     }
     let binary = await getBinPath();
     // local debug

src/components/Setting/SettingEnv.vue

@@ -4,11 +4,15 @@ import {onMounted, ref} from "vue";
 
 const basic = ref({
     adbPath: null as string | null,
+    adbPathDefault: null as string | null,
     scrcpyPath: null as string | null,
+    scrcpyPathDefault: null as string | null,
 });
 const doLoad = async () => {
-    basic.value.adbPath = await $mapi.adb.getBinPath();
-    basic.value.scrcpyPath = await $mapi.scrcpy.getBinPath();
+    basic.value.adbPath = await $mapi.adb.getBinPath(true);
+    basic.value.adbPathDefault = await $mapi.adb.getBinPath();
+    basic.value.scrcpyPath = await $mapi.scrcpy.getBinPath(true);
+    basic.value.scrcpyPathDefault = await $mapi.scrcpy.getBinPath();
 };
 
 onMounted(doLoad);
@@ -38,7 +42,9 @@ const doSelectScrcpyPath = async () => {
 <template>
     <a-form :model="{}" layout="vertical">
         <a-form-item field="name" :label="t('adb路径')">
-            <a-input @change="doAdbPathChange" v-model="basic.adbPath as string">
+            <a-input @change="doAdbPathChange"
+                     :placeholder="basic.adbPathDefault"
+                     v-model="basic.adbPath as string">
                 <template #append>
                     <span @click="doSelectAdbPath" class="cursor-pointer">
                         {{ t("选择路径") }}
@@ -47,7 +53,9 @@ const doSelectScrcpyPath = async () => {
             </a-input>
         </a-form-item>
         <a-form-item field="name" :label="t('scrcpy路径')">
-            <a-input @change="doScrcpyPathChange" v-model="basic.scrcpyPath as string">
+            <a-input @change="doScrcpyPathChange"
+                     :placeholder="basic.scrcpyPathDefault"
+                     v-model="basic.scrcpyPath as string">
                 <template #append>
                     <span @click="doSelectScrcpyPath" class="cursor-pointer">
                         {{ t("选择路径") }}

src/declarations/type.d.ts

@@ -353,7 +353,7 @@ type DefsMapi = {
     };
 
     adb: {
-        getBinPath: () => Promise<string>;
+        getBinPath: (returnEmptyWhenDefault: boolean = false) => Promise<string>;
         setBinPath: (binPath: string) => Promise<boolean>;
         spawnShell: (
             args: string[],
@@ -408,7 +408,7 @@ type DefsMapi = {
         }>;
     };
     scrcpy: {
-        getBinPath: () => Promise<string>;
+        getBinPath: (returnEmptyWhenDefault: boolean = false) => Promise<string>;
         setBinPath: (binPath: string) => Promise<boolean>;
         spawnShell: (
             args: string[],