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

Merge branch 'DLMS_dev' into dev

Browse Source
This commit is contained in:
DLmaster
2025-03-15 00:00:57 +08:00
parent 364af4b9c5 6ee577302f
commit acc4045580
8 changed files with 95 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/core/config.py
View File

@@ -68,6 +68,7 @@ class AppConfig:
self.PASSWORD = ""
self.running_list = []
self.silence_list = []
self.if_ignore_silence = False
self.if_database_opened = False
# 检查文件完整性

28
app/core/task_manager.py
View File

@@ -27,7 +27,7 @@ v4.2
from loguru import logger
from PySide6.QtCore import QThread, QObject, Signal
from qfluentwidgets import Dialog
from qfluentwidgets import MessageBox
import json
from pathlib import Path
from datetime import datetime
@@ -187,9 +187,10 @@ class _TaskManager(QObject):
connect_gui = Signal(Task)
push_info_bar = Signal(str, str, str, int)
def __init__(self):
def __init__(self, main_window=None):
super(_TaskManager, self).__init__()
self.main_window = main_window
self.task_dict: Dict[str, Task] = {}
def add_task(
@@ -281,16 +282,33 @@ class _TaskManager(QObject):
"r", encoding="utf-8"
) as f:
info = json.load(f)
System.set_power(info["QueueSet"]["AfterAccomplish"])
if info["QueueSet"]["AfterAccomplish"] != "None":
from app.ui import ProgressRingMessageBox
mode_book = {
"Shutdown": "关机",
"Hibernate": "休眠",
"Sleep": "睡眠",
"KillSelf": "关闭AUTO_MAA",
}
choice = ProgressRingMessageBox(
self.main_window,
f"{mode_book[info['QueueSet']['AfterAccomplish']]}倒计时",
)
if choice.exec():
System.set_power(info["QueueSet"]["AfterAccomplish"])
def push_dialog(self, name: str, title: str, content: str):
"""推送对话框"""
choice = Dialog(title, content, None)
choice = MessageBox(title, content, self.main_window)
choice.yesButton.setText("是")
choice.cancelButton.setText("否")
self.task_dict[name].question_response.emit(bool(choice.exec_()))
self.task_dict[name].question_response.emit(bool(choice.exec()))
TaskManager = _TaskManager()

3
app/core/timer.py
View File

@@ -84,7 +84,8 @@ class _MainTimer(QWidget):
"""设置静默模式"""
if (
Config.global_config.get(Config.global_config.function_IfSilence)
not Config.if_ignore_silence
and Config.global_config.get(Config.global_config.function_IfSilence)
and Config.global_config.get(Config.global_config.function_BossKey) != ""
):

18
app/models/MAA.py
View File

@@ -67,11 +67,16 @@ class MaaManager(QObject):
self.mode = mode
self.config_path = config_path
self.user_config_path = user_config_path
self.log_monitor = QFileSystemWatcher()
self.log_monitor_timer = QTimer()
self.log_monitor_timer.timeout.connect(self.refresh_maa_log)
self.monitor_loop = QEventLoop()
self.question_loop = QEventLoop()
self.question_response.connect(self.__capture_response)
self.question_response.connect(self.question_loop.quit)
self.interrupt.connect(self.quit_monitor)
with (self.config_path / "config.json").open("r", encoding="utf-8") as f:
@@ -360,6 +365,9 @@ class MaaManager(QObject):
# 人工排查模式
elif self.mode == "人工排查":
# 人工排查时，屏蔽静默操作
Config.if_ignore_silence = True
# 标记是否需要启动模拟器
self.if_open_emulator = True
# 标识排查模式
@@ -458,6 +466,9 @@ class MaaManager(QObject):
self.update_user_list.emit(self.user_list)
# 解除静默操作屏蔽
Config.if_ignore_silence = False
# 设置MAA模式
elif "设置MAA" in self.mode:
@@ -562,13 +573,10 @@ class MaaManager(QObject):
def push_question(self, title: str, message: str) -> bool:
self.question.emit(title, message)
loop = QEventLoop()
self.question_response.connect(self._capture_response)
self.question_response.connect(loop.quit)
loop.exec()
self.question_loop.exec()
return self.response
def _capture_response(self, response: bool) -> None:
def __capture_response(self, response: bool) -> None:
self.response = response
def refresh_maa_log(self) -> None:

