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

feat: 历史记录页面添加选中最近一月、选中最近一周选项

Browse Source
This commit is contained in:
DLmaster361
2025-04-23 15:04:36 +08:00
parent 39876832f3
commit 86d72aec39
28 changed files with 116 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/build-app.yml vendored
View File

@@ -1,5 +1,5 @@
# <AUTO_MAA:A MAA Multi Account Management and Automation Tool>
# Copyright © <2024> <DLmaster361>
# AUTO_MAA:A MAA Multi Account Management and Automation Tool
# Copyright © 2024-2025 DLmaster361
# This file is part of AUTO_MAA.
@@ -16,7 +16,7 @@
# You should have received a copy of the GNU General Public License
# along with AUTO_MAA. If not, see <https://www.gnu.org/licenses/>.
# DLmaster_361@163.com
# Contact: DLmaster_361@163.com
name: Build AUTO_MAA

6
app/__init__.py
View File

@@ -1,5 +1,5 @@
# <AUTO_MAA:A MAA Multi Account Management and Automation Tool>
# Copyright © <2024> <DLmaster361>
# AUTO_MAA:A MAA Multi Account Management and Automation Tool
# Copyright © 2024-2025 DLmaster361
# This file is part of AUTO_MAA.
@@ -16,7 +16,7 @@
# You should have received a copy of the GNU General Public License
# along with AUTO_MAA. If not, see <https://www.gnu.org/licenses/>.
# DLmaster_361@163.com
# Contact: DLmaster_361@163.com
"""
AUTO_MAA

6
app/core/__init__.py
View File

@@ -1,5 +1,5 @@
# <AUTO_MAA:A MAA Multi Account Management and Automation Tool>
# Copyright © <2024> <DLmaster361>
# AUTO_MAA:A MAA Multi Account Management and Automation Tool
# Copyright © 2024-2025 DLmaster361
# This file is part of AUTO_MAA.
@@ -16,7 +16,7 @@
# You should have received a copy of the GNU General Public License
# along with AUTO_MAA. If not, see <https://www.gnu.org/licenses/>.
# DLmaster_361@163.com
# Contact: DLmaster_361@163.com
"""
AUTO_MAA

8
app/core/config.py
View File

@@ -1,5 +1,5 @@
# <AUTO_MAA:A MAA Multi Account Management and Automation Tool>
# Copyright © <2024> <DLmaster361>
# AUTO_MAA:A MAA Multi Account Management and Automation Tool
# Copyright © 2024-2025 DLmaster361
# This file is part of AUTO_MAA.
@@ -16,7 +16,7 @@
# You should have received a copy of the GNU General Public License
# along with AUTO_MAA. If not, see <https://www.gnu.org/licenses/>.
# DLmaster_361@163.com
# Contact: DLmaster_361@163.com
"""
AUTO_MAA
@@ -606,7 +606,7 @@ class MaaUserConfig(QConfig):
class AppConfig(GlobalConfig):
VERSION = "4.3.4.5"
VERSION = "4.3.4.6"
gameid_refreshed = Signal()
PASSWORD_refreshed = Signal()

6
app/core/main_info_bar.py
View File

@@ -1,5 +1,5 @@
# <AUTO_MAA:A MAA Multi Account Management and Automation Tool>
# Copyright © <2024> <DLmaster361>
# AUTO_MAA:A MAA Multi Account Management and Automation Tool
# Copyright © 2024-2025 DLmaster361
# This file is part of AUTO_MAA.
@@ -16,7 +16,7 @@
# You should have received a copy of the GNU General Public License
# along with AUTO_MAA. If not, see <https://www.gnu.org/licenses/>.
# DLmaster_361@163.com
# Contact: DLmaster_361@163.com
"""
AUTO_MAA

6
app/core/network.py
View File

@@ -1,5 +1,5 @@
# <AUTO_MAA:A MAA Multi Account Management and Automation Tool>
# Copyright © <2024> <DLmaster361>
# AUTO_MAA:A MAA Multi Account Management and Automation Tool
# Copyright © 2024-2025 DLmaster361
# This file is part of AUTO_MAA.
@@ -16,7 +16,7 @@
# You should have received a copy of the GNU General Public License
# along with AUTO_MAA. If not, see <https://www.gnu.org/licenses/>.
# DLmaster_361@163.com
# Contact: DLmaster_361@163.com
"""
AUTO_MAA

6
app/core/task_manager.py
View File

@@ -1,5 +1,5 @@
# <AUTO_MAA:A MAA Multi Account Management and Automation Tool>
# Copyright © <2024> <DLmaster361>
# AUTO_MAA:A MAA Multi Account Management and Automation Tool
# Copyright © 2024-2025 DLmaster361
# This file is part of AUTO_MAA.
@@ -16,7 +16,7 @@
# You should have received a copy of the GNU General Public License
# along with AUTO_MAA. If not, see <https://www.gnu.org/licenses/>.
# DLmaster_361@163.com
# Contact: DLmaster_361@163.com
"""
AUTO_MAA

6
app/core/timer.py
View File

@@ -1,5 +1,5 @@
# <AUTO_MAA:A MAA Multi Account Management and Automation Tool>
# Copyright © <2024> <DLmaster361>
# AUTO_MAA:A MAA Multi Account Management and Automation Tool
# Copyright © 2024-2025 DLmaster361
# This file is part of AUTO_MAA.
@@ -16,7 +16,7 @@
# You should have received a copy of the GNU General Public License
# along with AUTO_MAA. If not, see <https://www.gnu.org/licenses/>.
# DLmaster_361@163.com
# Contact: DLmaster_361@163.com
"""
AUTO_MAA

6
app/models/MAA.py
View File

@@ -1,5 +1,5 @@
# <AUTO_MAA:A MAA Multi Account Management and Automation Tool>
# Copyright © <2024> <DLmaster361>
# AUTO_MAA:A MAA Multi Account Management and Automation Tool
# Copyright © 2024-2025 DLmaster361
# This file is part of AUTO_MAA.
@@ -16,7 +16,7 @@
# You should have received a copy of the GNU General Public License
# along with AUTO_MAA. If not, see <https://www.gnu.org/licenses/>.
# DLmaster_361@163.com
# Contact: DLmaster_361@163.com
"""
AUTO_MAA

6
app/models/__init__.py
View File

@@ -1,5 +1,5 @@
# <AUTO_MAA:A MAA Multi Account Management and Automation Tool>
# Copyright © <2024> <DLmaster361>
# AUTO_MAA:A MAA Multi Account Management and Automation Tool
# Copyright © 2024-2025 DLmaster361
# This file is part of AUTO_MAA.
@@ -16,7 +16,7 @@
# You should have received a copy of the GNU General Public License
# along with AUTO_MAA. If not, see <https://www.gnu.org/licenses/>.
# DLmaster_361@163.com
# Contact: DLmaster_361@163.com
"""
AUTO_MAA

6
app/services/__init__.py
View File

@@ -1,5 +1,5 @@
# <AUTO_MAA:A MAA Multi Account Management and Automation Tool>
# Copyright © <2024> <DLmaster361>
# AUTO_MAA:A MAA Multi Account Management and Automation Tool
# Copyright © 2024-2025 DLmaster361
# This file is part of AUTO_MAA.
@@ -16,7 +16,7 @@
# You should have received a copy of the GNU General Public License
# along with AUTO_MAA. If not, see <https://www.gnu.org/licenses/>.
# DLmaster_361@163.com
# Contact: DLmaster_361@163.com
"""
AUTO_MAA

6
app/services/notification.py
View File

@@ -1,5 +1,5 @@
# <AUTO_MAA:A MAA Multi Account Management and Automation Tool>
# Copyright © <2024> <DLmaster361>
# AUTO_MAA:A MAA Multi Account Management and Automation Tool
# Copyright © 2024-2025 DLmaster361
# This file is part of AUTO_MAA.
@@ -16,7 +16,7 @@
# You should have received a copy of the GNU General Public License
# along with AUTO_MAA. If not, see <https://www.gnu.org/licenses/>.
# DLmaster_361@163.com
# Contact: DLmaster_361@163.com
"""
AUTO_MAA

6
app/services/security.py
View File

@@ -1,5 +1,5 @@
# <AUTO_MAA:A MAA Multi Account Management and Automation Tool>
# Copyright © <2024> <DLmaster361>
# AUTO_MAA:A MAA Multi Account Management and Automation Tool
# Copyright © 2024-2025 DLmaster361
# This file is part of AUTO_MAA.
@@ -16,7 +16,7 @@
# You should have received a copy of the GNU General Public License
# along with AUTO_MAA. If not, see <https://www.gnu.org/licenses/>.
# DLmaster_361@163.com
# Contact: DLmaster_361@163.com
"""
AUTO_MAA

6
app/services/system.py
View File

@@ -1,5 +1,5 @@
# <AUTO_MAA:A MAA Multi Account Management and Automation Tool>
# Copyright © <2024> <DLmaster361>
# AUTO_MAA:A MAA Multi Account Management and Automation Tool
# Copyright © 2024-2025 DLmaster361
# This file is part of AUTO_MAA.
@@ -16,7 +16,7 @@
# You should have received a copy of the GNU General Public License
# along with AUTO_MAA. If not, see <https://www.gnu.org/licenses/>.
# DLmaster_361@163.com
# Contact: DLmaster_361@163.com
"""
AUTO_MAA

6
app/ui/Widget.py
View File

@@ -1,5 +1,5 @@
# <AUTO_MAA:A MAA Multi Account Management and Automation Tool>
# Copyright © <2024> <DLmaster361>
# AUTO_MAA:A MAA Multi Account Management and Automation Tool
# Copyright © 2024-2025 DLmaster361
# This file is part of AUTO_MAA.
@@ -16,7 +16,7 @@
# You should have received a copy of the GNU General Public License
# along with AUTO_MAA. If not, see <https://www.gnu.org/licenses/>.
# DLmaster_361@163.com
# Contact: DLmaster_361@163.com
"""
AUTO_MAA

6
app/ui/__init__.py
View File

@@ -1,5 +1,5 @@
# <AUTO_MAA:A MAA Multi Account Management and Automation Tool>
# Copyright © <2024> <DLmaster361>
# AUTO_MAA:A MAA Multi Account Management and Automation Tool
# Copyright © 2024-2025 DLmaster361
# This file is part of AUTO_MAA.
@@ -16,7 +16,7 @@
# You should have received a copy of the GNU General Public License
# along with AUTO_MAA. If not, see <https://www.gnu.org/licenses/>.
# DLmaster_361@163.com
# Contact: DLmaster_361@163.com
"""
AUTO_MAA

6
app/ui/dispatch_center.py
View File

@@ -1,5 +1,5 @@
# <AUTO_MAA:A MAA Multi Account Management and Automation Tool>
# Copyright © <2024> <DLmaster361>
# AUTO_MAA:A MAA Multi Account Management and Automation Tool
# Copyright © 2024-2025 DLmaster361
# This file is part of AUTO_MAA.
@@ -16,7 +16,7 @@
# You should have received a copy of the GNU General Public License
# along with AUTO_MAA. If not, see <https://www.gnu.org/licenses/>.
# DLmaster_361@163.com
# Contact: DLmaster_361@163.com
"""
AUTO_MAA

36
app/ui/history.py
View File

