Răsfoiți Sursa

Merge pull request #1764 from LGG686/dev-g

refactor(GuildActivityMonitor): 修复ADB多通知漏检问题并新增OCR检测模式
huangrunheng 2 luni în urmă
părinte
comite
b6b698a386

+ 2 - 1
assets/i18n/zh-CN.json

@@ -69,5 +69,6 @@
   "long_rest_duration": "强制休息时长",
   "long_rest_duration_help": "触发累计活跃上限后的强制休息时长。格式:天 时:分:秒。",
   "min_run_interval": "最小再运行间隔",
-  "min_run_interval_help": "防风控:两次蹭卡运行之间的最小间隔,避免蹭卡过于频繁被服务端标记。设为 0(默认)保持原逻辑(按结界卡剩余时间安排下次)。格式:天 时:分:秒。"
+  "min_run_interval_help": "防风控:两次蹭卡运行之间的最小间隔,避免蹭卡过于频繁被服务端标记。设为 0(默认)保持原逻辑(按结界卡剩余时间安排下次)。格式:天 时:分:秒。",
+  "costume_shikigami_11": "花札幕台"
 }

+ 6 - 1
tasks/GuildActivityMonitor/assets.py

@@ -8,5 +8,10 @@ from module.atom.list import RuleList
 # This file was automatically generated by ./dev_tools/assets_extract.py.
 # Don't modify it manually.
 class GuildActivityMonitorAssets: 
-	pass
+
+
+	# Ocr Rule Assets
+	# 寮活动通知检测区域 
+	O_GUILD_ACTIVITY_NOTIFY = RuleOcr(roi=(13,213,457,86), area=(13,213,457,86), mode="Full", method="Default", keyword="", name="guild_activity_notify")
+
 

+ 3 - 3
tasks/GuildActivityMonitor/config.py

@@ -1,15 +1,15 @@
-from pydantic import Field
+from pydantic import BaseModel, Field
 
 from tasks.Component.config_scheduler import Scheduler
 from tasks.Component.config_base import ConfigBase
-from pydantic import BaseModel, Field
 
 class GuildActivityMonitorCombatTime(BaseModel):
     # 设置检测时间
-    detection_interval: int = Field(default=30, description="通知检测间隔(秒)\n通过adb检测系统中收到的活动推送,自动拉起对应任务")
+    detection_interval: int = Field(default=30, description="通知检测间隔(秒)\n通过adb/ocr检测收到的活动推送,自动拉起对应任务")
     monitor_duration: int = Field(default=15, description="监控持续时间(分)\n请确保已开启游戏通知权限,游戏设置权限中对应活动推送")
     recheck_interval: int = Field(default=5, description="拉起对应活动后,间隔多久再次开启检测(分)\n若监控时间内未检测到活动,则按调度器设置下次运行时间")
     run_days: str = Field(default="1,2,3,4,5,6,7", description="运行日期,1-7 对应周一到周日;例如 5,6,7")
+    use_ocr: bool = Field(default=False, description="启用OCR检测模式\n勾选: 通过OCR识别屏幕通知区域文字\n不勾选: 通过adb读取系统通知(默认)\n启用此项建议检测间隔改为1-5s左右")
 
 class GuildActivity(BaseModel):
     # 道馆

+ 11 - 0
tasks/GuildActivityMonitor/res/ocr.json

@@ -0,0 +1,11 @@
+[
+  {
+    "itemName": "guild_activity_notify",
+    "roiFront": "13,213,457,86",
+    "roiBack": "13,213,457,86",
+    "mode": "Full",
+    "method": "Default",
+    "keyword": "",
+    "description": "寮活动通知检测区域"
+  }
+]

+ 94 - 96
tasks/GuildActivityMonitor/script_task.py

@@ -1,27 +1,35 @@
 import re
 import time
 from datetime import datetime, timedelta
+
 from module.base.timer import Timer
 from module.exception import TaskEnd
 from module.logger import logger
 from tasks.GameUi.game_ui import GameUi
 from tasks.GameUi.page import page_main
+from tasks.GuildActivityMonitor.assets import GuildActivityMonitorAssets
 
 
-class ScriptTask(GameUi):
+class ScriptTask(GameUi, GuildActivityMonitorAssets):
 
     def run(self):
-        """ 阴阳寮活动监控主函数
+        """阴阳寮活动监控主函数"""
+        if not self.check_run_days():
+            raise TaskEnd('GuildActivityMonitor')
+        self.ui_get_current_page()
+        self.ui_goto(page_main)
+        keyword_map = self.build_keyword_map()
+        self.monitor_activities(keyword_map)
 
-        :return:
-        """
+    def check_run_days(self) -> bool:
+        """检查今天是否在运行日期内,设置下次运行时间"""
         monitor_config = self.config.guild_activity_monitor.guild_activity_monitor_combat_time
         now = datetime.now()
         today = now.weekday() + 1
         run_days = sorted({day for day in map(int, re.findall(r'\d+', monitor_config.run_days)) if 1 <= day <= 7})
         if not run_days:
             logger.warning(f"运行日期配置无效: {monitor_config.run_days},跳过 GuildActivityMonitor")
