!2 add operate check activity

app.py

@@ -69,6 +69,20 @@ def send_status(msg):#软件执行状态
         emit('processing_status', msg)
     except:
         return
+    
+def send_todo():#软件执行状态
+    try:
+        if msg == '':
+            emit('processing_status', g_status)
+            return
+        else:
+            g_status = msg
+        
+        if msg == "结束":
+            event.clear()
+        emit('processing_status', msg)
+    except:
+        return
 
 
 @socketio.on('monitor_begin')

app_dongri.py

@@ -67,6 +67,9 @@ def handle_disconnect():
 def send_hint(msg):#数组信息
     emit('processing_hint', msg)
 
+def send_todo():
+    emit('processing_todo', get_todo_msg())
+
 def send_status(msg):#软件执行状态
     global g_status_list
     try:
@@ -117,6 +120,7 @@ def monitor_begin():
     for item in reversed(task_queue):
         task_arr.append(item.name)
     send_hint(json.dumps(task_arr, ensure_ascii=False))
+    send_todo()
     send_status('')
     #print("send img")
 
@@ -238,6 +242,8 @@ def add_auto_task(isMaxCollect, isJina, isSimple = False, isAddStrengh = False,
                 write_Dailycfg(config)
         
 
+        task_queue.appendleft(task_checkActivities())
+
 
         task_queue.appendleft(task_information())
         if activity == 'lianmeng':

dongri_pic.py

@@ -127,6 +127,9 @@ class check_img:
     little_treasure = R'dongri_img\check\little_treasure.png'
     master_get = R'dongri_img\check\master_get.png'
     master = R'dongri_img\check\master.png'
+    activity_open = R'dongri_img\check\activity_open.png'
+    todoList = R'dongri_img\check\todoList.png'
+    todo_region = (87, 289, 511, 694)
 
 
 class information_img:

dongri_task.py

@@ -32,6 +32,11 @@ from dongri_pic import _imported
 
 '''
 
+todo_msg = ''
+def get_todo_msg():
+    global todo_msg
+    return todo_msg
+
 def task_getComputerName():
     return socket.gethostname()
 
@@ -65,7 +70,7 @@ class basic_operate:
             return
         ret, pos = waitFindImg(place_img.title, 1, 0)
         if ret:
-            pcacc_mouse.click(pos[0], pos[1] + 80)
+            pcacc_mouse.click(pos[0] + 80, pos[1] + 80)
 
 
     def backToGame(preTime = 0):
@@ -807,12 +812,30 @@ class task_checkMaster(dongri_task):
             return False
         return True
 
+class task_checkActivities(dongri_task):
+
+    def __init__(self):
+        super().__init__(f"检查各种活动时间")
+    def run(self):
+        global todo_msg
+        basic_operate.go_outside()
+        if waitClickImg_noWait_withBool(check_img.activity_open, 2, 1) == False:
+            return False
+        if waitFindImg_withBool(check_img.todoList, 2, 1) == False:
+            return False
+        
+        activityStr = yys_ocrAuto(check_img.todo_region)
+        if not activityStr:
+            todo_msg = activityStr
+        return activityStr
+
 
 
 
 
 if __name__ == '__main__':
-    task_checkMaster().run()
+    task_checkActivities().run()
+    #task_checkMaster().run()
     #basic_operate.get_line_num()
     #yys_ocrAuto(check_img.line_orc)
     #basic_operate.go_town()

templates/index_dongri.html

@@ -38,9 +38,11 @@
             <option value="0">停止</option>
         </select>
         <canvas id="canvas" width="300" height="400"></canvas>
+        <h3>待办列表:</h3>
+        <div id="task_message" style="border: 1px solid #ccc; padding: 10px; margin-top: 10px;"></div>
     </div>
 
-    <div class="status-container ">
+    <div class="status-container">
         <h3>状态：</h3>
         <div id="status_message" style="border: 1px solid #ccc; padding: 10px; margin-top: 10px;"></div>
         <h3>任务列表：</h3>
@@ -114,6 +116,11 @@
             messageBox.innerHTML = msg;
             console.log(msg);
         });
+        socket.on('processing_todo', (msg) => {
+            var messageBox = document.getElementById('task_message');
+            messageBox.innerHTML = msg;
+            console.log(msg);
+        });
         socket.on('processing_title', (msg) => {
             var messageBox = document.getElementById('title_message');
             messageBox.innerHTML = msg;