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

2025-04-23 15:04:36 +08:00
parent 39876832f3
commit 86d72aec39
28 changed files with 116 additions and 89 deletions
--- a/app/init.py
+++ b/app/init.py
@@ -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
--- a/app/core/init.py
+++ b/app/core/init.py
@@ -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
--- a/app/core/config.py
+++ b/app/core/config.py
@@ -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()
--- a/app/core/main_info_bar.py
+++ b/app/core/main_info_bar.py
@@ -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
--- a/app/core/network.py
+++ b/app/core/network.py
@@ -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
--- a/app/core/task_manager.py
+++ b/app/core/task_manager.py
@@ -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
--- a/app/core/timer.py
+++ b/app/core/timer.py
@@ -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
--- a/app/models/MAA.py
+++ b/app/models/MAA.py
@@ -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
--- a/app/models/init.py
+++ b/app/models/init.py
@@ -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
--- a/app/services/init.py
+++ b/app/services/init.py
@@ -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
--- a/app/services/notification.py
+++ b/app/services/notification.py
@@ -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
--- a/app/services/security.py
+++ b/app/services/security.py
@@ -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
--- a/app/services/system.py
+++ b/app/services/system.py
@@ -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
--- a/app/ui/Widget.py
+++ b/app/ui/Widget.py
@@ -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
--- a/app/ui/init.py
+++ b/app/ui/init.py
@@ -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
--- a/app/ui/dispatch_center.py
+++ b/app/ui/dispatch_center.py
@@ -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
--- a/app/ui/history.py
+++ b/app/ui/history.py
@@ -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):
--- a/app/ui/home.py
+++ b/app/ui/home.py
@@ -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
--- a/app/ui/main_window.py
+++ b/app/ui/main_window.py
@@ -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
--- a/app/ui/member_manager.py
+++ b/app/ui/member_manager.py
@@ -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
--- a/app/ui/queue_manager.py
+++ b/app/ui/queue_manager.py
@@ -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
--- a/app/ui/setting.py
+++ b/app/ui/setting.py
@@ -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
--- a/app/utils/init.py
+++ b/app/utils/init.py
@@ -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
--- a/app/utils/downloader.py
+++ b/app/utils/downloader.py
@@ -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
--- a/app/utils/package.py
+++ b/app/utils/package.py
@@ -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"
    )