-            raise TaskEnd('GuildActivityMonitor')
+            return False
 
         in_run_days = today in run_days
         candidate_days = [day for day in run_days if day != today] if in_run_days else run_days
@@ -33,122 +41,112 @@ class ScriptTask(GameUi):
         next_target = datetime.combine(next_date.date(), server_update) if use_server_time else next_date
         status = '在' if in_run_days else '不在'
         action = '本次继续执行' if in_run_days else '跳过 GuildActivityMonitor'
-        logger.info(f"今天是周{today},{status}配置运行日期({monitor_config.run_days})内,"f"{action},下次运行时间: {next_target}")
-        self.set_next_run(task='GuildActivityMonitor',success=None,finish=False,server=False,target=next_target)
-        if not in_run_days:
-            raise TaskEnd('GuildActivityMonitor')
+        logger.info(f"今天是周{today},{status}配置运行日期({monitor_config.run_days})内,"
+                    f"{action},下次运行时间: {next_target}")
+        self.set_next_run(task='GuildActivityMonitor', success=None, finish=False, server=False, target=next_target)
+        return in_run_days
 
-        # 构建关键字映射
-        self.ui_get_current_page()
-        self.ui_goto(page_main)
+    def build_keyword_map(self) -> dict:
+        """构建活动关键字到任务名的映射"""
         guild_config = self.config.guild_activity_monitor.guild_activity
