fix: 更改adb的位置防止无法找到adb

Night-stars-1 · Apr 10, 2024 · 70c0292 · 70c0292
1 parent 897c71c
commit 70c0292
Show file tree

Hide file tree

Showing 16 changed files with 2 additions and 2 deletions.
diff --git a/app/common/config.py b/app/common/config.py
@@ -54,7 +54,7 @@ class Config(QConfig):
     # uuid
     uuid = ConfigItem("Global", "uuid", "", None)
     goodsType = ConfigItem("Global", "goodsType", False, BoolValidator())
-    adbPath = ConfigItem("Global", "adbPath", "core\\lib\\adb", None)
+    adbPath = ConfigItem("Global", "adbPath", "resources\\lib\\adb", None)
     adbOrder = ConfigItem("Global", "adbOrder", "127.0.0.1:7555", None)
 
     # main window

diff --git a/core/adb.py b/core/adb.py
@@ -21,7 +21,7 @@
 STOP = False
 
 
-def connect(order="127.0.0.1:7555", path="core\\lib\\adb"):
+def connect(order="127.0.0.1:7555", path="resources\\lib\\adb"):
     """
     说明:
         连接ADB

diff --git a/core/lib/AdbWinApi.dll → resources/lib/AdbWinApi.dll b/core/lib/AdbWinApi.dll → resources/lib/AdbWinApi.dll
diff --git a/core/lib/AdbWinUsbApi.dll → resources/lib/AdbWinUsbApi.dll b/core/lib/AdbWinUsbApi.dll → resources/lib/AdbWinUsbApi.dll
diff --git a/core/lib/NOTICE.txt → resources/lib/NOTICE.txt b/core/lib/NOTICE.txt → resources/lib/NOTICE.txt
diff --git a/core/lib/adb.exe → resources/lib/adb.exe b/core/lib/adb.exe → resources/lib/adb.exe
diff --git a/core/lib/etc1tool.exe → resources/lib/etc1tool.exe b/core/lib/etc1tool.exe → resources/lib/etc1tool.exe
diff --git a/core/lib/fastboot.exe → resources/lib/fastboot.exe b/core/lib/fastboot.exe → resources/lib/fastboot.exe
diff --git a/core/lib/hprof-conv.exe → resources/lib/hprof-conv.exe b/core/lib/hprof-conv.exe → resources/lib/hprof-conv.exe
diff --git a/core/lib/libwinpthread-1.dll → resources/lib/libwinpthread-1.dll b/core/lib/libwinpthread-1.dll → resources/lib/libwinpthread-1.dll
diff --git a/core/lib/make_f2fs.exe → resources/lib/make_f2fs.exe b/core/lib/make_f2fs.exe → resources/lib/make_f2fs.exe
diff --git a/core/lib/make_f2fs_casefold.exe → resources/lib/make_f2fs_casefold.exe b/core/lib/make_f2fs_casefold.exe → resources/lib/make_f2fs_casefold.exe
diff --git a/core/lib/mke2fs.conf → resources/lib/mke2fs.conf b/core/lib/mke2fs.conf → resources/lib/mke2fs.conf
diff --git a/core/lib/mke2fs.exe → resources/lib/mke2fs.exe b/core/lib/mke2fs.exe → resources/lib/mke2fs.exe
diff --git a/core/lib/source.properties → resources/lib/source.properties b/core/lib/source.properties → resources/lib/source.properties
diff --git a/core/lib/sqlite3.exe → resources/lib/sqlite3.exe b/core/lib/sqlite3.exe → resources/lib/sqlite3.exe