49
app/ui/Widget.py
View File

@@ -26,7 +26,7 @@ v4.2
"""
from PySide6.QtWidgets import QWidget, QWidget, QLabel, QHBoxLayout, QSizePolicy
from PySide6.QtCore import Qt, QTime, QEvent, QSize
from PySide6.QtCore import Qt, QTime, QTimer, QEvent, QSize
from PySide6.QtGui import QIcon, QPixmap, QPainter, QPainterPath
from qfluentwidgets import (
LineEdit,
@@ -54,6 +54,7 @@ from qfluentwidgets import (
ExpandSettingCard,
ToolButton,
PushButton,
ProgressRing,
)
from qfluentwidgets.common.overload import singledispatchmethod
import os
@@ -108,6 +109,52 @@ class ComboBoxMessageBox(MessageBoxBase):
self.viewLayout.addWidget(Widget)
class ProgressRingMessageBox(MessageBoxBase):
"""进度环倒计时对话框"""
def __init__(self, parent, title: str):
super().__init__(parent)
self.title = SubtitleLabel(title)
self.time = 100
Widget = QWidget()
Layout = QHBoxLayout(Widget)
self.ring = ProgressRing()
self.ring.setRange(0, 100)
self.ring.setValue(100)
self.ring.setTextVisible(True)
self.ring.setFormat("%p 秒")
self.ring.setFixedSize(100, 100)
self.ring.setStrokeWidth(4)
Layout.addWidget(self.ring)
self.yesButton.hide()
self.cancelButton.clicked.connect(self.__quit_timer)
self.buttonLayout.insertStretch(1)
# 将组件添加到布局中
self.viewLayout.addWidget(self.title)
self.viewLayout.addWidget(Widget)
self.timer = QTimer(self)
self.timer.timeout.connect(self.__update_time)
self.timer.start(1000)
def __update_time(self):
self.time -= 1
self.ring.setValue(self.time)
if self.time == 0:
self.timer.stop()
self.timer.deleteLater()
self.yesButton.click()
def __quit_timer(self):
self.timer.stop()
self.timer.deleteLater()
class LineEditSettingCard(SettingCard):
"""Setting card with LineEdit"""

3
app/ui/__init__.py
View File

@@ -30,5 +30,6 @@ __author__ = "DLmaster361 <DLmaster_361@163.com>"
__license__ = "GPL-3.0 license"
from .main_window import AUTO_MAA
from .Widget import ProgressRingMessageBox
__all__ = ["AUTO_MAA"]
__all__ = ["AUTO_MAA", "ProgressRingMessageBox"]

5
app/ui/main_window.py
View File

@@ -72,6 +72,7 @@ class AUTO_MAA(MSFluentWindow):
self.splashScreen = SplashScreen(self.windowIcon(), self)
self.show_ui("显示主窗口", if_quick=True)
TaskManager.main_window = self.window()
MainInfoBar.main_window = self.window()
System.main_window = self.window()
@@ -260,7 +261,9 @@ class AUTO_MAA(MSFluentWindow):
)
if "网络错误" not in result:
Up = PushButton("更新")
Up.clicked.connect(lambda: self.setting.get_update(if_question=False))
Up.clicked.connect(
lambda: self.setting.get_update(if_question=False)
)
Up.clicked.connect(info.close)
info.addWidget(Up)
info.show()

4
resources/version.json
View File

@@ -1,7 +1,7 @@
{
"main_version": "4.2.5.2",
"main_version": "4.2.5.3",
"updater_version": "1.2.0.0",
"announcement": "\n## 新增功能\n- 屏蔽MuMu模拟器开屏广告功能上线\n- 更新器支持多线程下载\n## 修复BUG\n- 修复统计信息HTML模板公招匹配错误\n- 修复密码显示按钮动画异常\n## 程序优化\n- 暂无",
"announcement": "\n## 新增功能\n- 屏蔽MuMu模拟器开屏广告功能上线\n- 更新器支持多线程下载\n## 修复BUG\n- 修复统计信息HTML模板公招匹配错误\n- 修复密码显示按钮动画异常\n## 程序优化\n- 关机等电源操作添加100s倒计时\n- 人工排查弹窗方法优化\n- 人工排查时自动屏蔽静默操作",
"proxy_list": [
"",
"https://gitproxy.click/",