From 0c123e9389a2852e4241f28f9f540e7eea6b17a3 Mon Sep 17 00:00:00 2001
From: DLmaster <DLmaster_361@163.com>
Date: Sat, 8 Feb 2025 12:25:48 +0800
Subject: [PATCH] =?UTF-8?q?feat(services):=20=E9=80=9A=E7=9F=A5=E6=A0=87?=
 =?UTF-8?q?=E9=A2=98=E6=B7=BB=E5=8A=A0=E8=84=9A=E6=9C=AC=E5=AE=9E=E4=BE=8B?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/core/task_manager.py |  7 +++----
 app/models/MAA.py        | 19 +++++++++----------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/app/core/task_manager.py b/app/core/task_manager.py
index aae284d..c2217e7 100644
--- a/app/core/task_manager.py
+++ b/app/core/task_manager.py
@@ -54,10 +54,7 @@ class Task(QThread):
     accomplish = Signal(list)
 
     def __init__(
-        self,
-        mode: str,
-        name: str,
-        info: Dict[str, Dict[str, Union[str, int, bool]]],
+        self, mode: str, name: str, info: Dict[str, Dict[str, Union[str, int, bool]]]
     ):
         super(Task, self).__init__()
 
@@ -67,6 +64,8 @@ class Task(QThread):
 
         self.logs = []
 
+        self.question_response.connect(lambda: print("response"))
+
     def run(self):
 
         if "设置MAA" in self.mode:
diff --git a/app/models/MAA.py b/app/models/MAA.py
index bdb7b24..48ecb3b 100644
--- a/app/models/MAA.py
+++ b/app/models/MAA.py
@@ -503,9 +503,14 @@ class MaaManager(QObject):
                     f"{"\n".join([self.data[_][0] for _ in wait_index])}\n"
                 )
 
+            title = (
+                f"{self.set["MaaSet"]["Name"]}的{self.mode[:4]}任务报告"
+                if self.set["MaaSet"]["Name"] != ""
+                else f"{self.mode[:4]}任务报告"
+            )
             # 推送代理结果通知
             Notify.push_notification(
-                f"{self.mode[2:4]}任务已完成！",
+                title.replace("报告", "已完成！"),
                 f"已完成用户数：{len(over_index)}，未完成用户数：{len(error_index) + len(wait_index)}",
                 f"已完成用户数：{len(over_index)}，未完成用户数：{len(error_index) + len(wait_index)}",
                 10,
@@ -517,17 +522,11 @@ class MaaManager(QObject):
                 and len(error_index) + len(wait_index) != 0
             ):
                 Notify.send_mail(
-                    f"{self.mode[:4]}任务报告",
+                    title,
                     f"{end_log}\n\nAUTO_MAA 敬上\n\n我们根据您在 AUTO_MAA 中的设置发送了这封电子邮件，本邮件无需回复\n",
                 )
-                Notify.ServerChanPush(
-                    f"{self.mode[:4]}任务报告",
-                    f"{end_log}\n\nAUTO_MAA 敬上",
-                )
-                Notify.CompanyWebHookBotPush(
-                    f"{self.mode[:4]}任务报告",
-                    f"{end_log}AUTO_MAA 敬上",
-                )
+                Notify.ServerChanPush(title, f"{end_log}\n\nAUTO_MAA 敬上")
+                Notify.CompanyWebHookBotPush(title, f"{end_log}AUTO_MAA 敬上")
 
         self.agree_bilibili(False)
         self.accomplish.emit({"Time": begin_time, "History": end_log})