Bladeren bron

!2 change to todo list

pcacc 4 maanden geleden
bovenliggende
commit
944d8c2d66
2 gewijzigde bestanden met toevoegingen van 7 en 7 verwijderingen
  1. 1 1
      app_dongri.py
  2. 6 6
      dongri_task.py

+ 1 - 1
app_dongri.py

@@ -70,7 +70,7 @@ def send_hint(msg):#数组信息
     emit('processing_hint', msg)
 
 def send_todo():
-    emit('processing_todo', get_todo_msg())
+    emit('processing_todo', get_todo_msgList())
 
 def send_status(msg):#软件执行状态
     global g_status_list, g_times

+ 6 - 6
dongri_task.py

@@ -942,7 +942,7 @@ class task_checkMaster(dongri_task):
 class task_checkActivities(dongri_task):
     def __init__(self):
         super().__init__(f"检查各种活动时间")
-    def find_all_matching_events(parts, input_word):
+    def find_all_matching_events(self, parts, input_word):
         results = []
         # 查找所有包含输入关键词的项
         matches = [i for i, part in enumerate(parts) if input_word in part]
@@ -971,8 +971,7 @@ class task_checkActivities(dongri_task):
             todo_msg = activityStr
             print(todo_msg)
             result = []
-            '''
-            ['北京时间', '2025-04-01', '据点争夺', '07:00', '3级科技工程站']
+            
             judianArr = self.find_all_matching_events(activityStr, "据点")
             result.extend(judianArr)
             
@@ -984,7 +983,8 @@ class task_checkActivities(dongri_task):
             yaosaiArr = self.find_all_matching_events(activityStr, "要塞")
             result.extend(yaosaiArr)
             todo_list = result
-            '''
+            print(todo_list)
+            
         return activityStr
 
 
@@ -994,7 +994,7 @@ class task_checkActivities(dongri_task):
 if __name__ == '__main__':
     #task_fight_jina_only().run()
     #task_checkConfilits().run()
-    #task_checkActivities().run()
+    task_checkActivities().run()
     #task_checkMaster().run()
     #basic_operate.get_line_num()
     #yys_ocrAuto(check_img.line_orc)
@@ -1002,7 +1002,7 @@ if __name__ == '__main__':
     #basic_operate.add_strength()
     #task_fightMonster(False, False,False).run()
     #task_checkHelp().run()
-    task_checkStoreRoom().run()
+    #task_checkStoreRoom().run()
     #task_activity_lianmeng().run()
     #task_fight_yongbing(True).run()
     #task_collect([4,3,2,1]).run()