Преглед изворни кода

fix(KekkaiActivation): Save changes #187

huangrunheng пре 2 година
родитељ
комит
fe32cd97f4
3 измењених фајлова са 14 додато и 9 уклоњено
  1. 2 2
      dev_tools/assets_test.py
  2. 11 7
      module/device/screenshot.py
  3. 1 0
      tasks/KekkaiActivation/script_task.py

+ 2 - 2
dev_tools/assets_test.py

@@ -32,10 +32,10 @@ def detect_ocr(file: str, target: RuleOcr):
 
 
 # 图片文件路径 可以是相对路径
-IMAGE_FILE = './log/error/1705350270552/2024-01-16_04-24-30-481597.png'
+IMAGE_FILE = './log/screenshots/1706857943173.png'
 if __name__ == '__main__':
     from tasks.KekkaiActivation.assets import KekkaiActivationAssets
-    targe = KekkaiActivationAssets.I_A_INVITE
+    targe = KekkaiActivationAssets.I_CARDS_KAIKO_6
     print(detect_image(IMAGE_FILE, targe))
     # from tasks.KekkaiActivation.assets import KekkaiActivationAssets
     # target = KekkaiActivationAssets.O_CARD_ALL_TIME

+ 11 - 7
module/device/screenshot.py

@@ -2,6 +2,7 @@ import os
 import time
 from collections import deque
 from datetime import datetime
+from pathlib import Path
 
 import cv2
 import numpy as np
@@ -119,18 +120,21 @@ class Screenshot(Adb, DroidCast, Scrcpy, Window):
         """
         now = time.time()
         if interval is None:
-            interval = self.config.SCREEN_SHOT_SAVE_INTERVAL
+            interval = 1  # 可改
 
         if now - self._last_save_time.get(genre, 0) > interval:
             fmt = 'png'
-            file = '%s.%s' % (int(now * 1000), fmt)
+            file: str = '%s.%s' % (int(now * 1000), fmt)
 
-            folder = self.config.SCREEN_SHOT_SAVE_FOLDER_BASE if to_base_folder else self.config.SCREEN_SHOT_SAVE_FOLDER
-            folder = os.path.join(folder, genre)
-            if not os.path.exists(folder):
-                os.mkdir(folder)
+            folder = Path('./log/screenshots')
+            folder.mkdir(parents=True, exist_ok=True)
+            file: Path = folder / file
+            file = file.resolve()
+            # folder = os.path.join(folder, genre)
+            # if not os.path.exists(folder):
+            #     os.mkdir(folder)
 
-            file = os.path.join(folder, file)
+            # file = os.path.join(folder, file)
             self.image_save(file)
             self._last_save_time[genre] = now
             return True

+ 1 - 0
tasks/KekkaiActivation/script_task.py

@@ -267,6 +267,7 @@ class ScriptTask(KU, KekkaiActivationAssets):
             self.screenshot()
             current_best = self._current_select_best(card_best)
             if current_best is None:
+                logger.warning('There is no card in the list')
                 break
 
             if current_best == self.order_cards[0]: