diff --git a/.github/workflows/build-app.yml b/.github/workflows/build-app.yml index ae188ab..9ae66d2 100644 --- a/.github/workflows/build-app.yml +++ b/.github/workflows/build-app.yml @@ -1,5 +1,5 @@ -# -# Copyright © <2024> +# 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 . -# DLmaster_361@163.com +# Contact: DLmaster_361@163.com name: Build AUTO_MAA diff --git a/app/__init__.py b/app/__init__.py index 73f79f6..7bbe76a 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,5 +1,5 @@ -# -# Copyright © <2024> +# 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 . -# DLmaster_361@163.com +# Contact: DLmaster_361@163.com """ AUTO_MAA diff --git a/app/core/__init__.py b/app/core/__init__.py index cdf8c0a..baedc38 100644 --- a/app/core/__init__.py +++ b/app/core/__init__.py @@ -1,5 +1,5 @@ -# -# Copyright © <2024> +# 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 . -# DLmaster_361@163.com +# Contact: DLmaster_361@163.com """ AUTO_MAA diff --git a/app/core/config.py b/app/core/config.py index 65f2976..6c3bcae 100644 --- a/app/core/config.py +++ b/app/core/config.py @@ -1,5 +1,5 @@ -# -# Copyright © <2024> +# 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 . -# 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() diff --git a/app/core/main_info_bar.py b/app/core/main_info_bar.py index 97481e1..729bb11 100644 --- a/app/core/main_info_bar.py +++ b/app/core/main_info_bar.py @@ -1,5 +1,5 @@ -# -# Copyright © <2024> +# 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 . -# DLmaster_361@163.com +# Contact: DLmaster_361@163.com """ AUTO_MAA diff --git a/app/core/network.py b/app/core/network.py index 463bb0e..2f5d718 100644 --- a/app/core/network.py +++ b/app/core/network.py @@ -1,5 +1,5 @@ -# -# Copyright © <2024> +# 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 . -# DLmaster_361@163.com +# Contact: DLmaster_361@163.com """ AUTO_MAA diff --git a/app/core/task_manager.py b/app/core/task_manager.py index 4b8b016..a09fbf1 100644 --- a/app/core/task_manager.py +++ b/app/core/task_manager.py @@ -1,5 +1,5 @@ -# -# Copyright © <2024> +# 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 . -# DLmaster_361@163.com +# Contact: DLmaster_361@163.com """ AUTO_MAA diff --git a/app/core/timer.py b/app/core/timer.py index a028fef..3679fd9 100644 --- a/app/core/timer.py +++ b/app/core/timer.py @@ -1,5 +1,5 @@ -# -# Copyright © <2024> +# 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 . -# DLmaster_361@163.com +# Contact: DLmaster_361@163.com """ AUTO_MAA diff --git a/app/models/MAA.py b/app/models/MAA.py index 60f0462..fa85ce6 100644 --- a/app/models/MAA.py +++ b/app/models/MAA.py @@ -1,5 +1,5 @@ -# -# Copyright © <2024> +# 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 . -# DLmaster_361@163.com +# Contact: DLmaster_361@163.com """ AUTO_MAA diff --git a/app/models/__init__.py b/app/models/__init__.py index 12a6c87..3a59faa 100644 --- a/app/models/__init__.py +++ b/app/models/__init__.py @@ -1,5 +1,5 @@ -# -# Copyright © <2024> +# 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 . -# DLmaster_361@163.com +# Contact: DLmaster_361@163.com """ AUTO_MAA diff --git a/app/services/__init__.py b/app/services/__init__.py index 0c7d938..8333f50 100644 --- a/app/services/__init__.py +++ b/app/services/__init__.py @@ -1,5 +1,5 @@ -# -# Copyright © <2024> +# 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 . -# DLmaster_361@163.com +# Contact: DLmaster_361@163.com """ AUTO_MAA diff --git a/app/services/notification.py b/app/services/notification.py index 62f983a..5449edf 100644 --- a/app/services/notification.py +++ b/app/services/notification.py @@ -1,5 +1,5 @@ -# -# Copyright © <2024> +# 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 . -# DLmaster_361@163.com +# Contact: DLmaster_361@163.com """ AUTO_MAA diff --git a/app/services/security.py b/app/services/security.py index c20e743..6ac0671 100644 --- a/app/services/security.py +++ b/app/services/security.py @@ -1,5 +1,5 @@ -# -# Copyright © <2024> +# 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 . -# DLmaster_361@163.com +# Contact: DLmaster_361@163.com """ AUTO_MAA diff --git a/app/services/system.py b/app/services/system.py index 1b071b9..f329487 100644 --- a/app/services/system.py +++ b/app/services/system.py @@ -1,5 +1,5 @@ -# -# Copyright © <2024> +# 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 . -# DLmaster_361@163.com +# Contact: DLmaster_361@163.com """ AUTO_MAA diff --git a/app/ui/Widget.py b/app/ui/Widget.py index ec37536..93a81b0 100644 --- a/app/ui/Widget.py +++ b/app/ui/Widget.py @@ -1,5 +1,5 @@ -# -# Copyright © <2024> +# 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 . -# DLmaster_361@163.com +# Contact: DLmaster_361@163.com """ AUTO_MAA diff --git a/app/ui/__init__.py b/app/ui/__init__.py index 231c307..4d6e574 100644 --- a/app/ui/__init__.py +++ b/app/ui/__init__.py @@ -1,5 +1,5 @@ -# -# Copyright © <2024> +# 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 . -# DLmaster_361@163.com +# Contact: DLmaster_361@163.com """ AUTO_MAA diff --git a/app/ui/dispatch_center.py b/app/ui/dispatch_center.py index 54b07c6..8ea8c68 100644 --- a/app/ui/dispatch_center.py +++ b/app/ui/dispatch_center.py @@ -1,5 +1,5 @@ -# -# Copyright © <2024> +# 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 . -# DLmaster_361@163.com +# Contact: DLmaster_361@163.com """ AUTO_MAA diff --git a/app/ui/history.py b/app/ui/history.py index fc5b688..c8a73cc 100644 --- a/app/ui/history.py +++ b/app/ui/history.py @@ -1,5 +1,5 @@ -# -# Copyright © <2024> +# 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 . -# 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): diff --git a/app/ui/home.py b/app/ui/home.py index addc407..c3c847e 100644 --- a/app/ui/home.py +++ b/app/ui/home.py @@ -1,5 +1,5 @@ -# -# Copyright © <2024> +# 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 . -# DLmaster_361@163.com +# Contact: DLmaster_361@163.com """ AUTO_MAA diff --git a/app/ui/main_window.py b/app/ui/main_window.py index 7a4a22f..e5dbc24 100644 --- a/app/ui/main_window.py +++ b/app/ui/main_window.py @@ -1,5 +1,5 @@ -# -# Copyright © <2024> +# 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 . -# DLmaster_361@163.com +# Contact: DLmaster_361@163.com """ AUTO_MAA diff --git a/app/ui/member_manager.py b/app/ui/member_manager.py index 3d796df..1f3f6ca 100644 --- a/app/ui/member_manager.py +++ b/app/ui/member_manager.py @@ -1,5 +1,5 @@ -# -# Copyright © <2024> +# 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 . -# DLmaster_361@163.com +# Contact: DLmaster_361@163.com """ AUTO_MAA diff --git a/app/ui/queue_manager.py b/app/ui/queue_manager.py index 58e2a3c..b49b6c7 100644 --- a/app/ui/queue_manager.py +++ b/app/ui/queue_manager.py @@ -1,5 +1,5 @@ -# -# Copyright © <2024> +# 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 . -# DLmaster_361@163.com +# Contact: DLmaster_361@163.com """ AUTO_MAA diff --git a/app/ui/setting.py b/app/ui/setting.py index 8def4d8..eafc5bf 100644 --- a/app/ui/setting.py +++ b/app/ui/setting.py @@ -1,5 +1,5 @@ -# -# Copyright © <2024> +# 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 . -# DLmaster_361@163.com +# Contact: DLmaster_361@163.com """ AUTO_MAA diff --git a/app/utils/__init__.py b/app/utils/__init__.py index 96c2ba5..3f85bc5 100644 --- a/app/utils/__init__.py +++ b/app/utils/__init__.py @@ -1,5 +1,5 @@ -# -# Copyright © <2024> +# 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 . -# DLmaster_361@163.com +# Contact: DLmaster_361@163.com """ AUTO_MAA diff --git a/app/utils/downloader.py b/app/utils/downloader.py index f493266..c13504a 100644 --- a/app/utils/downloader.py +++ b/app/utils/downloader.py @@ -1,5 +1,5 @@ -# -# Copyright © <2024> +# 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 . -# DLmaster_361@163.com +# Contact: DLmaster_361@163.com """ AUTO_MAA diff --git a/app/utils/package.py b/app/utils/package.py index 68ab847..439281f 100644 --- a/app/utils/package.py +++ b/app/utils/package.py @@ -1,5 +1,5 @@ -# -# Copyright © <2024> +# 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 . -# 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" ) diff --git a/main.py b/main.py index fe74145..f605263 100644 --- a/main.py +++ b/main.py @@ -1,5 +1,5 @@ -# -# Copyright © <2024> +# 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 . -# DLmaster_361@163.com +# Contact: DLmaster_361@163.com """ AUTO_MAA diff --git a/resources/version.json b/resources/version.json index 910c37e..e7bd69b 100644 --- a/resources/version.json +++ b/resources/version.json @@ -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": [ "修复启动时运行主任务的历史记录与完成后任务异常"