refactor(sweep): simplify list enter match

config/template.json

@@ -47,14 +47,6 @@
       "SecondCafe": true
     }
   },
-  "Mail": {
-    "Scheduler": {
-      "Enable": true,
-      "NextRun": "2020-01-01 00:00:00",
-      "Command": "Mail",
-      "ServerUpdate": "04:00"
-    }
-  },
   "Circle": {
     "Scheduler": {
       "Enable": true,
@@ -63,6 +55,14 @@
       "ServerUpdate": "04:00"
     }
   },
+  "Mail": {
+    "Scheduler": {
+      "Enable": true,
+      "NextRun": "2020-01-01 00:00:00",
+      "Command": "Mail",
+      "ServerUpdate": "04:00"
+    }
+  },
   "Bounty": {
     "Scheduler": {
       "Enable": true,

module/config/argument/args.json

@@ -207,33 +207,6 @@
       }
     }
   },
-  "Mail": {
-    "Scheduler": {
-      "Enable": {
-        "type": "checkbox",
-        "value": true,
-        "option": [
-          true,
-          false
-        ]
-      },
-      "NextRun": {
-        "type": "datetime",
-        "value": "2020-01-01 00:00:00",
-        "validate": "datetime"
-      },
-      "Command": {
-        "type": "input",
-        "value": "Mail",
-        "display": "hide"
-      },
-      "ServerUpdate": {
-        "type": "input",
-        "value": "04:00",
-        "display": "hide"
-      }
-    }
-  },
   "Circle": {
     "Scheduler": {
       "Enable": {
@@ -261,6 +234,33 @@
       }
     }
   },
