Просмотр исходного кода

feat(GuildActivityMonitor): 支持按周几控制监控任务运行

-在 GuildActivityMonitorCombatTime 中新增 run_days 配置项,默认值为 1,2,3,4,5,6,7(周一到周日)。
-任务启动时根据 datetime.now().weekday()+1 判断当天星期,若不在 run_days 中则直接跳过并结束
yuyuyuyuyu 7 месяцев назад
Родитель
Сommit
30ecbcd294
2 измененных файлов с 11 добавлено и 3 удалено
  1. 1 0
      tasks/GuildActivityMonitor/config.py
  2. 10 3
      tasks/GuildActivityMonitor/script_task.py

+ 1 - 0
tasks/GuildActivityMonitor/config.py

@@ -9,6 +9,7 @@ class GuildActivityMonitorCombatTime(BaseModel):
     detection_interval: int = Field(default=30, description="通知检测间隔(秒)\n通过adb检测系统中收到的活动推送,自动拉起对应任务")
     detection_interval: int = Field(default=30, description="通知检测间隔(秒)\n通过adb检测系统中收到的活动推送,自动拉起对应任务")
     monitor_duration: int = Field(default=15, description="监控持续时间(分)\n请确保已开启游戏通知权限,游戏设置权限中对应活动推送")
     monitor_duration: int = Field(default=15, description="监控持续时间(分)\n请确保已开启游戏通知权限,游戏设置权限中对应活动推送")
     recheck_interval: int = Field(default=5, 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")
 
 
 class GuildActivity(BaseModel):
 class GuildActivity(BaseModel):
     # 道馆
     # 道馆

+ 10 - 3
tasks/GuildActivityMonitor/script_task.py

@@ -15,6 +15,14 @@ class ScriptTask(GameUi):
 
 
         :return:
         :return:
         """
         """
+        monitor_config = self.config.guild_activity_monitor.guild_activity_monitor_combat_time
+        today = datetime.now().weekday() + 1
+        run_days = {int(day.strip()) for day in monitor_config.run_days.split(',') if day.strip().isdigit()}
+        if today not in run_days:
+            logger.info(f"今天是周{today},不在配置运行日期({monitor_config.run_days})内,跳过 GuildActivityMonitor")
+            self.set_next_run(task='GuildActivityMonitor', success=True, finish=True)
+            raise TaskEnd('GuildActivityMonitor')
+
         # 构建关键字映射
         # 构建关键字映射
         self.set_next_run(task='GuildActivityMonitor', success=True, finish=True)
         self.set_next_run(task='GuildActivityMonitor', success=True, finish=True)
         self.ui_get_current_page()
         self.ui_get_current_page()
@@ -83,11 +91,10 @@ class ScriptTask(GameUi):
         try:
         try:
             output = self.device.adb_shell(['dumpsys', 'notification', '--noredact'])
             output = self.device.adb_shell(['dumpsys', 'notification', '--noredact'])
 
 
-            # 改进的通知时间提取逻辑 - 只获取最新的通知
+            # 通知时间提取逻辑 - 只获取最新的通知
             notification_time = 0
             notification_time = 0
             notification_text = ""
             notification_text = ""
-            
-            # 使用更精确的正则表达式匹配每个通知块
+
             # 查找所有通知块,每个块包含时间戳和文本
             # 查找所有通知块,每个块包含时间戳和文本
             notification_blocks = re.findall(r'(when=(\d+)[\s\S]*?(?=when=|\Z))', output)
             notification_blocks = re.findall(r'(when=(\d+)[\s\S]*?(?=when=|\Z))', output)