diff --git a/app/common/config.py b/app/common/config.py index 07a5ed5..c028bf7 100644 --- 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 index 9d60227..424c0dc 100644 --- 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 b/resources/lib/AdbWinApi.dll similarity index 100% rename from core/lib/AdbWinApi.dll rename to resources/lib/AdbWinApi.dll diff --git a/core/lib/AdbWinUsbApi.dll b/resources/lib/AdbWinUsbApi.dll similarity index 100% rename from core/lib/AdbWinUsbApi.dll rename to resources/lib/AdbWinUsbApi.dll diff --git a/core/lib/NOTICE.txt b/resources/lib/NOTICE.txt similarity index 100% rename from core/lib/NOTICE.txt rename to resources/lib/NOTICE.txt diff --git a/core/lib/adb.exe b/resources/lib/adb.exe similarity index 100% rename from core/lib/adb.exe rename to resources/lib/adb.exe diff --git a/core/lib/etc1tool.exe b/resources/lib/etc1tool.exe similarity index 100% rename from core/lib/etc1tool.exe rename to resources/lib/etc1tool.exe diff --git a/core/lib/fastboot.exe b/resources/lib/fastboot.exe similarity index 100% rename from core/lib/fastboot.exe rename to resources/lib/fastboot.exe diff --git a/core/lib/hprof-conv.exe b/resources/lib/hprof-conv.exe similarity index 100% rename from core/lib/hprof-conv.exe rename to resources/lib/hprof-conv.exe diff --git a/core/lib/libwinpthread-1.dll b/resources/lib/libwinpthread-1.dll similarity index 100% rename from core/lib/libwinpthread-1.dll rename to resources/lib/libwinpthread-1.dll diff --git a/core/lib/make_f2fs.exe b/resources/lib/make_f2fs.exe similarity index 100% rename from core/lib/make_f2fs.exe rename to resources/lib/make_f2fs.exe diff --git a/core/lib/make_f2fs_casefold.exe b/resources/lib/make_f2fs_casefold.exe similarity index 100% rename from core/lib/make_f2fs_casefold.exe rename to resources/lib/make_f2fs_casefold.exe diff --git a/core/lib/mke2fs.conf b/resources/lib/mke2fs.conf similarity index 100% rename from core/lib/mke2fs.conf rename to resources/lib/mke2fs.conf diff --git a/core/lib/mke2fs.exe b/resources/lib/mke2fs.exe similarity index 100% rename from core/lib/mke2fs.exe rename to resources/lib/mke2fs.exe diff --git a/core/lib/source.properties b/resources/lib/source.properties similarity index 100% rename from core/lib/source.properties rename to resources/lib/source.properties diff --git a/core/lib/sqlite3.exe b/resources/lib/sqlite3.exe similarity index 100% rename from core/lib/sqlite3.exe rename to resources/lib/sqlite3.exe