feat:将agent的输出重定向至主菜单

Author: overflow65537

app/utils/maafw.py

@@ -270,17 +270,28 @@ def run_task(self, entry: str, pipeline_override: dict = {}) -> bool:
                 print(
                     f"agent启动: {agent_data.get("child_exec").replace("{PROJECT_DIR}",  maa_config_data.resource_path)}\nMAA库地址{maa_bin}\nsocket_id: {socket_id}"
                 )
-                subprocess.Popen(
+                agent_process = subprocess.Popen(
                     [
                         agent_data.get("child_exec").replace("{PROJECT_DIR}", maa_config_data.resource_path),
                         *agent_data.get("child_args",[]),
                         maa_bin,
                         socket_id,
                     ],
+                    stdout=subprocess.PIPE,  # 新增stdout管道
+                    stderr=subprocess.STDOUT,  # 合并stderr到stdout
+                    text=True,  # 以文本模式读取
+                    encoding=sys.getdefaultencoding(),  # 使用系统默认编码
                 )
-                logger.debug(
-                    f"agent启动: {agent_data.get("child_exec").replace("{PROJECT_DIR}", maa_config_data.resource_path)}\nMAA库地址{maa_bin}\nsocket_id: {socket_id}"
-                )
+                
+                # 创建单独线程读取输出
+                def read_output():
+                    while agent_process.poll() is None:
+                        line = agent_process.stdout.readline()
+                        if line:
+                            signalBus.custom_info.emit({"type": "agent_output", "data": line.strip()})
+                
+                import threading
+                threading.Thread(target=read_output, daemon=True).start()
             except Exception as e:
                 logger.error(f"agent启动失败: {e}")
                 signalBus.custom_info.emit({"type": "error_a"})

app/view/task_interface.py

@@ -129,7 +129,6 @@ def init_ui(self):
         )
         self.init_finish_combox()
 
-
     def no_ADB_config(self):
         """
         没有ADB配置
@@ -254,6 +253,8 @@ def show_custom_info(self, msg):
                 )
             case "agent_start":
                 self.insert_colored_text(self.tr("Agent service start"))
+            case "agent_info":
+                self.insert_colored_text(msg["data"])
 
     # region 拖动事件
     def dragEnter(self, event: QDropEvent):
@@ -842,7 +843,7 @@ async def load_resources(self, PROJECT_DIR):
 
         self.focus_tips = {}
         self.on_error_list = []
-        
+
         for i in resource_path:
             resource = (
                 i.replace("{PROJECT_DIR}", PROJECT_DIR)
@@ -1173,9 +1174,13 @@ async def run_tasks(self):
             )
 
             await maafw.run_task(self.entry, override_options)
-            if not self.task_failed and maa_config_data.interface_config["task"][
-                enter_index
-            ].get("periodic", False) and cfg.get(cfg.speedrun):
+            if (
+                not self.task_failed
+                and maa_config_data.interface_config["task"][enter_index].get(
+                    "periodic", False
+                )
+                and cfg.get(cfg.speedrun)
+            ):
                 maa_config_data.config["task"][self.config_index][
                     "last_run"
                 ] = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
@@ -1464,7 +1469,6 @@ def Select_Task(self):
         self.SelectTask_Combox_1.setCurrentText(
             maa_config_data.config["task"][Select_Target]["name"]
         )
-        
 
         self.restore_options(maa_config_data.config["task"][Select_Target]["option"])
 
@@ -1576,7 +1580,7 @@ def show_task_options(
                         layout.addLayout(v_layout)
 
                 # 时间限制运行
-                if task.get("periodic") in [1, 2] and cfg.get(cfg.speedrun): 
+                if task.get("periodic") in [1, 2] and cfg.get(cfg.speedrun):
                     switch_v_layout = QVBoxLayout()
 
                     # 添加主标签