From 93ad83689f191ef60a9faf0b97c47157889edc40 Mon Sep 17 00:00:00 2001
From: viarotel <viarotel@qq.com>
Date: Mon, 30 Oct 2023 09:56:35 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E2=99=BB=EF=B8=8F=20=E6=8B=86=E5=88=86?=
 =?UTF-8?q?=E4=BE=9D=E8=B5=96=E6=96=87=E4=BB=B6=E7=A6=81=E7=94=A8=E5=86=97?=
 =?UTF-8?q?=E4=BD=99=E7=9A=84=E8=AD=A6=E5=91=8A=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 electron-builder.json                               |   4 ++--
 electron/configs/index.js                           |   2 +-
 .../resources/extra/{core => adb}/AdbWinApi.dll     | Bin
 .../resources/extra/{core => adb}/AdbWinUsbApi.dll  | Bin
 electron/resources/extra/{core => adb}/adb.exe      | Bin
 src/locales/index.js                                |   2 ++
 6 files changed, 5 insertions(+), 3 deletions(-)
 rename electron/resources/extra/{core => adb}/AdbWinApi.dll (100%)
 rename electron/resources/extra/{core => adb}/AdbWinUsbApi.dll (100%)
 rename electron/resources/extra/{core => adb}/adb.exe (100%)

diff --git a/electron-builder.json b/electron-builder.json
index 124db53..e8ef221 100644
--- a/electron-builder.json
+++ b/electron-builder.json
@@ -58,7 +58,7 @@
     "extraResources": {
       "from": "electron/resources/extra",
       "to": "extra",
-      "filter": ["**/*", "!core"]
+      "filter": ["**/*", "!core", "!adb"]
     },
     "entitlementsInherit": "entitlements.mac.plist",
     "extendInfo": {
@@ -89,7 +89,7 @@
     "extraResources": {
       "from": "electron/resources/extra",
       "to": "extra",
-      "filter": ["**/*", "!core"]
+      "filter": ["**/*", "!core", "!adb"]
     }
   },
   "asar": true,
diff --git a/electron/configs/index.js b/electron/configs/index.js
index a9c089e..bf14eae 100644
--- a/electron/configs/index.js
+++ b/electron/configs/index.js
@@ -18,7 +18,7 @@ export const trayPath
 
 export const adbPath
   = process.platform === 'win32'
-    ? extraResolve('core/adb.exe')
+    ? extraResolve('adb/adb.exe')
     : which.sync('adb', { nothrow: true })
 
 export const scrcpyPath
diff --git a/electron/resources/extra/core/AdbWinApi.dll b/electron/resources/extra/adb/AdbWinApi.dll
similarity index 100%
rename from electron/resources/extra/core/AdbWinApi.dll
rename to electron/resources/extra/adb/AdbWinApi.dll
diff --git a/electron/resources/extra/core/AdbWinUsbApi.dll b/electron/resources/extra/adb/AdbWinUsbApi.dll
similarity index 100%
rename from electron/resources/extra/core/AdbWinUsbApi.dll
rename to electron/resources/extra/adb/AdbWinUsbApi.dll
diff --git a/electron/resources/extra/core/adb.exe b/electron/resources/extra/adb/adb.exe
similarity index 100%
rename from electron/resources/extra/core/adb.exe
rename to electron/resources/extra/adb/adb.exe
diff --git a/src/locales/index.js b/src/locales/index.js
index 718d575..eb39f70 100644
--- a/src/locales/index.js
+++ b/src/locales/index.js
@@ -14,6 +14,8 @@ export const i18n = createI18n({
   locale,
   fallbackLocale: 'en_US',
   messages,
+  fallbackWarn: false,
+  missingWarn: false,
 })
 // console.log('i18n', i18n)