@@ -1,5 +1,5 @@
# <AUTO_MAA:A MAA Multi Account Management and Automation Tool>
# Copyright © <2024> <DLmaster361>
# AUTO_MAA:A MAA Multi Account Management and Automation Tool
# Copyright © 2024-2025 DLmaster361
# This file is part of AUTO_MAA.
@@ -16,7 +16,7 @@
# You should have received a copy of the GNU General Public License
# along with AUTO_MAA. If not, see <https://www.gnu.org/licenses/>.
# DLmaster_361@163.com
# Contact: DLmaster_361@163.com
"""
AUTO_MAA
@@ -45,7 +45,7 @@ from qfluentwidgets import (
)
from PySide6.QtCore import Signal, QDate
import os
from datetime import datetime
from datetime import datetime, timedelta
from functools import partial
from pathlib import Path
from typing import List
@@ -129,8 +129,12 @@ class History(QWidget):
self.mode.setPlaceholderText("请选择查询模式")
self.mode.addItems(["按日期分类"])
self.button = PushButton(FluentIcon.SEARCH, "查询")
self.button.clicked.connect(
self.select_month = PushButton(FluentIcon.TAG, "选中最近一月")
self.select_week = PushButton(FluentIcon.TAG, "选中最近一周")
self.search = PushButton(FluentIcon.SEARCH, "查询")
self.select_month.clicked.connect(lambda: self.select_date("month"))
self.select_week.clicked.connect(lambda: self.select_date("week"))
self.search.clicked.connect(
lambda: self.search_history.emit(
self.start_date.getDate(),
self.end_date.getDate(),
@@ -144,7 +148,25 @@ class History(QWidget):
Layout.addWidget(self.end_date)
Layout.addWidget(self.mode)
Layout.addStretch(1)
Layout.addWidget(self.button)
Layout.addWidget(self.select_month)
Layout.addWidget(self.select_week)
Layout.addWidget(self.search)
def select_date(self, date: str) -> None:
"""选中最近一段时间"""
server_date = Config.server_date()
if date == "week":
begin_date = server_date - timedelta(weeks=1)
elif date == "month":
begin_date = server_date - timedelta(days=30)
self.start_date.setDate(
QDate(begin_date.year, begin_date.month, begin_date.day)
)
self.end_date.setDate(
QDate(server_date.year, server_date.month, server_date.day)
)
class HistoryCard(ExpandGroupSettingCard):

6
app/ui/home.py
View File

@@ -1,5 +1,5 @@
# <AUTO_MAA:A MAA Multi Account Management and Automation Tool>
# Copyright © <2024> <DLmaster361>
# AUTO_MAA:A MAA Multi Account Management and Automation Tool
# Copyright © 2024-2025 DLmaster361
# This file is part of AUTO_MAA.
@@ -16,7 +16,7 @@
# You should have received a copy of the GNU General Public License
# along with AUTO_MAA. If not, see <https://www.gnu.org/licenses/>.
# DLmaster_361@163.com
# Contact: DLmaster_361@163.com
"""
AUTO_MAA

6
app/ui/main_window.py
View File

@@ -1,5 +1,5 @@
# <AUTO_MAA:A MAA Multi Account Management and Automation Tool>
# Copyright © <2024> <DLmaster361>
# AUTO_MAA:A MAA Multi Account Management and Automation Tool
# Copyright © 2024-2025 DLmaster361
# This file is part of AUTO_MAA.
@@ -16,7 +16,7 @@
# You should have received a copy of the GNU General Public License
# along with AUTO_MAA. If not, see <https://www.gnu.org/licenses/>.
# DLmaster_361@163.com
# Contact: DLmaster_361@163.com
"""
AUTO_MAA

6
app/ui/member_manager.py
View File

@@ -1,5 +1,5 @@
# <AUTO_MAA:A MAA Multi Account Management and Automation Tool>
# Copyright © <2024> <DLmaster361>
# AUTO_MAA:A MAA Multi Account Management and Automation Tool
# Copyright © 2024-2025 DLmaster361
# This file is part of AUTO_MAA.
@@ -16,7 +16,7 @@
# You should have received a copy of the GNU General Public License
# along with AUTO_MAA. If not, see <https://www.gnu.org/licenses/>.
# DLmaster_361@163.com
# Contact: DLmaster_361@163.com
"""
AUTO_MAA

6
app/ui/queue_manager.py
View File

@@ -1,5 +1,5 @@
# <AUTO_MAA:A MAA Multi Account Management and Automation Tool>
# Copyright © <2024> <DLmaster361>
# AUTO_MAA:A MAA Multi Account Management and Automation Tool
# Copyright © 2024-2025 DLmaster361
# This file is part of AUTO_MAA.
@@ -16,7 +16,7 @@
# You should have received a copy of the GNU General Public License
# along with AUTO_MAA. If not, see <https://www.gnu.org/licenses/>.
# DLmaster_361@163.com
# Contact: DLmaster_361@163.com
"""
AUTO_MAA

6
app/ui/setting.py
View File

@@ -1,5 +1,5 @@
# <AUTO_MAA:A MAA Multi Account Management and Automation Tool>
# Copyright © <2024> <DLmaster361>
# AUTO_MAA:A MAA Multi Account Management and Automation Tool
# Copyright © 2024-2025 DLmaster361
# This file is part of AUTO_MAA.
@@ -16,7 +16,7 @@
# You should have received a copy of the GNU General Public License
# along with AUTO_MAA. If not, see <https://www.gnu.org/licenses/>.
# DLmaster_361@163.com
# Contact: DLmaster_361@163.com
"""
AUTO_MAA

6
app/utils/__init__.py
View File