+  "Mail": {
+    "Scheduler": {
+      "Enable": {
+        "type": "checkbox",
+        "value": true,
+        "option": [
+          true,
+          false
+        ]
+      },
+      "NextRun": {
+        "type": "datetime",
+        "value": "2020-01-01 00:00:00",
+        "validate": "datetime"
+      },
+      "Command": {
+        "type": "input",
+        "value": "Mail",
+        "display": "hide"
+      },
+      "ServerUpdate": {
+        "type": "input",
+        "value": "04:00",
+        "display": "hide"
+      }
+    }
+  },
   "Bounty": {
     "Scheduler": {
       "Enable": {

module/config/argument/menu.json

@@ -12,8 +12,8 @@
     "page": "setting",
     "tasks": [
       "Cafe",
-      "Mail",
       "Circle",
+      "Mail",
       "Bounty",
       "Scrimmage",
       "TacticalChallenge",

module/config/argument/task.yaml

@@ -25,10 +25,10 @@ Daily:
     Cafe:
       - Scheduler
       - Cafe
-    Mail:
-      - Scheduler
     Circle:
       - Scheduler
+    Mail:
+      - Scheduler
     Bounty:
       - Scheduler
       - Bounty

module/config/i18n/en-US.json

@@ -22,14 +22,14 @@
       "name": "Cafe",
       "help": ""
     },
-    "Mail": {
-      "name": "Mailbox",
-      "help": ""
-    },
     "Circle": {
       "name": "Club",
       "help": ""
     },
+    "Mail": {
+      "name": "Mailbox",
+      "help": ""
+    },
     "Bounty": {
       "name": "Bounty",
       "help": ""

module/config/i18n/zh-CN.json

@@ -22,14 +22,14 @@
       "name": "咖啡厅",
       "help": ""
     },
-    "Mail": {
-      "name": "邮箱",
-      "help": ""
-    },
     "Circle": {
       "name": "公会",
       "help": "社团 / 小组"
     },
+    "Mail": {
+      "name": "邮箱",
+      "help": ""
+    },
     "Bounty": {
       "name": "悬赏通缉",
       "help": ""

tasks/bounty/assets/assets_bounty.py

@@ -75,17 +75,17 @@ OCR_TICKET = ButtonWrapper(
     name='OCR_TICKET',
     jp=Button(
         file='./assets/jp/bounty/OCR_TICKET.png',
-        area=(195, 85, 237, 113),
+        area=(196, 87, 258, 113),
-        search=(175, 65, 257, 133),
+        search=(176, 67, 278, 133),
-        color=(197, 206, 213),
+        color=(173, 197, 212),
-        button=(195, 85, 237, 113),
+        button=(196, 87, 258, 113),
     ),
     en=Button(
         file='./assets/en/bounty/OCR_TICKET.png',
-        area=(225, 85, 267, 114),
+        area=(229, 89, 285, 112),
-        search=(205, 65, 287, 134),
+        search=(209, 69, 305, 132),
-        color=(197, 206, 213),
+        color=(177, 194, 207),
-        button=(225, 85, 267, 114),
+        button=(229, 89, 285, 112),
     ),
 )
 SELECT_DESERT_RAILROAD = ButtonWrapper(

tasks/bounty/bounty.py

@@ -41,8 +41,9 @@ class Bounty(BountyUI):
         if action == 'stop':
             raise RequestHumanTakeover
         elif action == 'skip':
-            self.config.task_delay(server_update=True)
+            with self.config.multi_set():
-            self.config.task_stop()
+                self.config.task_delay(server_update=True)
+                self.config.task_stop()
 
     @property
     def is_ticket_enough(self) -> bool:

tasks/item/data_update.py

@@ -12,7 +12,10 @@ class DataUpdate(UI):
         Page:
             in: page_work
         """
-        ap = DigitCounter(OCR_AP).ocr_single_line(self.device.image)
+        ap, _, ap_total = DigitCounter(OCR_AP).ocr_single_line(self.device.image)
+        if ap_total == 0:
+            logger.warning('Invalid AP')
+            return False
         # Data for Credit and Pyroxene
         ocr = Digit(OCR_DATA)
         timeout = Timer(2, count=6).start()
@@ -21,27 +24,28 @@ class DataUpdate(UI):
             if len(data) != 2:
                 data = [data[0], data[-1]]
             logger.attr('Data', data)
-            credit, pyroxene = [int(''.join([v for v in d.ocr_text if v.isdigit()])) for d in data]
+            credit, pyroxene = [int(''.join(filter(lambda x: x.isdigit(), d.ocr_text))) for d in data]
             if credit > 0 or pyroxene > 0:
                 break
 
             logger.warning(f'Invalid credit and pyroxene: {data}')
             if timeout.reached():
                 logger.warning('Get data timeout')
-                break
+                return False
 
         logger.attr('Credit', credit)
         logger.attr('Pyroxene', pyroxene)
         with self.config.multi_set():
-            self.config.stored.AP.set(ap[0], ap[2])
+            self.config.stored.AP.set(ap, ap_total)
             self.config.stored.Credit.value = credit
             self.config.stored.Pyroxene.value = pyroxene
 
-        return ap, credit, pyroxene
+        return True
 
     def run(self):
         self.ui_ensure(page_work, acquire_lang_checked=False)
 
-        with self.config.multi_set():
+        if self._get_data():
-            self._get_data()
             self.config.task_delay(server_update=True)
+        else:
+            self.config.task_delay(minute=1)

tasks/scrimmage/assets/assets_scrimmage.py

@@ -75,17 +75,17 @@ OCR_TICKET = ButtonWrapper(
     name='OCR_TICKET',
     jp=Button(
         file='./assets/jp/scrimmage/OCR_TICKET.png',
-        area=(195, 85, 235, 113),
+        area=(194, 87, 258, 112),
-        search=(175, 65, 255, 133),
+        search=(174, 67, 278, 132),
-        color=(206, 211, 215),
+        color=(207, 213, 218),
-        button=(195, 85, 235, 113),
+        button=(194, 87, 258, 112),
     ),
     en=Button(
         file='./assets/en/scrimmage/OCR_TICKET.png',
-        area=(227, 84, 265, 115),
+        area=(229, 88, 289, 112),
-        search=(207, 64, 285, 135),
+        search=(209, 68, 309, 132),
-        color=(207, 212, 216),
+        color=(199, 206, 212),
-        button=(227, 84, 265, 115),
+        button=(229, 88, 289, 112),
     ),
 )
 SELECT_GEHENNA = ButtonWrapper(

tasks/scrimmage/scrimmage.py

@@ -42,8 +42,9 @@ class Scrimmage(ScrimmageUI):
         if action == 'stop':
             raise RequestHumanTakeover
         elif action == 'skip':
-            self.config.task_delay(server_update=True)
+            with self.config.multi_set():
-            self.config.task_stop()
+                self.config.task_delay(server_update=True)
+                self.config.task_stop()
 
     @property
     def is_ticket_enough(self) -> bool:

tasks/stage/list.py

@@ -1,17 +1,15 @@
-import cv2
 import numpy as np
 
 from module.base.base import ModuleBase
-from module.base.button import ClickButton, match_template
 from module.base.timer import Timer
-from module.base.utils import area_pad, area_size, area_offset, random_rectangle_vector_opted
+from module.base.utils import area_pad, area_size, area_offset
 from module.logger import logger
 from module.ocr.ocr import Ocr
 from tasks.stage.assets.assets_stage_list import *
 
 
 class StageList:
-    drag_vector_range = (0.65, 0.85)
+    swipe_vector_range = (0.65, 0.85)
 
     def __init__(
             self,
@@ -21,7 +19,7 @@ class StageList:
             button_item: ButtonWrapper = None,
             button_enter: ButtonWrapper = None,
             button_stars: ButtonWrapper = None,
-            drag_direction: str = "down"
+            swipe_direction: str = "down"
     ):
         self.name = name
         self.stage = button_list if button_list else STAGE_LIST
@@ -29,7 +27,7 @@ class StageList:
         self.stage_item = (button_item if button_item else STAGE_ITEM).button
         self.enter = button_enter if button_enter else STAGE_ENTER
         self.sweepable = button_stars if button_stars else STAGE_STARS
-        self.drag_direction = drag_direction
+        self.swipe_direction = swipe_direction
 
         self.current_index_min = 1
         self.current_index_max = 1
@@ -63,7 +61,7 @@ class StageList:
         self.current_index_max = max(indexes)
         logger.attr(self.index_ocr.name, f'Index range: {self.current_index_min} - {self.current_index_max}')
 
-    def drag_page(self, direction: str, main: ModuleBase, vector_range=None, reverse=False):
+    def swipe_page(self, direction: str, main: ModuleBase, vector_range=None, reverse=False):
         """
         Args:
             direction: up, down
@@ -72,7 +70,7 @@ class StageList:
             reverse (bool):
         """
         if vector_range is None:
-            vector_range = self.drag_vector_range
+            vector_range = self.swipe_vector_range
         vector = np.random.uniform(*vector_range)
         width, height = area_size(self.stage.button)
         if direction == 'up':
@@ -80,13 +78,12 @@ class StageList:
         elif direction == 'down':
             vector = (0, -vector * height)
         else:
-            logger.warning(f'Unknown drag direction: {direction}')
+            logger.warning(f'Unknown swipe direction: {direction}')
             return
 
         if reverse:
             vector = (-vector[0], -vector[1])
-        p1, p2 = random_rectangle_vector_opted(vector, box=self.stage.button)
+        main.device.swipe_vector(vector, self.stage.button, name=f'{self.name}_SWIPE')
-        main.device.drag(p1, p2, name=f'{self.name}_DRAG')
 
     def insight_index(self, index: int, main: ModuleBase, skip_first_screenshot=True) -> bool:
         """
@@ -113,9 +110,9 @@ class StageList:
                 break
 
             if index < self.current_index_min:
-                self.drag_page(self.drag_direction, main, reverse=True)
+                self.swipe_page(self.swipe_direction, main, reverse=True)
             elif index > self.current_index_max:
-                self.drag_page(self.drag_direction, main)
+                self.swipe_page(self.swipe_direction, main)
 
             main.wait_until_stable(
                 self.stage.button,
@@ -131,21 +128,6 @@ class StageList:
 
         return True
 
-    @staticmethod
-    def _match_clickable_points(image, template, threshold=0.85):
-        image = cv2.cvtColor(image, cv2.COLOR_RGB2GRAY)
-        template = cv2.cvtColor(template, cv2.COLOR_RGB2GRAY)
-
-        res = cv2.matchTemplate(image, template, cv2.TM_CCOEFF_NORMED)
-        loc = np.where(res >= threshold)
-        return [point for point in zip(*loc[::-1])]
-
-    def is_sweepable(self, image, main: ModuleBase, skip_first_screenshot=True) -> bool:
-        if not skip_first_screenshot:
-            main.device.screenshot()
-
-        return match_template(image, self.sweepable.matched_button.image)
-
     def select_index_enter(
             self,
             main: ModuleBase,
@@ -182,23 +164,21 @@ class StageList:
 
             stage_item_box = area_pad((*offset, *area_size(self.stage_item)))
             search_box = area_offset(stage_item_box, index_box.box[:2])
-            search_image = main.image_crop(search_box)
+            self.sweepable.load_search(search_box)
 
-            if sweepable and not self.is_sweepable(search_image, main, skip_first_screenshot):
+            if sweepable and not main.appear(self.sweepable):
                 logger.warning(f'Index {index} is not sweepable')
                 return False
 
-            points = self._match_clickable_points(search_image, self.enter.matched_button.image)
+            self.enter.load_search(search_box)
+            click_button = self.enter.match_multi_template(main.device.image)
 
-            if not points:
+            if not click_button:
                 logger.warning(f'No clickable {self.enter.name}')
                 continue
 
-            point = area_offset((0, 0, *area_size(self.enter.button)), points[0])
-            click_button = ClickButton(area_offset(point, search_box[:2]), name=self.enter.name)
-
             if click_interval.reached_and_reset():
-                main.device.click(click_button)
+                main.device.click(click_button[0])
                 return True
 
             if timeout.reached():

tasks/stage/sweep.py

@@ -204,7 +204,7 @@ class StageSweep:
         if not self.set_mode(mode, num):
             return False
         timer = Timer(0.5, 1)
-        timer_stable = Timer(0.5, 1).start()
+        timer_stable = Timer(1, 1).start()
         status = SweepStatus.SELECT
         while 1:
             if not timer_stable.reached():