model与部分图片移至static下

mower/solvers/infra/base_mixin.py

@@ -10,11 +10,12 @@ from mower.solvers.infra.filter import RIIC_Filter
 from mower.utils import config
 from mower.utils.character_recognize import operator_room_select
 from mower.utils.csleep import MowerExit
+from mower.utils.digit_reader import get_time
 from mower.utils.image import cropimg, loadres, thres2
 from mower.utils.log import logger
 from mower.utils.rapidocr import engine
 
-with lzma.open(f"{__rootdir__}/models/operator_room.model", "rb") as f:
+with lzma.open(f"{__rootdir__}/static/operator_room.model", "rb") as f:
     OP_ROOM = pickle.loads(f.read())
 
 kernel = np.ones((12, 12), np.uint8)
@@ -175,7 +176,7 @@ class BaseMixin:
         config.recog.update()
         try:
             if use_digit_reader:
-                time_str = self.digit_reader.get_time(config.recog.gray)
+                time_str = get_time(config.recog.gray)
             else:
                 time_str = self.read_screen(config.recog.img, type="time", cord=cord)
             h, m, s = str(time_str).split(":")

mower/solvers/infra/drone.py

@@ -4,7 +4,7 @@ from mower.solvers.infra.base_mixin import BaseMixin
 from mower.solvers.infra.enter_room import EnterRoomSolver
 from mower.utils import config
 from mower.utils import typealias as tp
-from mower.utils.digit_reader import DigitReader
+from mower.utils.digit_reader import get_drone
 from mower.utils.graph import SceneGraphSolver
 from mower.utils.log import logger
 from mower.utils.recognize import Scene
@@ -31,7 +31,7 @@ class DroneSolver(SceneGraphSolver, BaseMixin):
         self.room = room
         while cur_count is None and not all_in:
             try:
-                cur_count = DigitReader().get_drone(config.recog.gray)
+                cur_count = get_drone(config.recog.gray)
             except Exception:
                 logger.exception("当前场景无法获取无人机数量")
                 EnterRoomSolver().run(self.room, detail=False)

mower/solvers/infra/report.py

@@ -6,7 +6,6 @@ from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.orm import sessionmaker
 
 from mower.utils import config
-from mower.utils.digit_reader import DigitReader
 from mower.utils.email import report_template, send_message
 from mower.utils.graph import SceneGraphSolver
 from mower.utils.image import cropimg, thres2
@@ -40,7 +39,6 @@ class ReportSolver(SceneGraphSolver):
         self.low_range_gray = (100, 100, 100)
         self.high_range_gray = (255, 255, 255)
         self.date = (datetime.datetime.now() - datetime.timedelta(hours=4)).date()
-        self.digitReader = DigitReader()
         self.report_res = {
             "作战录像": None,
             "赤金": None,

mower/solvers/infra/run_order/__init__.py

@@ -5,7 +5,7 @@ from mower.solvers.infra.get_order_remaining_time import (
     GetOrderRemainingTimeSolver,
 )
 from mower.utils import config
-from mower.utils.digit_reader import DigitReader
+from mower.utils.digit_reader import get_drone
 from mower.utils.graph import SceneGraphSolver
 from mower.utils.log import logger
 
@@ -32,7 +32,7 @@ class RunOrderSolver(SceneGraphSolver):
         # 使用无人机加速
         if drone:
             # 读取当前无人机数量避免重复开关
-            cur_drone_count = DigitReader().get_drone(config.recog.gray)
+            cur_drone_count = get_drone(config.recog.gray)
             drone_count = ReadOriginalOrderRemainTimeSolver().run(room) // 180 - 1
             DroneSolver().run(room, drone_count, cur_count=cur_drone_count)
 

mower/solvers/infra/switch_product/__init__.py

@@ -7,7 +7,7 @@ from mower.solvers.infra.drone import DroneSolver
 from mower.solvers.infra.enter_room import EnterRoomSolver
 from mower.utils import config
 from mower.utils import typealias as tp
-from mower.utils.digit_reader import DigitReader
+from mower.utils.digit_reader import get_drone
 from mower.utils.graph import SceneGraphSolver
 from mower.utils.image import cropimg, thres2
 from mower.utils.log import logger
@@ -45,7 +45,7 @@ class SwitchProductSolver(SceneGraphSolver, BaseMixin):
             return True
 
         # 读取当前无人机数量避免重复开关
-        cur_drone_count = DigitReader().get_drone(config.recog.gray)
+        cur_drone_count = get_drone(config.recog.gray)
         # 读取生产速度
         speed = self.read_speed()
         # 获取无人机加速的剩余时间