@@ -1,5 +1,5 @@
# <AUTO_MAA:A MAA Multi Account Management and Automation Tool>
# Copyright © <2024> <DLmaster361>
# AUTO_MAA:A MAA Multi Account Management and Automation Tool
# Copyright © 2024-2025 DLmaster361
# This file is part of AUTO_MAA.
@@ -16,7 +16,7 @@
# You should have received a copy of the GNU General Public License
# along with AUTO_MAA. If not, see <https://www.gnu.org/licenses/>.
# DLmaster_361@163.com
# Contact: DLmaster_361@163.com
"""
AUTO_MAA

6
app/utils/downloader.py
View File

@@ -1,5 +1,5 @@
# <AUTO_MAA:A MAA Multi Account Management and Automation Tool>
# Copyright © <2024> <DLmaster361>
# AUTO_MAA:A MAA Multi Account Management and Automation Tool
# Copyright © 2024-2025 DLmaster361
# This file is part of AUTO_MAA.
@@ -16,7 +16,7 @@
# You should have received a copy of the GNU General Public License
# along with AUTO_MAA. If not, see <https://www.gnu.org/licenses/>.
# DLmaster_361@163.com
# Contact: DLmaster_361@163.com
"""
AUTO_MAA

10
app/utils/package.py
View File

@@ -1,5 +1,5 @@
# <AUTO_MAA:A MAA Multi Account Management and Automation Tool>
# Copyright © <2024> <DLmaster361>
# AUTO_MAA:A MAA Multi Account Management and Automation Tool
# Copyright © 2024-2025 DLmaster361
# This file is part of AUTO_MAA.
@@ -16,7 +16,7 @@
# You should have received a copy of the GNU General Public License
# along with AUTO_MAA. If not, see <https://www.gnu.org/licenses/>.
# DLmaster_361@163.com
# Contact: DLmaster_361@163.com
"""
AUTO_MAA
@@ -79,7 +79,7 @@ if __name__ == "__main__":
f" --file-version={version["main_version"]}"
f" --product-version={version["main_version"]}"
" --file-description='AUTO_MAA Component'"
" --copyright='Copyright © 2024 DLmaster361'"
" --copyright='Copyright © 2024-2025 DLmaster361'"
" --assume-yes-for-downloads --output-filename=AUTO_MAA"
" --remove-output main.py"
)
@@ -98,7 +98,7 @@ if __name__ == "__main__":
f" --file-version={version["updater_version"]}"
f" --product-version={version["main_version"]}"
" --file-description='AUTO_MAA Component'"
" --copyright='Copyright © 2024 DLmaster361'"
" --copyright='Copyright © 2024-2025 DLmaster361'"
" --assume-yes-for-downloads --output-filename=AUTO_Updater"
" --remove-output downloader.py"
)

6
main.py
View File

@@ -1,5 +1,5 @@
# <AUTO_MAA:A MAA Multi Account Management and Automation Tool>
# Copyright © <2024> <DLmaster361>
# AUTO_MAA:A MAA Multi Account Management and Automation Tool
# Copyright © 2024-2025 DLmaster361
# This file is part of AUTO_MAA.
@@ -16,7 +16,7 @@
# You should have received a copy of the GNU General Public License
# along with AUTO_MAA. If not, see <https://www.gnu.org/licenses/>.
# DLmaster_361@163.com
# Contact: DLmaster_361@163.com
"""
AUTO_MAA

7
resources/version.json
View File

@@ -1,8 +1,13 @@
{
"main_version": "4.3.4.5",
"main_version": "4.3.4.6",
"updater_version": "1.0.0.0",
"announcement": "\n## 新增功能\n- 屏蔽MuMu模拟器开屏广告功能上线\n- 更新器支持多线程下载\n- 添加强制关闭ADB与模拟器等增强任务项\n## 修复BUG\n- 修复统计信息HTML模板公招匹配错误\n- 修复密码显示按钮动画异常\n- 修复`检测到MAA未能实际执行任务`报错被异常屏蔽\n- 修复MAA超时判定异常失效\n## 程序优化\n- 关机等电源操作添加100s倒计时\n- 人工排查弹窗方法优化\n- 人工排查时自动屏蔽静默操作\n- 公告样式优化",
"version_info": {
"4.3.4.6": {
"程序优化": [
"历史记录页面添加`选中最近一月`、`选中最近一周`选项"
]
},
"4.3.4.5": {
"修复BUG": [
"修复启动时运行主任务的历史记录与完成后任务异常"