Merge pull request #11 from Night-stars-1/dev

fix: 修复route错误判断，adb->STOP赋值错误
Night-stars-1 · Apr 14, 2024 · f79c2b5 · f79c2b5
2 parents c3c1eb3 + 3d7e8db
commit f79c2b5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/auto/run_business/main.py b/auto/run_business/main.py
@@ -1,7 +1,7 @@
 """
 Author: Night-stars-1 nujj1042633805@gmail.com
 Date: 2024-04-05 17:14:29
-LastEditTime: 2024-04-14 16:16:17
+LastEditTime: 2024-04-14 23:11:11
 LastEditors: Night-stars-1 nujj1042633805@gmail.com
 """
 
@@ -65,7 +65,7 @@ def run(
     if not status:
         logger.error("ADB连接失败")
         return False
-    if route:
+    if not route:
         if type_:
             if uuid == "":
                 logger.info("未设置UUID")

diff --git a/core/adb.py b/core/adb.py
@@ -1,7 +1,7 @@
 """
 Author: Night-stars-1 nujj1042633805@gmail.com
 Date: 2024-03-20 22:24:35
-LastEditTime: 2024-04-10 13:34:03
+LastEditTime: 2024-04-14 23:11:49
 LastEditors: Night-stars-1 nujj1042633805@gmail.com
 """
 
@@ -31,7 +31,7 @@ def connect(order="127.0.0.1:7555", path="resources\\lib\\adb"):
     global ADBOREDER, ADBPATH, STOP
     ADBOREDER = order
     ADBPATH = path
-    STOP = True
+    STOP = False
     shell = [ADBPATH, "connect", ADBOREDER]
     result = run(shell, shell=True, capture_output=True, check=False)
     status = "already connected" in str(result.stdout) or "connected to" in str(

diff --git a/core/goods/shop.py b/core/goods/shop.py
@@ -75,7 +75,7 @@ def show(routes: RoutesModel):
     city_data = json.load(file)
 
 with open("resources/goods/AttachedToCityData.json", "r", encoding="utf-8") as file:
-    attached_to_city_data: dict = json.load(file)
+    attached_to_city_data: Dict[str, str] = json.load(file)
 
 with open("resources/goods/CityTiredData.json", "r", encoding="utf-8") as file:
     city_tired_data: dict = json.load(file)