-        KEYWORD_MAP = {
+        keyword_map = {
             '道馆': 'Dokan' if guild_config.Dokan else None,
             '狭间': 'AbyssShadows' if guild_config.AbyssShadows else None,
             '宴会': 'GuildBanquet' if guild_config.GuildBanquet else None,
             '退治': 'DemonRetreat' if guild_config.DemonRetreat else None,
         }
-        KEYWORD_MAP = {k: v for k, v in KEYWORD_MAP.items() if v}
-        monitored_activities = list(KEYWORD_MAP.keys())
-        logger.info(f"监控活动: {monitored_activities}")
+        keyword_map = {k: v for k, v in keyword_map.items() if v}
+        logger.info(f"监控活动: {list(keyword_map.keys())}")
+        return keyword_map
 
-        # 初始化监控配置
+    def monitor_activities(self, keyword_map: dict):
+        """启动活动监控循环"""
         monitor_config = self.config.guild_activity_monitor.guild_activity_monitor_combat_time
-        duration_minutes = monitor_config.monitor_duration
         interval = monitor_config.detection_interval
-        logger.info(f"开始阴阳寮活动监控,持续{duration_minutes}分钟,每{interval}秒检测一次")
+        use_ocr = monitor_config.use_ocr
+        keywords = list(keyword_map.keys())
+        logger.info(f"开始阴阳寮活动监控,持续{monitor_config.monitor_duration}分钟,"
+                    f"每{interval}秒检测一次,模式: {'ocr' if use_ocr else 'adb'}")
 
-        # 初始化定时器
         check_timer = Timer(monitor_config.monitor_duration * 60)
         check_timer.start()
         log_timer = Timer(60)
         log_timer.start()
 
-        # 获取初始通知时间
-        init_time, _ = self.get_notification_info()
-
-        # 监控任务属于长等待场景,加入长等待白名单,避免被全局卡死检测误判
-        self.device.stuck_record_add('PAUSE')
-
-        # 主监控循环
-        try:
-            while True:
-                if check_timer.reached():
-                    logger.info("监控时间到,任务结束")
-                    raise TaskEnd('GuildActivityMonitor')
+        if use_ocr:
+            init_keyword = self.get_notification_info_ocr(keywords)
+            logger.info(f"初始通知关键字: {init_keyword or '无'}")
+        else:
+            init_time, _ = self.get_notification_info(keywords)
+
+        stuck_interval = Timer(280)
+        while True:
+            if not stuck_interval.started() or stuck_interval.reached():
+                self.device.stuck_record_clear()
+                self.device.stuck_record_add('PAUSE')
+                stuck_interval.reset()
+
+            if check_timer.reached():
+                logger.info("监控时间到,任务结束")
+                raise TaskEnd('GuildActivityMonitor')
+
+            if log_timer.reached():
+                remaining = int(check_timer.remain() // 60)
+                logger.info(f"监控中... 剩余时间: {remaining}分钟")
+                log_timer.reset()
+
+            self.screenshot()
+
+            if use_ocr:
+                notification_text = self.get_notification_info_ocr(keywords)
+                if notification_text and notification_text != init_keyword:
+                    self.trigger_activity_task(notification_text, keyword_map[notification_text])
+            else:
+                current_time, notification_text = self.get_notification_info(keywords)
+                if current_time > init_time and notification_text:
+                    task_name = keyword_map.get(notification_text)
+                    if task_name:
+                        self.trigger_activity_task(notification_text, task_name)
 
-                if log_timer.reached():
-                    remaining = int(check_timer.remain() // 60)
-                    logger.info(f"监控中... 剩余时间: {remaining}分钟")
-                    log_timer.reset()
+            time.sleep(interval)
 
-                # 处理突发事件
-                self.screenshot()
+    def trigger_activity_task(self, keyword, task_name):
+        """检测到活动关键字后拉起对应任务并结束监控"""
+        logger.info(f"检测到关键字 '{keyword}',启动任务: {task_name}")
+        monitor_config = self.config.guild_activity_monitor.guild_activity_monitor_combat_time
+        self.set_next_run(task=task_name, success=False, finish=False, server=False, target=datetime.now())
+        self.set_next_run(task='GuildActivityMonitor', success=False, finish=False, server=False,
+                          target=datetime.now() + timedelta(minutes=monitor_config.recheck_interval))
+        raise TaskEnd('GuildActivityMonitor')
 
-                # 检测新通知
-                current_time, notification_text = self.get_notification_info()
-                if current_time > init_time and notification_text:
-                    logger.info(f"检测到新通知: {notification_text}")
-                    for keyword, task_name in KEYWORD_MAP.items():
-                        if keyword in notification_text:
-                            logger.info(f"检测到关键字 '{keyword}',启动任务: {task_name}")
-                            self.set_next_run(task=task_name, success=False, finish=False, server=False, target=datetime.now())
-                            recheck_interval = monitor_config.recheck_interval
-                            self.set_next_run(task='GuildActivityMonitor', success=False, finish=False, server=False, target=datetime.now() + timedelta(minutes=recheck_interval))
-                            raise TaskEnd('GuildActivityMonitor')
-
-                time.sleep(interval)
-        finally:
-            self.device.stuck_record_clear()
-
-    def get_notification_info(self) -> tuple:
+    def get_notification_info(self, keywords: list) -> tuple:
+        """通过adb读取系统通知,返回最新活动通知的时间戳和关键字"""
         try:
             output = self.device.adb_shell(['dumpsys', 'notification', '--noredact'])
-
-            # 通知时间提取逻辑 - 只获取最新的通知
-            notification_time = 0
-            notification_text = ""
-
-            # 查找所有通知块,每个块包含时间戳和文本
             notification_blocks = re.findall(r'(when=(\d+)[\s\S]*?(?=when=|\Z))', output)
-            
-            if notification_blocks:
-                # 找到最新的通知块
-                latest_block_time = 0
-                latest_text = ""
-                
-                for block, time_str in notification_blocks:
-                    current_time = float(time_str)
-                    if current_time > latest_block_time:
-                        latest_block_time = current_time
-                        # 在当前块中查找活动类型
-                        if re.search(r'宴会[^\w]', block) or '寮宴会' in block:
-                            latest_text = '宴会'
-                        elif re.search(r'狭间[^\w]', block) or '狭间暗域' in block:
-                            latest_text = '狭间'
-                        elif re.search(r'退治[^\w]', block) or '首领退治' in block:
-                            latest_text = '退治'
-                        elif re.search(r'道馆[^\w]', block) or '道馆突破' in block:
-                            latest_text = '道馆'
-                
-                notification_time = latest_block_time
-                notification_text = latest_text
-
-            return notification_time, notification_text
+            if not notification_blocks:
+                return 0, ""
+            latest_time = 0
+            latest_text = ""
+            for block, time_str in notification_blocks:
+                current_time = float(time_str)
+                for keyword in keywords:
+                    if keyword in block and current_time > latest_time:
+                        latest_time = current_time
+                        latest_text = keyword
+                        break
+            return latest_time, latest_text
         except Exception as e:
             logger.warning(f"获取通知失败: {e}")
             return 0, ""
 
-    '''
-    def clear_notifications(self):
-        """清理系统通知"""
-        try:
-            # 清理所有通知
-            self.device.adb_shell(['cmd', 'notification', 'remove-all'])
-            logger.info("已清理系统通知")
-        except Exception as e:
-            logger.warning(f"清理通知失败: {e}")
-    '''
+    def get_notification_info_ocr(self, keywords: list) -> str:
+        """通过OCR识别屏幕通知区域,返回活动关键字"""
+        for keyword in keywords:
+            result = self.O_GUILD_ACTIVITY_NOTIFY.ocr(self.device.image, keyword=keyword)
+            if result != (0, 0, 0, 0):
+                return keyword
+        return ''
 
 
 if __name__ == '__main__':
@@ -158,4 +156,4 @@ if __name__ == '__main__':
     c = Config('oas1')
     d = Device(c)
     t = ScriptTask(c, d)
-    t.run()
+    t.run()