automas_admin/AUTO-MAS-test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加托盘中止任务选项

Browse Source
This commit is contained in:
DLmaster
2024-12-10 19:59:12 +08:00
parent e5aeb4f3a7
commit 250c47ccb7
2 changed files with 30 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
AUTO_MAA.py
View File

@@ -1847,7 +1847,7 @@ class Main(QWidget):
# 插入预设用户数据 # 插入预设用户数据
if self.user_set.currentIndex() == 0: if self.user_set.currentIndex() == 0:
self.cur.execute( self.cur.execute(
"INSERT INTO adminx VALUES('新用户','手机号码（官服）/B站ID（B服）','Official',0,'y','2000-01-01','1-7','-','-','y','y','n',?,'无',0,'simple',?)", "INSERT INTO adminx VALUES('新用户','手机号码（官服）/B站ID（B服）','Official',-1,'y','2000-01-01','1-7','-','-','y','y','n',?,'无',0,'simple',?)",
( (
self.encryptx("未设置"), self.encryptx("未设置"),
self.user_list_simple.rowCount(), self.user_list_simple.rowCount(),
@@ -1861,7 +1861,7 @@ class Main(QWidget):
) )
elif self.user_set.currentIndex() == 1: elif self.user_set.currentIndex() == 1:
self.cur.execute( self.cur.execute(
"INSERT INTO adminx VALUES('新用户','手机号码（官服）/B站ID（B服）','Official',0,'y','2000-01-01','1-7','-','-','y','y','-',?,'无',0,'beta',?)", "INSERT INTO adminx VALUES('新用户','手机号码（官服）/B站ID（B服）','Official',-1,'y','2000-01-01','1-7','-','-','y','y','-',?,'无',0,'beta',?)",
( (
self.encryptx("未设置"), self.encryptx("未设置"),
self.user_list_beta.rowCount(), self.user_list_beta.rowCount(),
@@ -2683,6 +2683,9 @@ class AUTO_MAA(QMainWindow):
start_task_2 = self.tray_menu.addAction("运行人工排查") start_task_2 = self.tray_menu.addAction("运行人工排查")
start_task_2.triggered.connect(lambda: self.start_task("人工排查")) start_task_2.triggered.connect(lambda: self.start_task("人工排查"))
stop_task = self.tray_menu.addAction("中止当前任务")
stop_task.triggered.connect(self.stop_task)
# 退出主程序菜单项 # 退出主程序菜单项
kill = self.tray_menu.addAction("退出主程序") kill = self.tray_menu.addAction("退出主程序")
kill.triggered.connect(self.kill_main) kill.triggered.connect(self.kill_main)
@@ -2722,6 +2725,29 @@ class AUTO_MAA(QMainWindow):
else: else:
self.main.maa_starter(mode) self.main.maa_starter(mode)
def stop_task(self):
"""中止当前任务"""
if self.main.MaaRunner.isRunning():
if (
self.main.MaaRunner.mode == "日常代理"
or self.main.MaaRunner.mode == "人工排查"
):
self.main.maa_ender(f"{self.main.MaaRunner.mode}_结束")
elif "设置MAA" in self.main.MaaRunner.mode:
self.main.push_notification(
"正在设置MAA！",
"正在运行设置MAA任务，无法中止",
"正在运行设置MAA任务，无法中止",
10,
)
else:
self.main.push_notification(
"无任务运行！",
"当前无任务正在运行，无需中止",
"当前无任务正在运行，无需中止",
10,
)
def kill_main(self): def kill_main(self):
"""退出主程序""" """退出主程序"""
self.close() self.close()

4
res/version.json
View File

@@ -1,7 +1,7 @@
{ {
"main_version": "4.1.3.3", "main_version": "4.1.3.4",
"main_download_url": "https://ghp.ci/https://github.com/DLmaster361/AUTO_MAA/releases/download/v4.1.3_beta/AUTO_MAA_v4.1.3_beta.zip", "main_download_url": "https://ghp.ci/https://github.com/DLmaster361/AUTO_MAA/releases/download/v4.1.3_beta/AUTO_MAA_v4.1.3_beta.zip",
"updater_version": "1.0.5.0", "updater_version": "1.0.5.0",
"updater_download_url": "https://ghp.ci/https://github.com/DLmaster361/AUTO_MAA/releases/download/v4.1.3_beta/Updater_v1.0.5.zip", "updater_download_url": "https://ghp.ci/https://github.com/DLmaster361/AUTO_MAA/releases/download/v4.1.3_beta/Updater_v1.0.5.zip",
"announcement": "\n## 新增功能\n- 暂无\n## 修复BUG\n- 修复深色模式下UI异常 #10\n## 程序优化\n- MainTimer逻辑实现优化" "announcement": "\n## 新增功能\n- 添加托盘中止当前任务选项\n## 修复BUG\n- 修复深色模式下UI异常 #10\n## 程序优化\n- MainTimer逻辑实现优化"
} }