feat(core): 添加公告功能

app/ui/main_window.py

@@ -186,6 +186,9 @@ class AUTO_MAA(MSFluentWindow):
         # 检查密码
         self.setting.check_PASSWORD()
 
+        # 获取公告
+        self.setting.show_notice(if_show=False)
+
         # 检查更新
         if Config.global_config.get(Config.global_config.update_IfAutoUpdate):
             result = self.setting.get_update_info()

app/ui/setting.py

@@ -43,6 +43,7 @@ from qfluentwidgets import (
     ExpandGroupSettingCard,
     PushSettingCard,
 )
+from datetime import datetime
 import json
 import subprocess
 import time
@@ -385,22 +386,23 @@ class Setting(QWidget):
         self.close()
         QApplication.quit()
 
-    def show_notice(self):
+    def show_notice(self, if_show: bool = True):
         """显示公告"""
 
         # 从远程服务器获取最新版本信息
         for _ in range(3):
             try:
                 response = requests.get(
-                    "https://gitee.com/DLmaster_361/AUTO_MAA/raw/main/resources/version.json"
+                    "https://gitee.com/DLmaster_361/AUTO_MAA/raw/main/resources/notice.json"
                 )
-                version_remote = response.json()
+                notice = response.json()
                 break
             except Exception as e:
                 err = e
                 time.sleep(0.1)
         else:
             logger.warning(f"获取最新公告时出错：\n{err}")
+            if if_show:
                 choice = Dialog(
                     "网络错误",
                     f"获取最新公告时出错：\n{err}",
@@ -408,18 +410,28 @@ class Setting(QWidget):
                 )
                 choice.cancelButton.hide()
                 choice.buttonLayout.insertStretch(1)
-            if choice.exec():
+                choice.exec()
             return None
 
-        if "notice" in version_remote:
+        if (Config.app_path / "resources/notice.json").exists():
-            notice = version_remote["notice"]
+            with (Config.app_path / "resources/notice.json").open(
+                mode="r", encoding="utf-8"
+            ) as f:
+                notice_local = json.load(f)
+            time_local = datetime.strptime(notice_local["time"], "%Y-%m-%d %H:%M")
         else:
-            notice = "暂无公告~"
+            time_local = datetime.strptime("2000-01-01 00:00", "%Y-%m-%d %H:%M")
 
-        choice = Dialog("公告", notice, self)
+        if if_show or datetime.strptime(notice["time"], "%Y-%m-%d %H:%M") > time_local:
+
+            choice = Dialog("公告", notice["content"], self)
             choice.cancelButton.hide()
             choice.buttonLayout.insertStretch(1)
-        choice.exec()
+            if choice.exec():
+                with (Config.app_path / "resources/notice.json").open(
+                    mode="w", encoding="utf-8"
+                ) as f:
+                    json.dump(notice, f, ensure_ascii=False, indent=4)
 
 
 class FunctionSettingCard(HeaderCardWidget):

requirements.txt

@@ -3,6 +3,7 @@ plyer
 PySide6
 PySide6-Fluent-Widgets[full]
 psutil
+opencv-python
 pywin32
 pyautogui
 pycryptodome

resources/notice.json

@@ -0,0 +1,4 @@
+{
+    "content": "公告系统测试中~",
+    "time": "2025-01-27 17:00"
+}

resources/version.json

@@ -1,8 +1,7 @@
 {
     "main_version": "4.2.1.1",
     "updater_version": "1.1.0.1",
-    "announcement": "\n## 新增功能\n- 调度队列上线，支持MAA多开\n## 修复BUG\n- 添加了一堆BUG（确信）\n## 程序优化\n- 界面重构，引入`QFluentWidgets`美化界面",
+    "announcement": "\n## 新增功能\n- 调度队列上线，支持MAA多开\n- 公告系统上线\n## 修复BUG\n- 添加了一堆BUG（确信）\n## 程序优化\n- 界面重构，引入`QFluentWidgets`美化界面",
-    "notice": "公告系统测试中~",
     "proxy_list": [
         "",
         "https://gitproxy.click/",