将NumberRecognizer移入recog，简化各处number写法

mower/solvers/infra/drone.py

@@ -1,15 +1,11 @@
 from datetime import datetime, timedelta
 
-import cv2
-
-from mower.models import Digtal
 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.graph import SceneGraphSolver
-from mower.utils.image import cropimg, thres2
 from mower.utils.log import logger
 from mower.utils.recognize import Scene
 
@@ -59,32 +55,7 @@ class DroneSolver(SceneGraphSolver, BaseMixin):
 
     def number(self, scope: tp.Scope, height: int, thres: int) -> int:
         "数字识别"
-        img = cropimg(config.recog.gray, scope)
-        default_height = 25
-        if height != default_height:
-            scale = 25 / height
-            img = cv2.resize(img, None, None, scale, scale)
-        img = thres2(img, thres)
-        contours, _ = cv2.findContours(img, cv2.RETR_EXTERNAL, cv2.CHAIN_APPROX_SIMPLE)
-        rect = [cv2.boundingRect(c) for c in contours]
-        rect.sort(key=lambda c: c[0])
-
-        value = 0
-
-        for x, y, w, h in rect:
-            digit = cropimg(img, ((x, y), (x + w, y + h)))
-            digit = cv2.copyMakeBorder(
-                digit, 10, 10, 10, 10, cv2.BORDER_CONSTANT, None, (0,)
-            )
-            score = []
-            for i in range(10):
-                im = Digtal().riic_base_digits[i]
-                result = cv2.matchTemplate(digit, im, cv2.TM_SQDIFF_NORMED)
-                min_val, max_val, min_loc, max_loc = cv2.minMaxLoc(result)
-                score.append(min_val)
-            value = value * 10 + score.index(min(score))
-
-        return value
+        return config.recog.num.number_int("riic_base", scope, height, thres)
 
     def timeout(self) -> bool:
         return datetime.now() > self.start_time + timedelta(seconds=20)