feat: 日志分析忽略MAA超时提示

Co-authored-by: DLmaster361 <DLmaster_361@163.com>

.github/workflows/build-app.yml

@@ -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,19 +16,16 @@
 #   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
 
 on:
-  push:
-    branches: [ "main" ]
-    paths-ignore:
-      - '**.md'
-      - 'LICENSE'
+  workflow_dispatch:
 
 permissions:
-  contents: read
+  contents: write
+  actions: write
 
 jobs:
   pre_check:
@@ -58,6 +55,8 @@ jobs:
           python -m pip install --upgrade pip
           pip install flake8 pytest
           pip install -r requirements.txt
+          choco install innosetup
+          echo "C:\Program Files (x86)\Inno Setup 6" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
       - name: Lint with flake8
         run: |
           # stop the build if there are Python syntax errors or undefined names
@@ -74,20 +73,11 @@ jobs:
         run: |
           $MAIN_VERSION=(Get-Content -Path "version_info.txt" -TotalCount 1).Trim()
           "AUTO_MAA_version=$MAIN_VERSION" | Out-File -FilePath $env:GITHUB_ENV -Append
-          $UPDATER_VERSION=(Get-Content -Path "version_info.txt" -TotalCount 2 | Select-Object -Index 1).Trim()
-          "updater_version=$UPDATER_VERSION" | Out-File -FilePath $env:GITHUB_ENV -Append
-      - name: Create Zip
-        id: create_zip
-        run: |
-          Compress-Archive -Path app,resources,main.py,AUTO_MAA.exe,requirements.txt,README.md,LICENSE -DestinationPath AUTO_MAA_${{ env.AUTO_MAA_version }}.zip
-          Compress-Archive -Path Updater.exe -DestinationPath Updater_${{ env.updater_version }}.zip
       - name: Upload Artifact
         uses: actions/upload-artifact@v4
         with:
           name: AUTO_MAA_${{ env.AUTO_MAA_version }}
-          path: |
-            AUTO_MAA_${{ env.AUTO_MAA_version }}.zip
-            Updater_${{ env.updater_version }}.zip
+          path: AUTO_MAA_${{ env.AUTO_MAA_version }}.zip
       - name: Upload Version_Info Artifact
         uses: actions/upload-artifact@v4
         with:
@@ -111,75 +101,30 @@ jobs:
         with:
           name: version_info
           path: ./
-      - name: Check if release exists
-        id: check_if_release_exists
-        run: |
-          release_id=$(gh release view $(sed 's/\r$//g' <(head -n 1 version_info.txt)) --json id --jq .id || true)
-          if [[ -z $release_id ]]; then
-            echo "release_exists=false" >> $GITHUB_OUTPUT
-          else
-            echo "release_exists=true" >> $GITHUB_OUTPUT
-          fi
-        env:
-          GITHUB_TOKEN: ${{ secrets.WORKFLOW_TOKEN }}
       - name: Create release
         id: create_release
-        if: steps.check_if_release_exists.outputs.release_exists == 'false'
         run: |
           set -xe
           shopt -s nullglob
           NAME="$(sed 's/\r$//g' <(head -n 1 version_info.txt))"
           TAGNAME="$(sed 's/\r$//g' <(head -n 1 version_info.txt))"
           NOTES_MAIN="$(sed 's/\r$//g' <(tail -n +3 version_info.txt))"
-          NOTES_TAIL="\`\`\`本release通过GitHub Actions自动构建\`\`\`"
-          NOTES="$NOTES_MAIN<br><br>$NOTES_TAIL"
-          gh release create "$TAGNAME" --target "main" --title "$NAME" --notes "$NOTES" artifacts/*
-        env:
-          GITHUB_TOKEN: ${{ secrets.WORKFLOW_TOKEN }}
-      - name: Update release
-        id: update_release
-        if: steps.check_if_release_exists.outputs.release_exists == 'true'
-        run: |
-          set -xe
-          shopt -s nullglob
-          NAME="$(sed 's/\r$//g' <(head -n 1 version_info.txt))"
-          TAGNAME="$(sed 's/\r$//g' <(head -n 1 version_info.txt))"
-          NOTES_MAIN="$(sed 's/\r$//g' <(tail -n +3 version_info.txt))"
-          NOTES_TAIL="\`\`\`本release通过GitHub Actions自动构建\`\`\`"
-          NOTES="$NOTES_MAIN<br><br>$NOTES_TAIL"
-          gh release delete "$TAGNAME" --yes
-          gh release create "$TAGNAME" --target "main" --title "$NAME" --notes "$NOTES" artifacts/*
-        env:
-          GITHUB_TOKEN: ${{ secrets.WORKFLOW_TOKEN }}
+          NOTES="$NOTES_MAIN
+          
+          [已有 Mirror酱 CDK ？前往 Mirror酱 高速下载](https://mirrorchyan.com/zh/projects?rid=AUTO_MAA)
 
+          \`\`\`本release通过GitHub Actions自动构建\`\`\`"
+          if [ "${{ github.ref_name }}" == "main" ]; then
+            PRERELEASE_FLAG=""
+          else
+            PRERELEASE_FLAG="--prerelease"
+          fi
+          gh release create "$TAGNAME" --target "main" --title "$NAME" --notes "$NOTES" $PRERELEASE_FLAG artifacts/*
+        env:
+          GITHUB_TOKEN: ${{ secrets.WORKFLOW_TOKEN }}
       - name: Trigger MirrorChyanUploading
         run: |
           gh workflow run --repo $GITHUB_REPOSITORY mirrorchyan
           gh workflow run --repo $GITHUB_REPOSITORY mirrorchyan_release_note
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Setup SSH Key
-        run: |
-          mkdir -p ~/.ssh
-          echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa
-          chmod 600 ~/.ssh/id_rsa
-          ssh-keyscan -H ${{ secrets.SERVER_IP }} >> ~/.ssh/known_hosts
-      - name: Upload Release to Server
-        run: |
-          scp -r artifacts/* ${{ secrets.SERVER_USER }}@${{ secrets.SERVER_IP }}:/home/user/files/AUTO_MAA/
-      - name: Install obsutil
-        run: |
-          wget https://obs-community.obs.cn-north-1.myhuaweicloud.com/obsutil/current/obsutil_linux_amd64.tar.gz
-          tar -xzvf obsutil_linux_amd64.tar.gz --strip-components=1
-          chmod 755 obsutil
-          ./obsutil version
-      - name: Upload Release to Huawei OBS
-        env:
-          OBS_AK: ${{ secrets.OBS_AK }}
-          OBS_SK: ${{ secrets.OBS_SK }}
-          OBS_ENDPOINT: ${{ secrets.OBS_ENDPOINT }}
-          OBS_BUCKET: ${{ secrets.OBS_BUCKET }}
-        run: |
-          ./obsutil config -i $OBS_AK -k $OBS_SK -e $OBS_ENDPOINT
-          ./obsutil cp artifacts/ obs://$OBS_BUCKET/releases/ -r -f

.github/workflows/build-pre.yml

@@ -1,185 +0,0 @@
-#   <AUTO_MAA:A MAA Multi Account Management and Automation Tool>
-#   Copyright © <2024> <DLmaster361>
-
-#   This file is part of AUTO_MAA.
-
-#   AUTO_MAA is free software: you can redistribute it and/or modify
-#   it under the terms of the GNU General Public License as published
-#   by the Free Software Foundation, either version 3 of the License,
-#   or (at your option) any later version.
-
-#   AUTO_MAA is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty
-#   of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
-#   the GNU General Public License for more details.
-
-#   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
-
-name: Build AUTO_MAA_Pre
-
-on:
-  push:
-    branches: [ "dev" ]
-    paths-ignore:
-      - '**.md'
-      - 'LICENSE'
-
-permissions:
-  contents: read
-
-jobs:
-  pre_check:
-    name: Pre Checks
-    runs-on: ubuntu-latest
-    steps:
-      - name: Repo Check
-        id: repo_check
-        run: |
-          if [[ "$GITHUB_REPOSITORY" != "DLmaster361/AUTO_MAA" ]]; then
-            echo "When forking this repository to make your own builds, you have to adjust this check."
-            exit 1
-          fi
-          exit 0
-  build_AUTO_MAA:
-    runs-on: windows-latest
-    needs: pre_check
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-      - name: Set up Python 3.12
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.12"
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install flake8 pytest
-          pip install -r requirements.txt
-      - name: Lint with flake8
-        run: |
-          # stop the build if there are Python syntax errors or undefined names
-          flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
-          # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
-          flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
-      - name: Package
-        id: package
-        run: |
-          copy app\utils\package.py .\
-          python package.py
-      - name: Read version
-        id: read_version
-        run: |
-          $MAIN_VERSION=(Get-Content -Path "version_info.txt" -TotalCount 1).Trim()
-          "AUTO_MAA_version=$MAIN_VERSION" | Out-File -FilePath $env:GITHUB_ENV -Append
-          $UPDATER_VERSION=(Get-Content -Path "version_info.txt" -TotalCount 2 | Select-Object -Index 1).Trim()
-          "updater_version=$UPDATER_VERSION" | Out-File -FilePath $env:GITHUB_ENV -Append
-      - name: Create Zip
-        id: create_zip
-        run: |
-          Compress-Archive -Path app,resources,main.py,AUTO_MAA.exe,requirements.txt,README.md,LICENSE -DestinationPath AUTO_MAA_${{ env.AUTO_MAA_version }}.zip
-          Compress-Archive -Path Updater.exe -DestinationPath Updater_${{ env.updater_version }}.zip
-      - name: Upload Artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: AUTO_MAA_${{ env.AUTO_MAA_version }}
-          path: |
-            AUTO_MAA_${{ env.AUTO_MAA_version }}.zip
-            Updater_${{ env.updater_version }}.zip
-      - name: Upload Version_Info Artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: version_info
-          path: version_info.txt
-  publish_prerelease:
-    name: Publish prerelease
-    needs: build_AUTO_MAA
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Download artifacts
-        uses: actions/download-artifact@v4
-        with:
-          pattern: AUTO_MAA_*
-          merge-multiple: true
-          path: artifacts
-      - name: Download Version_Info
-        uses: actions/download-artifact@v4
-        with:
-          name: version_info
-          path: ./
-      - name: Check if release exists
-        id: check_if_release_exists
-        run: |
-          release_id=$(gh release view $(sed 's/\r$//g' <(head -n 1 version_info.txt)) --json id --jq .id || true)
-          if [[ -z $release_id ]]; then
-            echo "release_exists=false" >> $GITHUB_OUTPUT
-          else
-            echo "release_exists=true" >> $GITHUB_OUTPUT
-          fi
-        env:
-          GITHUB_TOKEN: ${{ secrets.WORKFLOW_TOKEN }}
-      - name: Create prerelease
-        id: create_prerelease
-        if: steps.check_if_release_exists.outputs.release_exists == 'false'
-        run: |
-          set -xe
-          shopt -s nullglob
-          NAME="$(sed 's/\r$//g' <(head -n 1 version_info.txt))"
-          TAGNAME="$(sed 's/\r$//g' <(head -n 1 version_info.txt))"
-          NOTES_MAIN="$(sed 's/\r$//g' <(tail -n +3 version_info.txt))"
-          NOTES_TAIL="\`\`\`本release通过GitHub Actions自动构建\`\`\`"
-          NOTES="$NOTES_MAIN<br><br>$NOTES_TAIL"
-          gh release create "$TAGNAME" --target "main" --title "$NAME" --notes "$NOTES" --prerelease artifacts/*
-        env:
-          GITHUB_TOKEN: ${{ secrets.WORKFLOW_TOKEN }}
-      - name: Update prerelease
-        id: update_prerelease
-        if: steps.check_if_release_exists.outputs.release_exists == 'true'
-        run: |
-          set -xe
-          shopt -s nullglob
-          NAME="$(sed 's/\r$//g' <(head -n 1 version_info.txt))"
-          TAGNAME="$(sed 's/\r$//g' <(head -n 1 version_info.txt))"
-          NOTES_MAIN="$(sed 's/\r$//g' <(tail -n +3 version_info.txt))"
-          NOTES_TAIL="\`\`\`本release通过GitHub Actions自动构建\`\`\`"
-          NOTES="$NOTES_MAIN<br><br>$NOTES_TAIL"
-          gh release delete "$TAGNAME" --yes
-          gh release create "$TAGNAME" --target "main" --title "$NAME" --notes "$NOTES" --prerelease artifacts/*
-        env:
-          GITHUB_TOKEN: ${{ secrets.WORKFLOW_TOKEN }}
-
-      - name: Trigger MirrorChyanUploading
-        run: |
-          gh workflow run --repo $GITHUB_REPOSITORY mirrorchyan
-          gh workflow run --repo $GITHUB_REPOSITORY mirrorchyan_release_note
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Setup SSH Key
-        run: |
-          mkdir -p ~/.ssh
-          echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa
-          chmod 600 ~/.ssh/id_rsa
-          ssh-keyscan -H ${{ secrets.SERVER_IP }} >> ~/.ssh/known_hosts
-      - name: Upload Release to Server
-        run: |
-          scp -r artifacts/* ${{ secrets.SERVER_USER }}@${{ secrets.SERVER_IP }}:/home/user/files/AUTO_MAA/
-      - name: Install obsutil
-        run: |
-          wget https://obs-community.obs.cn-north-1.myhuaweicloud.com/obsutil/current/obsutil_linux_amd64.tar.gz
-          tar -xzvf obsutil_linux_amd64.tar.gz --strip-components=1
-          chmod 755 obsutil
-          ./obsutil version
-      - name: Upload Release to Huawei OBS
-        env:
-          OBS_AK: ${{ secrets.OBS_AK }}
-          OBS_SK: ${{ secrets.OBS_SK }}
-          OBS_ENDPOINT: ${{ secrets.OBS_ENDPOINT }}
-          OBS_BUCKET: ${{ secrets.OBS_BUCKET }}
-        run: |
-          ./obsutil config -i $OBS_AK -k $OBS_SK -e $OBS_ENDPOINT
-          ./obsutil cp artifacts/ obs://$OBS_BUCKET/releases/ -r -f

.gitignore

@@ -0,0 +1,8 @@
+__pycache__/
+config/
+data/
+debug/
+history/
+resources/notice.json
+resources/theme_image.json
+resources/images/Home/BannerTheme.jpg

README.md

@@ -1,19 +1,20 @@
-# AUTO_MAA
-
-MAA多账号管理与自动化软件
-
-!["软件图标"](https://github.com/DLmaster361/AUTO_MAA/blob/main/resources/images/AUTO_MAA.png "软件图标")
+<h1 align="center">AUTO_MAA</h1>
+<p align="center">
+  MAA多账号管理与自动化软件<br><br>
+  <img alt="软件图标" src="https://github.com/DLmaster361/AUTO_MAA/blob/main/resources/images/AUTO_MAA.png">
+</p>
 
 ---
 
-</h1>
-
-[![GitHub Stars](https://img.shields.io/github/stars/DLmaster361/AUTO_MAA?style=flat-square)](https://github.com/DLmaster361/AUTO_MAA/stargazers)
-[![GitHub Forks](https://img.shields.io/github/forks/DLmaster361/AUTO_MAA?style=flat-square)](https://github.com/DLmaster361/AUTO_MAA/network)
-[![GitHub Issues](https://img.shields.io/github/issues/DLmaster361/AUTO_MAA?style=flat-square)](https://github.com/DLmaster361/AUTO_MAA/issues)
-[![GitHub Contributors](https://img.shields.io/github/contributors/DLmaster361/AUTO_MAA?style=flat-square)](https://github.com/DLmaster361/AUTO_MAA/graphs/contributors)
-[![GitHub License](https://img.shields.io/github/license/DLmaster361/AUTO_MAA?style=flat-square)](https://github.com/DLmaster361/AUTO_MAA/blob/main/LICENSE)
-</div>
+<p align="center">
+  <a href="https://github.com/DLmaster361/AUTO_MAA/stargazers"><img alt="GitHub Stars" src="https://img.shields.io/github/stars/DLmaster361/AUTO_MAA?style=flat-square"></a>
+  <a href="https://github.com/DLmaster361/AUTO_MAA/network"><img alt="GitHub Forks" src="https://img.shields.io/github/forks/DLmaster361/AUTO_MAA?style=flat-square"></a>
+  <a href="https://github.com/DLmaster361/AUTO_MAA/releases/latest"><img alt="GitHub Downloads" src="https://img.shields.io/github/downloads/DLmaster361/AUTO_MAA/total?style=flat-square"></a>
+  <a href="https://github.com/DLmaster361/AUTO_MAA/issues"><img alt="GitHub Issues" src="https://img.shields.io/github/issues/DLmaster361/AUTO_MAA?style=flat-square"></a>
+  <a href="https://github.com/DLmaster361/AUTO_MAA/graphs/contributors"><img alt="GitHub Contributors" src="https://img.shields.io/github/contributors/DLmaster361/AUTO_MAA?style=flat-square"></a>
+  <a href="https://github.com/DLmaster361/AUTO_MAA/blob/main/LICENSE"><img alt="GitHub License" src="https://img.shields.io/github/license/DLmaster361/AUTO_MAA?style=flat-square"></a>
+  <a href="https://mirrorchyan.com/zh/projects?rid=AUTO_MAA"><img alt="mirrorc" src="https://img.shields.io/badge/Mirror%E9%85%B1-%239af3f6?logo=countingworkspro&logoColor=4f46e5"></a>
+</p>
 
 ## 软件介绍
 
@@ -98,4 +99,4 @@ MAA多账号管理与自动化软件
 
 如果喜欢这个项目的话，给作者来杯咖啡吧！
 
-![payid](https://github.com/DLmaster361/AUTO_MAA/blob/main/resources/README/payid.png "payid")
+![payid](resources/images/README/payid.png "payid")

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,12 +16,12 @@
 #   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
 AUTO_MAA主程序包
-v4.2
+v4.3
 作者：DLmaster_361
 """
 
@@ -29,16 +29,15 @@ __version__ = "4.2.0"
 __author__ = "DLmaster361 <DLmaster_361@163.com>"
 __license__ = "GPL-3.0 license"
 
-from .core import AppConfig, QueueConfig, MaaConfig, Task, TaskManager, MainTimer
+from .core import QueueConfig, MaaConfig, MaaUserConfig, Task, TaskManager, MainTimer
 from .models import MaaManager
 from .services import Notify, Crypto, System
 from .ui import AUTO_MAA
-from .utils import Updater
 
 __all__ = [
-    "AppConfig",
     "QueueConfig",
     "MaaConfig",
+    "MaaUserConfig",
     "Task",
     "TaskManager",
     "MainTimer",
@@ -47,5 +46,4 @@ __all__ = [
     "Crypto",
     "System",
     "AUTO_MAA",
-    "Updater",
 ]

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,12 +16,12 @@
 #   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
 AUTO_MAA核心组件包
-v4.2
+v4.3
 作者：DLmaster_361
 """
 
@@ -29,17 +29,19 @@ __version__ = "4.2.0"
 __author__ = "DLmaster361 <DLmaster_361@163.com>"
 __license__ = "GPL-3.0 license"
 
-from .config import AppConfig, QueueConfig, MaaConfig, Config
+from .config import QueueConfig, MaaConfig, MaaUserConfig, Config
 from .main_info_bar import MainInfoBar
+from .network import Network
 from .task_manager import Task, TaskManager
 from .timer import MainTimer
 
 __all__ = [
-    "AppConfig",
     "Config",
     "QueueConfig",
     "MaaConfig",
+    "MaaUserConfig",
     "MainInfoBar",
+    "Network",
     "Task",
     "TaskManager",
     "MainTimer",

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,77 +16,53 @@
 #   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
 AUTO_MAA信息通知栏
-v4.2
+v4.3
 作者：DLmaster_361
 """
 
 from loguru import logger
 from PySide6.QtCore import Qt
-from qfluentwidgets import (
-    InfoBar,
-    InfoBarPosition,
-)
+from qfluentwidgets import InfoBar, InfoBarPosition
+
+from .config import Config
 
 
 class _MainInfoBar:
     """信息通知栏"""
 
-    def __init__(self, main_window=None):
-
-        self.main_window = main_window
-
     def push_info_bar(self, mode: str, title: str, content: str, time: int):
         """推送到信息通知栏"""
-
-        if self.main_window is None:
+        if Config.main_window is None:
             logger.error("信息通知栏未设置父窗口")
             return None
 
-        if mode == "success":
-            InfoBar.success(
+        # 定义模式到 InfoBar 方法的映射
+        mode_mapping = {
+            "success": InfoBar.success,
+            "warning": InfoBar.warning,
+            "error": InfoBar.error,
+            "info": InfoBar.info,
+        }
+
+        # 根据 mode 获取对应的 InfoBar 方法
+        info_bar_method = mode_mapping.get(mode)
+        if info_bar_method:
+            info_bar_method(
                 title=title,
                 content=content,
                 orient=Qt.Horizontal,
                 isClosable=True,
                 position=InfoBarPosition.TOP_RIGHT,
                 duration=time,
-                parent=self.main_window,
-            )
-        elif mode == "warning":
-            InfoBar.warning(
-                title=title,
-                content=content,
-                orient=Qt.Horizontal,
-                isClosable=True,
-                position=InfoBarPosition.TOP_RIGHT,
-                duration=time,
-                parent=self.main_window,
-            )
-        elif mode == "error":
-            InfoBar.error(
-                title=title,
-                content=content,
-                orient=Qt.Horizontal,
-                isClosable=True,
-                position=InfoBarPosition.TOP_RIGHT,
-                duration=time,
-                parent=self.main_window,
-            )
-        elif mode == "info":
-            InfoBar.info(
-                title=title,
-                content=content,
-                orient=Qt.Horizontal,
-                isClosable=True,
-                position=InfoBarPosition.TOP_RIGHT,
-                duration=time,
-                parent=self.main_window,
+                parent=Config.main_window,
             )
+        else:
+            logger.error(f"未知的通知栏模式: {mode}")
 
 
 MainInfoBar = _MainInfoBar()

app/core/network.py

@@ -0,0 +1,120 @@
+#   AUTO_MAA:A MAA Multi Account Management and Automation Tool
+#   Copyright © 2024-2025 DLmaster361
+
+#   This file is part of AUTO_MAA.
+
+#   AUTO_MAA is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published
+#   by the Free Software Foundation, either version 3 of the License,
+#   or (at your option) any later version.
+
+#   AUTO_MAA is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty
+#   of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
+#   the GNU General Public License for more details.
+
+#   You should have received a copy of the GNU General Public License
+#   along with AUTO_MAA. If not, see <https://www.gnu.org/licenses/>.
+
+#   Contact: DLmaster_361@163.com
+
+"""
+AUTO_MAA
+AUTO_MAA网络请求线程
+v4.3
+作者：DLmaster_361
+"""
+
+from loguru import logger
+from PySide6.QtCore import QThread, QEventLoop, QTimer
+import time
+import requests
+from pathlib import Path
+
+
+class _Network(QThread):
+
+    max_retries = 3
+    timeout = 10
+    backoff_factor = 0.1
+
+    def __init__(self) -> None:
+        super().__init__()
+
+        self.if_running = False
+        self.mode = None
+        self.url = None
+        self.loop = QEventLoop()
+        self.wait_loop = QEventLoop()
+
+    @logger.catch
+    def run(self) -> None:
+        """运行网络请求线程"""
+
+        self.if_running = True
+
+        if self.mode == "get":
+            self.get_json(self.url)
+        elif self.mode == "get_file":
+            self.get_file(self.url, self.path)
+
+        self.if_running = False
+
+    def set_info(self, mode: str, url: str, path: Path = None) -> None:
+        """设置网络请求信息"""
+
+        while self.if_running:
+            QTimer.singleShot(self.backoff_factor * 1000, self.wait_loop.quit)
+            self.wait_loop.exec()
+
+        self.mode = mode
+        self.url = url
+        self.path = path
+
+        self.stutus_code = None
+        self.response_json = None
+        self.error_message = None
+
+    def get_json(self, url: str) -> None:
+        """通过get方法获取json数据"""
+
+        response = None
+
+        for _ in range(self.max_retries):
+            try:
+                response = requests.get(url, timeout=self.timeout)
+                self.stutus_code = response.status_code
+                self.response_json = response.json()
+                self.error_message = None
+                break
+            except Exception as e:
+                self.stutus_code = response.status_code if response else None
+                self.response_json = None
+                self.error_message = str(e)
+                time.sleep(self.backoff_factor)
+
+        self.loop.quit()
+
+    def get_file(self, url: str, path: Path) -> None:
+        """通过get方法下载文件"""
+
+        response = None
+
+        try:
+            response = requests.get(url, timeout=10)
+            if response.status_code == 200:
+                with open(path, "wb") as file:
+                    file.write(response.content)
+                self.stutus_code = response.status_code
+            else:
+                self.stutus_code = response.status_code
+                self.error_message = "下载失败"
+
+        except Exception as e:
+            self.stutus_code = response.status_code if response else None
+            self.error_message = str(e)
+
+        self.loop.quit()
+
+
+Network = _Network()

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,25 +16,25 @@
 #   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
 AUTO_MAA业务调度器
-v4.2
+v4.3
 作者：DLmaster_361
 """
 
 from loguru import logger
 from PySide6.QtCore import QThread, QObject, Signal
-from qfluentwidgets import Dialog
-import json
-from pathlib import Path
+from qfluentwidgets import MessageBox
 from datetime import datetime
+from packaging import version
 from typing import Dict, Union
 
 from .config import Config
 from .main_info_bar import MainInfoBar
+from .network import Network
 from app.models import MaaManager
 from app.services import System
 
@@ -42,10 +42,11 @@ from app.services import System
 class Task(QThread):
     """业务线程"""
 
+    check_maa_version = Signal(str)
     push_info_bar = Signal(str, str, str, int)
     question = Signal(str, str)
     question_response = Signal(bool)
-    update_user_info = Signal(Path, list, list, list, list, list, list)
+    update_user_info = Signal(str, dict)
     create_task_list = Signal(list)
     create_user_list = Signal(list)
     update_task_list = Signal(list)
@@ -66,6 +67,7 @@ class Task(QThread):
 
         self.question_response.connect(lambda: print("response"))
 
+    @logger.catch
     def run(self):
 
         if "设置MAA" in self.mode:
@@ -75,14 +77,10 @@ class Task(QThread):
 
             self.task = MaaManager(
                 self.mode,
-                Config.app_path / f"config/MaaConfig/{self.name}",
-                (
-                    None
-                    if "全局" in self.mode
-                    else Config.app_path
-                    / f"config/MaaConfig/{self.name}/beta/{self.info["SetMaaInfo"]["UserId"]}/{self.info["SetMaaInfo"]["SetType"]}"
-                ),
+                Config.member_dict[self.name],
+                (None if "全局" in self.mode else self.info["SetMaaInfo"]["Path"]),
             )
+            self.task.check_maa_version.connect(self.check_maa_version.emit)
             self.task.push_info_bar.connect(self.push_info_bar.emit)
             self.task.accomplish.connect(lambda: self.accomplish.emit([]))
 
@@ -90,44 +88,55 @@ class Task(QThread):
 
         else:
 
-            self.member_dict = self.search_member()
-            self.task_dict = [
-                [value, "等待"]
-                for _, value in self.info["Queue"].items()
+            self.task_list = [
+                [
+                    (
+                        value
+                        if Config.member_dict[value]["Config"].get(
+                            Config.member_dict[value]["Config"].MaaSet_Name
+                        )
+                        == ""
+                        else f"{value} - {Config.member_dict[value]["Config"].get(Config.member_dict[value]["Config"].MaaSet_Name)}"
+                    ),
+                    "等待",
+                    value,
+                ]
+                for _, value in sorted(
+                    self.info["Queue"].items(), key=lambda x: int(x[0][7:])
+                )
                 if value != "禁用"
             ]
 
-            self.create_task_list.emit(self.task_dict)
+            self.create_task_list.emit(self.task_list)
 
-            for i in range(len(self.task_dict)):
+            for task in self.task_list:
 
                 if self.isInterruptionRequested():
                     break
 
-                self.task_dict[i][1] = "运行"
-                self.update_task_list.emit(self.task_dict)
+                task[1] = "运行"
+                self.update_task_list.emit(self.task_list)
 
-                if self.task_dict[i][0] in Config.running_list:
+                if task[2] in Config.running_list:
 
-                    self.task_dict[i][1] = "跳过"
-                    self.update_task_list.emit(self.task_dict)
-                    logger.info(f"跳过任务：{self.task_dict[i][0]}")
-                    self.push_info_bar.emit(
-                        "info", "跳过任务", self.task_dict[i][0], 3000
-                    )
+                    task[1] = "跳过"
+                    self.update_task_list.emit(self.task_list)
+                    logger.info(f"跳过任务：{task[0]}")
+                    self.push_info_bar.emit("info", "跳过任务", task[0], 3000)
                     continue
 
-                Config.running_list.append(self.task_dict[i][0])
-                logger.info(f"任务开始：{self.task_dict[i][0]}")
-                self.push_info_bar.emit("info", "任务开始", self.task_dict[i][0], 3000)
+                Config.running_list.append(task[2])
+                logger.info(f"任务开始：{task[0]}")
+                self.push_info_bar.emit("info", "任务开始", task[0], 3000)
 
-                if self.member_dict[self.task_dict[i][0]][0] == "Maa":
+                if Config.member_dict[task[2]]["Type"] == "Maa":
 
                     self.task = MaaManager(
                         self.mode[0:4],
-                        self.member_dict[self.task_dict[i][0]][1],
+                        Config.member_dict[task[2]],
                     )
 
+                    self.task.check_maa_version.connect(self.check_maa_version.emit)
                     self.task.question.connect(self.question.emit)
                     self.question_response.disconnect()
                     self.question_response.connect(self.task.question_response.emit)
@@ -135,44 +144,22 @@ class Task(QThread):
                     self.task.create_user_list.connect(self.create_user_list.emit)
                     self.task.update_user_list.connect(self.update_user_list.emit)
                     self.task.update_log_text.connect(self.update_log_text.emit)
-                    self.task.update_user_info.connect(
-                        lambda modes, uids, days, lasts, notes, numbs: self.update_user_info.emit(
-                            self.member_dict[self.task_dict[i][0]][1],
-                            modes,
-                            uids,
-                            days,
-                            lasts,
-                            notes,
-                            numbs,
-                        )
-                    )
+                    self.task.update_user_info.connect(self.update_user_info.emit)
                     self.task.accomplish.connect(
-                        lambda log: self.task_accomplish(self.task_dict[i][0], log)
+                        lambda log: self.task_accomplish(task[2], log)
                     )
 
                     self.task.run()
 
-                Config.running_list.remove(self.task_dict[i][0])
+                Config.running_list.remove(task[2])
 
-                self.task_dict[i][1] = "完成"
-                logger.info(f"任务完成：{self.task_dict[i][0]}")
-                self.push_info_bar.emit("info", "任务完成", self.task_dict[i][0], 3000)
+                task[1] = "完成"
+                self.update_task_list.emit(self.task_list)
+                logger.info(f"任务完成：{task[0]}")
+                self.push_info_bar.emit("info", "任务完成", task[0], 3000)
 
             self.accomplish.emit(self.logs)
 
-    def search_member(self) -> dict:
-        """搜索所有脚本实例及其路径"""
-
-        member_dict = {}
-
-        if (Config.app_path / "config/MaaConfig").exists():
-            for subdir in (Config.app_path / "config/MaaConfig").iterdir():
-                if subdir.is_dir():
-
-                    member_dict[subdir.name] = ["Maa", subdir]
-
-        return member_dict
-
     def task_accomplish(self, name: str, log: dict):
         """保存保存任务结果"""
 
@@ -185,7 +172,6 @@ class _TaskManager(QObject):
 
     create_gui = Signal(Task)
     connect_gui = Signal(Task)
-    push_info_bar = Signal(str, str, str, int)
 
     def __init__(self):
         super(_TaskManager, self).__init__()
@@ -208,6 +194,7 @@ class _TaskManager(QObject):
 
         Config.running_list.append(name)
         self.task_dict[name] = Task(mode, name, info)
+        self.task_dict[name].check_maa_version.connect(self.check_maa_version)
         self.task_dict[name].question.connect(
             lambda title, content: self.push_dialog(name, title, content)
         )
@@ -247,50 +234,87 @@ class _TaskManager(QObject):
             self.task_dict[name].quit()
             self.task_dict[name].wait()
 
-    def remove_task(self, mode: str, name: str, logs: str):
+    def remove_task(self, mode: str, name: str, logs: list):
         """任务结束后的处理"""
 
         logger.info(f"任务结束：{name}")
         MainInfoBar.push_info_bar("info", "任务结束", name, 3000)
 
         self.task_dict[name].deleteLater()
-
-        if len(logs) > 0:
-            time = logs[0][1]["Time"]
-            history = ""
-            for log in logs:
-                Config.save_history(log[0], log[1])
-                history += (
-                    f"任务名称：{log[0]}，{log[1]["History"].replace("\n","\n    ")}\n"
-                )
-            Config.save_history(name, {"Time": time, "History": history})
-        else:
-            Config.save_history(
-                name,
-                {
-                    "Time": datetime.now().strftime("%Y-%m-%d %H:%M:%S"),
-                    "History": "没有任务被执行",
-                },
-            )
-
         self.task_dict.pop(name)
         Config.running_list.remove(name)
 
         if "调度队列" in name and "人工排查" not in mode:
-            with (Config.app_path / f"config/QueueConfig/{name}.json").open(
-                "r", encoding="utf-8"
-            ) as f:
-                info = json.load(f)
-            System.set_power(info["QueueSet"]["AfterAccomplish"])
+
+            if len(logs) > 0:
+                time = logs[0][1]["Time"]
+                history = ""
+                for log in logs:
+                    history += f"任务名称：{log[0]}，{log[1]["History"].replace("\n","\n    ")}\n"
+                Config.save_history(name, {"Time": time, "History": history})
+            else:
+                Config.save_history(
+                    name,
+                    {
+                        "Time": datetime.now().strftime("%Y-%m-%d %H:%M:%S"),
+                        "History": "没有任务被执行",
+                    },
+                )
+
+            if (
+                Config.queue_dict[name]["Config"].get(
+                    Config.queue_dict[name]["Config"].queueSet_AfterAccomplish
+                )
+                != "NoAction"
+                and Config.power_sign == "NoAction"
+            ):
+                Config.set_power_sign(
+                    Config.queue_dict[name]["Config"].get(
+                        Config.queue_dict[name]["Config"].queueSet_AfterAccomplish
+                    )
+                )
+
+    def check_maa_version(self, v: str):
+        """检查MAA版本"""
+
+        Network.set_info(
+            mode="get",
+            url="https://mirrorchyan.com/api/resources/MAA/latest?user_agent=AutoMaaGui&os=win&arch=x64&channel=stable",
+        )
+        Network.start()
+        Network.loop.exec()
+        if Network.stutus_code == 200:
+            maa_info = Network.response_json
+        else:
+            logger.warning(f"获取MAA版本信息时出错：{Network.error_message}")
+            MainInfoBar.push_info_bar(
+                "warning",
+                "获取MAA版本信息时出错",
+                f"网络错误：{Network.stutus_code}",
+                5000,
+            )
+            return None
+
+        if version.parse(maa_info["data"]["version_name"]) > version.parse(v):
+
+            logger.info(
+                f"检测到MAA版本过低：{v}，最新版本：{maa_info['data']['version_name']}"
+            )
+            MainInfoBar.push_info_bar(
+                "info",
+                "MAA版本过低",
+                f"当前版本：{v}，最新稳定版：{maa_info['data']['version_name']}",
+                -1,
+            )
 
     def push_dialog(self, name: str, title: str, content: str):
         """推送对话框"""
 
-        choice = Dialog(title, content, None)
+        choice = MessageBox(title, content, Config.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()

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,19 +16,18 @@
 #   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
 AUTO_MAA主业务定时器
-v4.2
+v4.3
 作者：DLmaster_361
 """
 
 from loguru import logger
 from PySide6.QtWidgets import QWidget
 from PySide6.QtCore import QTimer
-import json
 from datetime import datetime
 import pyautogui
 
@@ -47,45 +46,54 @@ class _MainTimer(QWidget):
         self.Timer = QTimer()
         self.Timer.timeout.connect(self.timed_start)
         self.Timer.timeout.connect(self.set_silence)
+        self.Timer.timeout.connect(self.check_power)
         self.Timer.start(1000)
+        self.LongTimer = QTimer()
+        self.LongTimer.timeout.connect(self.long_timed_task)
+        self.LongTimer.start(3600000)
+
+    def long_timed_task(self):
+        """长时间定期检定任务"""
+
+        Config.get_gameid()
+        Config.main_window.setting.show_notice()
+        if Config.get(Config.update_IfAutoUpdate):
+            Config.main_window.setting.check_update()
 
     def timed_start(self):
         """定时启动代理任务"""
 
-        # 获取定时列表
-        queue_list = self.search_queue()
+        for name, info in Config.queue_dict.items():
 
-        for i in queue_list:
-
-            name, info = i
-
-            if not info["QueueSet"]["Enabled"]:
+            if not info["Config"].get(info["Config"].queueSet_Enabled):
                 continue
 
-            history = Config.get_history(name)
+            data = info["Config"].toDict()
 
             time_set = [
-                info["Time"][f"TimeSet_{_}"]
+                data["Time"][f"TimeSet_{_}"]
                 for _ in range(10)
-                if info["Time"][f"TimeEnabled_{_}"]
+                if data["Time"][f"TimeEnabled_{_}"]
             ]
             # 按时间调起代理任务
             curtime = datetime.now().strftime("%Y-%m-%d %H:%M")
             if (
                 curtime[11:16] in time_set
-                and curtime != history["Time"][:16]
+                and curtime
+                != info["Config"].get(info["Config"].Data_LastProxyTime)[:16]
                 and name not in Config.running_list
             ):
 
                 logger.info(f"定时任务：{name}")
-                TaskManager.add_task("自动代理_新调度台", name, info)
+                TaskManager.add_task("自动代理_新调度台", name, data)
 
     def set_silence(self):
         """设置静默模式"""
 
         if (
-            Config.global_config.get(Config.global_config.function_IfSilence)
-            and Config.global_config.get(Config.global_config.function_BossKey) != ""
+            not Config.if_ignore_silence
+            and Config.get(Config.function_IfSilence)
+            and Config.get(Config.function_BossKey) != ""
         ):
 
             windows = System.get_window_info()
@@ -98,9 +106,7 @@ class _MainTimer(QWidget):
                     pyautogui.hotkey(
                         *[
                             _.strip().lower()
-                            for _ in Config.global_config.get(
-                                Config.global_config.function_BossKey
-                            ).split("+")
+                            for _ in Config.get(Config.function_BossKey).split("+")
                         ]
                     )
                 except pyautogui.FailSafeException as e:
@@ -108,18 +114,27 @@ class _MainTimer(QWidget):
                         logger.warning(f"FailSafeException: {e}")
                         self.if_FailSafeException = True
 
-    def search_queue(self) -> list:
-        """搜索所有调度队列实例"""
+    def check_power(self):
 
-        queue_list = []
+        if Config.power_sign != "NoAction" and not Config.running_list:
 
-        if (Config.app_path / "config/QueueConfig").exists():
-            for json_file in (Config.app_path / "config/QueueConfig").glob("*.json"):
-                with json_file.open("r", encoding="utf-8") as f:
-                    info = json.load(f)
-                queue_list.append([json_file.stem, info])
+            from app.ui import ProgressRingMessageBox
 
-        return queue_list
+            mode_book = {
+                "KillSelf": "退出软件",
+                "Sleep": "睡眠",
+                "Hibernate": "休眠",
+                "Shutdown": "关机",
+            }
+
+            choice = ProgressRingMessageBox(
+                Config.main_window, f"{mode_book[Config.power_sign]}倒计时"
+            )
+            if choice.exec():
+                System.set_power(Config.power_sign)
+                Config.set_power_sign("NoAction")
+            else:
+                Config.set_power_sign("NoAction")
 
 
 MainTimer = _MainTimer()

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,12 +16,12 @@
 #   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
 AUTO_MAA模组包
-v4.2
+v4.3
 作者：DLmaster_361
 """
 

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,12 +16,12 @@
 #   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
 AUTO_MAA服务包
-v4.2
+v4.3
 作者：DLmaster_361
 """
 

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,18 +16,19 @@
 #   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
 AUTO_MAA通知服务
-v4.2
+v4.3
 作者：DLmaster_361
 """
 
 from PySide6.QtWidgets import QWidget
 from PySide6.QtCore import Signal
 import requests
+import time
 from loguru import logger
 from plyer import notification
 import re
@@ -36,9 +37,6 @@ from email.mime.text import MIMEText
 from email.mime.multipart import MIMEMultipart
 from email.header import Header
 from email.utils import formataddr
-
-from serverchan_sdk import sc_send
-
 from app.core import Config
 from app.services.security import Crypto
 
@@ -53,7 +51,7 @@ class Notification(QWidget):
     def push_plyer(self, title, message, ticker, t):
         """推送系统通知"""
 
-        if Config.global_config.get(Config.global_config.notify_IfPushPlyer):
+        if Config.get(Config.notify_IfPushPlyer):
 
             notification.notify(
                 title=title,
@@ -70,27 +68,21 @@ class Notification(QWidget):
     def send_mail(self, mode, title, content) -> None:
         """推送邮件通知"""
 
-        if Config.global_config.get(Config.global_config.notify_IfSendMail):
+        if Config.get(Config.notify_IfSendMail):
 
             if (
-                Config.global_config.get(Config.global_config.notify_SMTPServerAddress)
-                == ""
-                or Config.global_config.get(
-                    Config.global_config.notify_AuthorizationCode
-                )
-                == ""
+                Config.get(Config.notify_SMTPServerAddress) == ""
+                or Config.get(Config.notify_AuthorizationCode) == ""
                 or not bool(
                     re.match(
                         r"^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$",
-                        Config.global_config.get(
-                            Config.global_config.notify_FromAddress
-                        ),
+                        Config.get(Config.notify_FromAddress),
                     )
                 )
                 or not bool(
                     re.match(
                         r"^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$",
-                        Config.global_config.get(Config.global_config.notify_ToAddress),
+                        Config.get(Config.notify_ToAddress),
                     )
                 )
             ):
@@ -114,15 +106,13 @@ class Notification(QWidget):
                 message["From"] = formataddr(
                     (
                         Header("AUTO_MAA通知服务", "utf-8").encode(),
-                        Config.global_config.get(
-                            Config.global_config.notify_FromAddress
-                        ),
+                        Config.get(Config.notify_FromAddress),
                     )
                 )  # 发件人显示的名字
                 message["To"] = formataddr(
                     (
                         Header("AUTO_MAA用户", "utf-8").encode(),
-                        Config.global_config.get(Config.global_config.notify_ToAddress),
+                        Config.get(Config.notify_ToAddress),
                     )
                 )  # 收件人显示的名字
                 message["Subject"] = Header(title, "utf-8")
@@ -131,22 +121,16 @@ class Notification(QWidget):
                     message.attach(MIMEText(content, "html", "utf-8"))
 
                 smtpObj = smtplib.SMTP_SSL(
-                    Config.global_config.get(
-                        Config.global_config.notify_SMTPServerAddress
-                    ),
+                    Config.get(Config.notify_SMTPServerAddress),
                     465,
                 )
                 smtpObj.login(
-                    Config.global_config.get(Config.global_config.notify_FromAddress),
-                    Crypto.win_decryptor(
-                        Config.global_config.get(
-                            Config.global_config.notify_AuthorizationCode
-                        )
-                    ),
+                    Config.get(Config.notify_FromAddress),
+                    Crypto.win_decryptor(Config.get(Config.notify_AuthorizationCode)),
                 )
                 smtpObj.sendmail(
-                    Config.global_config.get(Config.global_config.notify_FromAddress),
-                    Config.global_config.get(Config.global_config.notify_ToAddress),
+                    Config.get(Config.notify_FromAddress),
+                    Config.get(Config.notify_ToAddress),
                     message.as_string(),
                 )
                 smtpObj.quit()
@@ -156,92 +140,177 @@ class Notification(QWidget):
                 self.push_info_bar.emit("error", "发送邮件时出错", f"{e}", -1)
 
     def ServerChanPush(self, title, content):
-        """使用Server酱推送通知"""
+        """使用Server酱推送通知（支持 tag 和 channel，避免使用SDK）"""
+        if Config.get(Config.notify_IfServerChan):
+            send_key = Config.get(Config.notify_ServerChanKey)
 
-        if Config.global_config.get(Config.global_config.notify_IfServerChan):
-            send_key = Config.global_config.get(
-                Config.global_config.notify_ServerChanKey
-            )
-            option = {}
-            is_valid = lambda s: s == "" or (
-                s == "|".join(s.split("|")) and (s.count("|") == 0 or all(s.split("|")))
-            )
-            """
-            is_valid => True, 如果启用的话需要正确设置Tag和Channel。
-            允许空的Tag和Channel即不启用，但不允许例如a||b，|a|b，a|b|，||||
-            """
-            send_tag = Config.global_config.get(
-                Config.global_config.notify_ServerChanTag
-            )
-            send_channel = Config.global_config.get(
-                Config.global_config.notify_ServerChanChannel
-            )
-
-            if is_valid(send_tag):
-                option["tags"] = send_tag
-            else:
-                option["tags"] = ""
-                logger.warning("请正确设置Auto_MAA中ServerChan的Tag。")
+            if not send_key:
+                logger.error("请正确设置Server酱的SendKey")
                 self.push_info_bar.emit(
-                    "warning",
-                    "Server酱通知推送异常",
-                    "请正确设置Auto_MAA中ServerChan的Tag。",
-                    -1,
+                    "error", "Server酱通知推送异常", "请正确设置Server酱的SendKey", -1
+                )
+                return None
+
+            try:
+                # 构造 URL
+                if send_key.startswith("sctp"):
+                    match = re.match(r"^sctp(\d+)t", send_key)
+                    if match:
+                        url = f"https://{match.group(1)}.push.ft07.com/send/{send_key}.send"
+                    else:
+                        raise ValueError("SendKey 格式错误（sctp）")
+                else:
+                    url = f"https://sctapi.ftqq.com/{send_key}.send"
+
+                # 构建 tags 和 channel
+                def is_valid(s):
+                    return s == "" or (
+                        s == "|".join(s.split("|"))
+                        and (s.count("|") == 0 or all(s.split("|")))
+                    )
+
+                tags = "|".join(
+                    _.strip()
+                    for _ in Config.get(Config.notify_ServerChanTag).split("|")
+                )
+                channels = "|".join(
+                    _.strip()
+                    for _ in Config.get(Config.notify_ServerChanChannel).split("|")
                 )
 
-            if is_valid(send_channel):
-                option["channel"] = send_channel
-            else:
-                option["channel"] = ""
-                logger.warning("请正确设置Auto_MAA中ServerChan的Channel。")
-                self.push_info_bar.emit(
-                    "warning",
-                    "Server酱通知推送异常",
-                    "请正确设置Auto_MAA中ServerChan的Channel。",
-                    -1,
-                )
+                options = {}
+                if is_valid(tags):
+                    options["tags"] = tags
+                else:
+                    logger.warning("Server酱 Tag 配置不正确，将被忽略")
+                    self.push_info_bar.emit(
+                        "warning",
+                        "Server酱通知推送异常",
+                        "请正确设置 ServerChan 的 Tag",
+                        -1,
+                    )
 
-            response = sc_send(send_key, title, content, option)
-            if response["code"] == 0:
-                logger.info("Server酱推送通知成功")
-                return True
-            else:
-                logger.info("Server酱推送通知失败")
-                logger.error(response)
+                if is_valid(channels):
+                    options["channel"] = channels
+                else:
+                    logger.warning("Server酱 Channel 配置不正确，将被忽略")
+                    self.push_info_bar.emit(
+                        "warning",
+                        "Server酱通知推送异常",
+                        "请正确设置 ServerChan 的 Channel",
+                        -1,
+                    )
+
+                # 请求发送
+                params = {"title": title, "desp": content, **options}
+                headers = {"Content-Type": "application/json;charset=utf-8"}
+
+                response = requests.post(url, json=params, headers=headers, timeout=10)
+                result = response.json()
+
+                if result.get("code") == 0:
+                    logger.info("Server酱推送通知成功")
+                    return True
+                else:
+                    error_code = result.get("code", "-1")
+                    logger.error(f"Server酱通知推送失败：响应码：{error_code}")
+                    self.push_info_bar.emit(
+                        "error", "Server酱通知推送失败", f"响应码：{error_code}", -1
+                    )
+                    return f"Server酱通知推送失败：{error_code}"
+
+            except Exception as e:
+                logger.exception("Server酱通知推送异常")
                 self.push_info_bar.emit(
-                    "error",
-                    "Server酱通知推送失败",
-                    f'使用Server酱推送通知时出错：\n{response["data"]['error']}',
-                    -1,
+                    "error", "Server酱通知推送异常", f"请检查相关设置，如还有问题可联系开发者", -1
                 )
-                return f'使用Server酱推送通知时出错：\n{response["data"]['error']}'
+                return f"Server酱通知推送异常：{str(e)}"
 
     def CompanyWebHookBotPush(self, title, content):
         """使用企业微信群机器人推送通知"""
-        if Config.global_config.get(Config.global_config.notify_IfCompanyWebHookBot):
+        if Config.get(Config.notify_IfCompanyWebHookBot):
+
+            if Config.get(Config.notify_CompanyWebHookBotUrl) == "":
+                logger.error("请正确设置企业微信群机器人的WebHook地址")
+                self.push_info_bar.emit(
+                    "error",
+                    "企业微信群机器人通知推送异常",
+                    "请正确设置企业微信群机器人的WebHook地址",
+                    -1,
+                )
+                return None
+
             content = f"{title}\n{content}"
             data = {"msgtype": "text", "text": {"content": content}}
-            response = requests.post(
-                url=Config.global_config.get(
-                    Config.global_config.notify_CompanyWebHookBotUrl
-                ),
-                json=data,
-            )
-            if response.json()["errcode"] == 0:
-                logger.info("企业微信群机器人推送通知成功")
-                return True
+            # 从远程服务器获取最新主题图像
+            for _ in range(3):
+                try:
+                    response = requests.post(
+                        url=Config.get(Config.notify_CompanyWebHookBotUrl),
+                        json=data,
+                        timeout=10,
+                    )
+                    info = response.json()
+                    break
+                except Exception as e:
+                    err = e
+                    time.sleep(0.1)
             else:
-                logger.info("企业微信群机器人推送通知失败")
-                logger.error(response.json())
+                logger.error(f"推送企业微信群机器人时出错：{err}")
                 self.push_info_bar.emit(
                     "error",
                     "企业微信群机器人通知推送失败",
-                    f'使用企业微信群机器人推送通知时出错：\n{response.json()["errmsg"]}',
+                    f'使用企业微信群机器人推送通知时出错：{info["errmsg"]}',
                     -1,
                 )
-                return (
-                    f'使用企业微信群机器人推送通知时出错：\n{response.json()["errmsg"]}'
+                return None
+
+            if info["errcode"] == 0:
+                logger.info("企业微信群机器人推送通知成功")
+                return True
+            else:
+                logger.error(f"企业微信群机器人推送通知失败：{info}")
+                self.push_info_bar.emit(
+                    "error",
+                    "企业微信群机器人通知推送失败",
+                    f'使用企业微信群机器人推送通知时出错：{info["errmsg"]}',
+                    -1,
                 )
+                return f'使用企业微信群机器人推送通知时出错：{info["errmsg"]}'
+
+    def send_test_notification(self):
+        """发送测试通知到所有已启用的通知渠道"""
+        # 发送系统通知
+        self.push_plyer(
+            "测试通知",
+            "这是 AUTO_MAA 外部通知测试信息。如果你看到了这段内容，说明 AUTO_MAA 的通知功能已经正确配置且可以正常工作！",
+            "测试通知",
+            3,
+        )
+
+        # 发送邮件通知
+        if Config.get(Config.notify_IfSendMail):
+            self.send_mail(
+                "文本",
+                "AUTO_MAA测试通知",
+                "这是 AUTO_MAA 外部通知测试信息。如果你看到了这段内容，说明 AUTO_MAA 的通知功能已经正确配置且可以正常工作！",
+            )
+
+        # 发送Server酱通知
+        if Config.get(Config.notify_IfServerChan):
+            self.ServerChanPush(
+                "AUTO_MAA测试通知",
+                "这是 AUTO_MAA 外部通知测试信息。如果你看到了这段内容，说明 AUTO_MAA 的通知功能已经正确配置且可以正常工作！",
+            )
+
+        # 发送企业微信机器人通知
+        if Config.get(Config.notify_IfCompanyWebHookBot):
+            self.CompanyWebHookBotPush(
+                "AUTO_MAA测试通知",
+                "这是 AUTO_MAA 外部通知测试信息。如果你看到了这段内容，说明 AUTO_MAA 的通知功能已经正确配置且可以正常工作！",
+            )
+
+        return True
 
 
 Notify = Notification()

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,17 +16,16 @@
 #   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
 AUTO_MAA安全服务
-v4.2
+v4.3
 作者：DLmaster_361
 """
 
 from loguru import logger
-import sqlite3
 import hashlib
 import random
 import secrets
@@ -85,9 +84,12 @@ class CryptoHandler:
         private_key_local = AES_key.encrypt(pad(private_key.exportKey(), 32))
         (Config.app_path / "data/key/private_key.bin").write_bytes(private_key_local)
 
-    def AUTO_encryptor(self, note: str) -> bytes:
+    def AUTO_encryptor(self, note: str) -> str:
         """使用AUTO_MAA的算法加密数据"""
 
+        if note == "":
+            return ""
+
         # 读取RSA公钥
         public_key_local = RSA.import_key(
             (Config.app_path / "data/key/public_key.pem").read_bytes()
@@ -95,11 +97,14 @@ class CryptoHandler:
         # 使用RSA公钥对数据进行加密
         cipher = PKCS1_OAEP.new(public_key_local)
         encrypted = cipher.encrypt(note.encode("utf-8"))
-        return encrypted
+        return base64.b64encode(encrypted).decode("utf-8")
 
-    def AUTO_decryptor(self, note: bytes, PASSWORD: str) -> str:
+    def AUTO_decryptor(self, note: str, PASSWORD: str) -> str:
         """使用AUTO_MAA的算法解密数据"""
 
+        if note == "":
+            return ""
+
         # 读入RSA私钥密文、盐与校验哈希值
         private_key_local = (
             (Config.app_path / "data/key/private_key.bin").read_bytes().strip()
@@ -133,63 +138,40 @@ class CryptoHandler:
             private_key = RSA.import_key(private_key_pem)
             # 使用RSA私钥解密数据
             decrypter = PKCS1_OAEP.new(private_key)
-            note = decrypter.decrypt(note)
-            return note.decode("utf-8")
+            note = decrypter.decrypt(base64.b64decode(note)).decode("utf-8")
+            return note
 
     def change_PASSWORD(self, PASSWORD_old: str, PASSWORD_new: str) -> None:
         """修改管理密钥"""
 
-        member_list = self.search_member()
-
-        for user_data in member_list:
-
-            # 读取用户数据
-            db = sqlite3.connect(user_data["Path"])
-            cur = db.cursor()
-            cur.execute("SELECT * FROM adminx WHERE True")
-            data = cur.fetchall()
+        for member in Config.member_dict.values():
 
             # 使用旧管理密钥解密
-            user_data["Password"] = []
-            for i in range(len(data)):
-                user_data["Password"].append(
-                    self.AUTO_decryptor(data[i][12], PASSWORD_old)
+            for user in member["UserData"].values():
+                user["Password"] = self.AUTO_decryptor(
+                    user["Config"].get(user["Config"].Info_Password), PASSWORD_old
                 )
-            cur.close()
-            db.close()
 
         self.get_PASSWORD(PASSWORD_new)
 
-        for user_data in member_list:
-
-            # 读取用户数据
-            db = sqlite3.connect(user_data["Path"])
-            cur = db.cursor()
-            cur.execute("SELECT * FROM adminx WHERE True")
-            data = cur.fetchall()
+        for member in Config.member_dict.values():
 
             # 使用新管理密钥重新加密
-            for i in range(len(data)):
-                cur.execute(
-                    "UPDATE adminx SET password = ? WHERE mode = ? AND uid = ?",
-                    (
-                        self.AUTO_encryptor(user_data["Password"][i]),
-                        data[i][15],
-                        data[i][16],
-                    ),
+            for user in member["UserData"].values():
+                user["Config"].set(
+                    user["Config"].Info_Password, self.AUTO_encryptor(user["Password"])
                 )
-                db.commit()
-                user_data["Password"][i] = None
-            del user_data["Password"]
-
-            cur.close()
-            db.close()
+                user["Password"] = None
+                del user["Password"]
 
     def win_encryptor(
         self, note: str, description: str = None, entropy: bytes = None
     ) -> str:
         """使用Windows DPAPI加密数据"""
 
+        if note == "":
+            return ""
+
         encrypted = win32crypt.CryptProtectData(
             note.encode("utf-8"), description, entropy, None, None, 0
         )
@@ -223,7 +205,7 @@ class CryptoHandler:
         """验证管理密钥"""
 
         return bool(
-            self.AUTO_decryptor(self.AUTO_encryptor(""), PASSWORD) != "管理密钥错误"
+            self.AUTO_decryptor(self.AUTO_encryptor("-"), PASSWORD) != "管理密钥错误"
         )
 
 

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,17 +16,17 @@
 #   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
 AUTO_MAA系统服务
-v4.2
+v4.3
 作者：DLmaster_361
 """
 
 from loguru import logger
-from PySide6.QtWidgets import QWidget
+from PySide6.QtWidgets import QApplication
 import sys
 import ctypes
 import win32gui
@@ -44,9 +44,7 @@ class _SystemHandler:
     ES_CONTINUOUS = 0x80000000
     ES_SYSTEM_REQUIRED = 0x00000001
 
-    def __init__(self, main_window: QWidget = None):
-
-        self.main_window = main_window
+    def __init__(self):
 
         self.set_Sleep()
         self.set_SelfStart()
@@ -54,7 +52,7 @@ class _SystemHandler:
     def set_Sleep(self) -> None:
         """同步系统休眠状态"""
 
-        if Config.global_config.get(Config.global_config.function_IfAllowSleep):
+        if Config.get(Config.function_IfAllowSleep):
             # 设置系统电源状态
             ctypes.windll.kernel32.SetThreadExecutionState(
                 self.ES_CONTINUOUS | self.ES_SYSTEM_REQUIRED
@@ -66,10 +64,7 @@ class _SystemHandler:
     def set_SelfStart(self) -> None:
         """同步开机自启"""
 
-        if (
-            Config.global_config.get(Config.global_config.start_IfSelfStart)
-            and not self.is_startup()
-        ):
+        if Config.get(Config.start_IfSelfStart) and not self.is_startup():
             key = winreg.OpenKey(
                 winreg.HKEY_CURRENT_USER,
                 r"Software\Microsoft\Windows\CurrentVersion\Run",
@@ -78,10 +73,7 @@ class _SystemHandler:
             )
             winreg.SetValueEx(key, "AUTO_MAA", 0, winreg.REG_SZ, Config.app_path_sys)
             winreg.CloseKey(key)
-        elif (
-            not Config.global_config.get(Config.global_config.start_IfSelfStart)
-            and self.is_startup()
-        ):
+        elif not Config.get(Config.start_IfSelfStart) and self.is_startup():
             key = winreg.OpenKey(
                 winreg.HKEY_CURRENT_USER,
                 r"Software\Microsoft\Windows\CurrentVersion\Run",
@@ -95,7 +87,7 @@ class _SystemHandler:
 
         if sys.platform.startswith("win"):
 
-            if mode == "None":
+            if mode == "NoAction":
 
                 logger.info("不执行系统电源操作")
 
@@ -118,11 +110,12 @@ class _SystemHandler:
 
             elif mode == "KillSelf":
 
-                self.main_window.close()
+                Config.main_window.close()
+                QApplication.quit()
 
         elif sys.platform.startswith("linux"):
 
-            if mode == "None":
+            if mode == "NoAction":
 
                 logger.info("不执行系统电源操作")
 
@@ -143,7 +136,8 @@ class _SystemHandler:
 
             elif mode == "KillSelf":
 
-                self.main_window.close()
+                Config.main_window.close()
+                QApplication.quit()
 
     def is_startup(self) -> bool:
         """判断程序是否已经开机自启"""

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,12 +16,12 @@
 #   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
 AUTO_MAA图形化界面包
-v4.2
+v4.3
 作者：DLmaster_361
 """
 
@@ -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"]

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,12 +16,12 @@
 #   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
 AUTO_MAA调度中枢界面
-v4.2
+v4.3
 作者：DLmaster_361
 """
 
@@ -33,8 +33,8 @@ from PySide6.QtWidgets import (
     QHBoxLayout,
 )
 from qfluentwidgets import (
+    BodyLabel,
     CardWidget,
-    Pivot,
     ScrollArea,
     FluentIcon,
     HeaderCardWidget,
@@ -44,14 +44,12 @@ from qfluentwidgets import (
     SubtitleLabel,
     PushButton,
 )
-from PySide6.QtCore import Qt
 from PySide6.QtGui import QTextCursor
 from typing import List, Dict
-import json
 
 
 from app.core import Config, TaskManager, Task, MainInfoBar
-from .Widget import StatefulItemCard
+from .Widget import StatefulItemCard, ComboBoxMessageBox, PivotArea
 
 
 class DispatchCenter(QWidget):
@@ -61,13 +59,29 @@ class DispatchCenter(QWidget):
 
         self.setObjectName("调度中枢")
 
-        self.pivot = Pivot(self)
+        self.multi_button = PushButton(FluentIcon.ADD, "添加任务", self)
+        self.multi_button.setToolTip("添加任务")
+        self.multi_button.clicked.connect(self.start_multi_task)
+
+        self.power_combox = ComboBox()
+        self.power_combox.addItem("无动作", userData="NoAction")
+        self.power_combox.addItem("退出软件", userData="KillSelf")
+        self.power_combox.addItem("睡眠", userData="Sleep")
+        self.power_combox.addItem("休眠", userData="Hibernate")
+        self.power_combox.addItem("关机", userData="Shutdown")
+        self.power_combox.setCurrentText("无动作")
+        self.power_combox.currentIndexChanged.connect(self.set_power_sign)
+
+        self.pivotArea = PivotArea(self)
+        self.pivot = self.pivotArea.pivot
+
         self.stackedWidget = QStackedWidget(self)
-        self.Layout = QVBoxLayout(self)
+        self.stackedWidget.setContentsMargins(0, 0, 0, 0)
+        self.stackedWidget.setStyleSheet("background: transparent; border: none;")
 
-        self.script_list: Dict[str, DispatchBox] = {}
+        self.script_list: Dict[str, DispatchCenter.DispatchBox] = {}
 
-        dispatch_box = DispatchBox("主调度台", self)
+        dispatch_box = self.DispatchBox("主调度台", self)
         self.script_list["主调度台"] = dispatch_box
         self.stackedWidget.addWidget(self.script_list["主调度台"])
         self.pivot.addItem(
@@ -77,7 +91,15 @@ class DispatchCenter(QWidget):
             icon=FluentIcon.CAFE,
         )
 
-        self.Layout.addWidget(self.pivot, 0, Qt.AlignHCenter)
+        h_layout = QHBoxLayout()
+        h_layout.addWidget(self.multi_button)
+        h_layout.addWidget(self.pivotArea)
+        h_layout.addWidget(BodyLabel("全部完成后", self))
+        h_layout.addWidget(self.power_combox)
+        h_layout.setContentsMargins(11, 5, 11, 0)
+
+        self.Layout = QVBoxLayout(self)
+        self.Layout.addLayout(h_layout)
         self.Layout.addWidget(self.stackedWidget)
         self.Layout.setContentsMargins(0, 0, 0, 0)
 
@@ -88,9 +110,9 @@ class DispatchCenter(QWidget):
     def add_board(self, task: Task) -> None:
         """添加一个调度台界面"""
 
-        dispatch_box = DispatchBox(task.name, self)
+        dispatch_box = self.DispatchBox(task.name, self)
 
-        dispatch_box.top_bar.button.clicked.connect(
+        dispatch_box.top_bar.main_button.clicked.connect(
             lambda: TaskManager.stop_task(task.name)
         )
 
@@ -124,9 +146,9 @@ class DispatchCenter(QWidget):
         self.script_list["主调度台"].top_bar.Lable.show()
         self.script_list["主调度台"].top_bar.object.hide()
         self.script_list["主调度台"].top_bar.mode.hide()
-        self.script_list["主调度台"].top_bar.button.clicked.disconnect()
-        self.script_list["主调度台"].top_bar.button.setText("中止任务")
-        self.script_list["主调度台"].top_bar.button.clicked.connect(
+        self.script_list["主调度台"].top_bar.main_button.clicked.disconnect()
+        self.script_list["主调度台"].top_bar.main_button.setText("中止任务")
+        self.script_list["主调度台"].top_bar.main_button.clicked.connect(
             lambda: TaskManager.stop_task(task.name)
         )
         task.create_task_list.connect(
@@ -144,277 +166,390 @@ class DispatchCenter(QWidget):
         task.update_log_text.connect(
             self.script_list["主调度台"].info.log_text.text.setText
         )
-        task.accomplish.connect(lambda: self.disconnect_main_board(task.name))
+        task.accomplish.connect(
+            lambda logs: self.disconnect_main_board(task.name, logs)
+        )
 
-    def disconnect_main_board(self, name: str) -> None:
+    def disconnect_main_board(self, name: str, logs: list) -> None:
         """断开主调度台"""
 
         self.script_list["主调度台"].top_bar.Lable.hide()
         self.script_list["主调度台"].top_bar.object.show()
         self.script_list["主调度台"].top_bar.mode.show()
-        self.script_list["主调度台"].top_bar.button.clicked.disconnect()
-        self.script_list["主调度台"].top_bar.button.setText("开始任务")
-        self.script_list["主调度台"].top_bar.button.clicked.connect(
-            self.script_list["主调度台"].top_bar.start_task
-        )
-        self.script_list["主调度台"].info.log_text.text.setText(
-            Config.get_history(name)["History"]
+        self.script_list["主调度台"].top_bar.main_button.clicked.disconnect()
+        self.script_list["主调度台"].top_bar.main_button.setText("开始任务")
+        self.script_list["主调度台"].top_bar.main_button.clicked.connect(
+            self.script_list["主调度台"].top_bar.start_main_task
         )
+        if len(logs) > 0:
+            history = ""
+            for log in logs:
+                history += (
+                    f"任务名称：{log[0]}，{log[1]["History"].replace("\n","\n    ")}\n"
+                )
+            self.script_list["主调度台"].info.log_text.text.setText(history)
+        else:
+            self.script_list["主调度台"].info.log_text.text.setText("没有任务被执行")
 
     def update_top_bar(self):
         """更新顶栏"""
 
-        list = []
-        queue_numb, member_numb = 0, 0
-
-        if (Config.app_path / "config/QueueConfig").exists():
-            for json_file in (Config.app_path / "config/QueueConfig").glob("*.json"):
-                list.append(f"队列 - {json_file.stem}")
-                queue_numb += 1
-
-        if (Config.app_path / "config/MaaConfig").exists():
-            for subdir in (Config.app_path / "config/MaaConfig").iterdir():
-                if subdir.is_dir():
-                    list.append(f"实例 - Maa - {subdir.name}")
-                    member_numb += 1
-
         self.script_list["主调度台"].top_bar.object.clear()
-        self.script_list["主调度台"].top_bar.object.addItems(list)
-        self.script_list["主调度台"].top_bar.mode.clear()
-        self.script_list["主调度台"].top_bar.mode.addItems(["自动代理", "人工排查"])
 
-        if queue_numb == 1:
+        for name, info in Config.queue_dict.items():
+            self.script_list["主调度台"].top_bar.object.addItem(
+                (
+                    "队列"
+                    if info["Config"].get(info["Config"].queueSet_Name) == ""
+                    else f"队列 - {info["Config"].get(info["Config"].queueSet_Name)}"
+                ),
+                userData=name,
+            )
+
+        for name, info in Config.member_dict.items():
+            self.script_list["主调度台"].top_bar.object.addItem(
+                (
+                    f"实例 - {info['Type']}"
+                    if info["Config"].get(info["Config"].MaaSet_Name) == ""
+                    else f"实例 - {info['Type']} - {info["Config"].get(info["Config"].MaaSet_Name)}"
+                ),
+                userData=name,
+            )
+
+        if len(Config.queue_dict) == 1:
             self.script_list["主调度台"].top_bar.object.setCurrentIndex(0)
-        elif member_numb == 1:
-            self.script_list["主调度台"].top_bar.object.setCurrentIndex(queue_numb)
+        elif len(Config.member_dict) == 1:
+            self.script_list["主调度台"].top_bar.object.setCurrentIndex(
+                len(Config.queue_dict)
+            )
         else:
             self.script_list["主调度台"].top_bar.object.setCurrentIndex(-1)
+
+        self.script_list["主调度台"].top_bar.mode.clear()
+        self.script_list["主调度台"].top_bar.mode.addItems(["自动代理", "人工排查"])
         self.script_list["主调度台"].top_bar.mode.setCurrentIndex(0)
 
+    def update_power_sign(self) -> None:
+        """更新电源设置"""
 
-class DispatchBox(QWidget):
+        mode_book = {
+            "NoAction": "无动作",
+            "KillSelf": "退出软件",
+            "Sleep": "睡眠",
+            "Hibernate": "休眠",
+            "Shutdown": "关机",
+        }
+        self.power_combox.currentIndexChanged.disconnect()
+        self.power_combox.setCurrentText(mode_book[Config.power_sign])
+        self.power_combox.currentIndexChanged.connect(self.set_power_sign)
 
-    def __init__(self, name: str, parent=None):
-        super().__init__(parent)
+    def set_power_sign(self) -> None:
+        """设置所有任务完成后动作"""
 
-        self.setObjectName(name)
+        if not Config.running_list:
 
-        layout = QVBoxLayout()
+            self.power_combox.currentIndexChanged.disconnect()
+            self.power_combox.setCurrentText("无动作")
+            self.power_combox.currentIndexChanged.connect(self.set_power_sign)
+            logger.warning("没有正在运行的任务，无法设置任务完成后动作")
+            MainInfoBar.push_info_bar(
+                "warning",
+                "没有正在运行的任务",
+                "无法设置任务完成后动作",
+                5000,
+            )
 
-        scrollArea = ScrollArea()
-        scrollArea.setWidgetResizable(True)
+        else:
 
-        content_widget = QWidget()
-        content_layout = QVBoxLayout(content_widget)
+            Config.set_power_sign(self.power_combox.currentData())
 
-        self.top_bar = self.DispatchTopBar(self, name)
-        self.info = self.DispatchInfoCard(self)
-
-        content_layout.addWidget(self.top_bar)
-        content_layout.addWidget(self.info)
-
-        scrollArea.setWidget(content_widget)
-
-        layout.addWidget(scrollArea)
-
-        self.setLayout(layout)
-
-    class DispatchTopBar(CardWidget):
-
-        def __init__(self, parent=None, name: str = None):
-            super().__init__(parent)
-
-            Layout = QHBoxLayout(self)
-
-            if name == "主调度台":
-
-                self.Lable = SubtitleLabel("", self)
-                self.Lable.hide()
-                self.object = ComboBox()
-                self.object.setPlaceholderText("请选择调度对象")
-                self.mode = ComboBox()
-                self.mode.setPlaceholderText("请选择调度模式")
-
-                self.button = PushButton("开始任务")
-                self.button.clicked.connect(self.start_task)
-
-                Layout.addWidget(self.Lable)
-                Layout.addWidget(self.object)
-                Layout.addWidget(self.mode)
-                Layout.addStretch(1)
-                Layout.addWidget(self.button)
-
-            else:
-
-                self.Lable = SubtitleLabel(name, self)
-                self.button = PushButton("中止任务")
-
-                Layout.addWidget(self.Lable)
-                Layout.addStretch(1)
-                Layout.addWidget(self.button)
-
-        def start_task(self):
-            """开始任务"""
-
-            if self.object.currentIndex() == -1:
-                logger.warning("未选择调度对象")
-                MainInfoBar.push_info_bar(
-                    "warning", "未选择调度对象", "请选择后再开始任务", 5000
-                )
-                return None
-
-            if self.mode.currentIndex() == -1:
-                logger.warning("未选择调度模式")
-                MainInfoBar.push_info_bar(
-                    "warning", "未选择调度模式", "请选择后再开始任务", 5000
-                )
-                return None
-
-            name = self.object.currentText().split(" - ")[-1]
+    def start_multi_task(self) -> None:
+        """开始任务"""
 
+        # 获取所有可用的队列和实例
+        text_list = []
+        data_list = []
+        for name, info in Config.queue_dict.items():
             if name in Config.running_list:
-                logger.warning(f"任务已存在：{name}")
-                MainInfoBar.push_info_bar("warning", "任务已存在", name, 5000)
+                continue
+            text_list.append(
+                "队列"
+                if info["Config"].get(info["Config"].queueSet_Name) == ""
+                else f"队列 - {info["Config"].get(info["Config"].queueSet_Name)}"
+            )
+            data_list.append(name)
+
+        for name, info in Config.member_dict.items():
+            if name in Config.running_list:
+                continue
+            text_list.append(
+                f"实例 - {info['Type']}"
+                if info["Config"].get(info["Config"].MaaSet_Name) == ""
+                else f"实例 - {info['Type']} - {info["Config"].get(info["Config"].MaaSet_Name)}"
+            )
+            data_list.append(name)
+
+        choice = ComboBoxMessageBox(
+            self.window(),
+            "选择一个对象以添加相应多开任务",
+            ["选择调度对象"],
+            [text_list],
+            [data_list],
+        )
+
+        if choice.exec() and choice.input[0].currentIndex() != -1:
+
+            if choice.input[0].currentData() in Config.running_list:
+                logger.warning(f"任务已存在：{choice.input[0].currentData()}")
+                MainInfoBar.push_info_bar(
+                    "warning", "任务已存在", choice.input[0].currentData(), 5000
+                )
                 return None
 
-            if self.object.currentText().split(" - ")[0] == "队列":
+            if "调度队列" in choice.input[0].currentData():
 
-                with (Config.app_path / f"config/QueueConfig/{name}.json").open(
-                    mode="r", encoding="utf-8"
-                ) as f:
-                    info = json.load(f)
+                logger.info(f"用户添加任务：{choice.input[0].currentData()}")
+                TaskManager.add_task(
+                    "自动代理_新调度台",
+                    choice.input[0].currentData(),
+                    Config.queue_dict[choice.input[0].currentData()]["Config"].toDict(),
+                )
 
-                logger.info(f"用户添加任务：{name}")
-                TaskManager.add_task(f"{self.mode.currentText()}_主调度台", name, info)
+            elif "脚本" in choice.input[0].currentData():
 
-            elif self.object.currentText().split(" - ")[0] == "实例":
+                if Config.member_dict[choice.input[0].currentData()]["Type"] == "Maa":
 
-                if self.object.currentText().split(" - ")[1] == "Maa":
-
-                    info = {"Queue": {"Member_1": name}}
-
-                    logger.info(f"用户添加任务：{name}")
+                    logger.info(f"用户添加任务：{choice.input[0].currentData()}")
                     TaskManager.add_task(
-                        f"{self.mode.currentText()}_主调度台", "自定义队列", info
+                        "自动代理_新调度台",
+                        f"自定义队列 - {choice.input[0].currentData()}",
+                        {"Queue": {"Member_1": choice.input[0].currentData()}},
                     )
 
-    class DispatchInfoCard(HeaderCardWidget):
+    class DispatchBox(QWidget):
 
-        def __init__(self, parent=None):
+        def __init__(self, name: str, parent=None):
             super().__init__(parent)
 
-            self.setTitle("调度信息")
+            self.setObjectName(name)
 
-            self.task = self.TaskInfoCard(self)
-            self.user = self.UserInfoCard(self)
-            self.log_text = self.LogCard(self)
+            layout = QVBoxLayout()
 
-            self.viewLayout.addWidget(self.task)
-            self.viewLayout.addWidget(self.user)
-            self.viewLayout.addWidget(self.log_text)
+            scrollArea = ScrollArea()
+            scrollArea.setWidgetResizable(True)
+            scrollArea.setContentsMargins(0, 0, 0, 0)
+            scrollArea.setStyleSheet("background: transparent; border: none;")
 
-            self.viewLayout.setStretch(0, 1)
-            self.viewLayout.setStretch(1, 1)
-            self.viewLayout.setStretch(2, 5)
+            content_widget = QWidget()
+            content_layout = QVBoxLayout(content_widget)
 
-        def update_board(self, task_list: list, user_list: list, log: str):
-            """更新调度信息"""
+            self.top_bar = self.DispatchTopBar(self, name)
+            self.info = self.DispatchInfoCard(self)
 
-            self.task.update_task(task_list)
-            self.user.update_user(user_list)
-            self.log_text.text.setText(log)
+            content_layout.addWidget(self.top_bar)
+            content_layout.addWidget(self.info)
 
-        class TaskInfoCard(HeaderCardWidget):
+            scrollArea.setWidget(content_widget)
+
+            layout.addWidget(scrollArea)
+
+            self.setLayout(layout)
+
+        class DispatchTopBar(CardWidget):
+
+            def __init__(self, parent=None, name: str = None):
+                super().__init__(parent)
+
+                Layout = QHBoxLayout(self)
+
+                if name == "主调度台":
+
+                    self.Lable = SubtitleLabel("", self)
+                    self.Lable.hide()
+                    self.object = ComboBox()
+                    self.object.setPlaceholderText("请选择调度对象")
+                    self.mode = ComboBox()
+                    self.mode.setPlaceholderText("请选择调度模式")
+
+                    self.main_button = PushButton("开始任务")
+                    self.main_button.clicked.connect(self.start_main_task)
+
+                    Layout.addWidget(self.Lable)
+                    Layout.addWidget(self.object)
+                    Layout.addWidget(self.mode)
+                    Layout.addStretch(1)
+                    Layout.addWidget(self.main_button)
+
+                else:
+
+                    self.Lable = SubtitleLabel(name, self)
+                    self.main_button = PushButton("中止任务")
+
+                    Layout.addWidget(self.Lable)
+                    Layout.addStretch(1)
+                    Layout.addWidget(self.main_button)
+
+            def start_main_task(self):
+                """开始任务"""
+
+                if self.object.currentIndex() == -1:
+                    logger.warning("未选择调度对象")
+                    MainInfoBar.push_info_bar(
+                        "warning", "未选择调度对象", "请选择后再开始任务", 5000
+                    )
+                    return None
+
+                if self.mode.currentIndex() == -1:
+                    logger.warning("未选择调度模式")
+                    MainInfoBar.push_info_bar(
+                        "warning", "未选择调度模式", "请选择后再开始任务", 5000
+                    )
+                    return None
+
+                if self.object.currentData() in Config.running_list:
+                    logger.warning(f"任务已存在：{self.object.currentData()}")
+                    MainInfoBar.push_info_bar(
+                        "warning", "任务已存在", self.object.currentData(), 5000
+                    )
+                    return None
+
+                if "调度队列" in self.object.currentData():
+
+                    logger.info(f"用户添加任务：{self.object.currentData()}")
+                    TaskManager.add_task(
+                        f"{self.mode.currentText()}_主调度台",
+                        self.object.currentData(),
+                        Config.queue_dict[self.object.currentData()]["Config"].toDict(),
+                    )
+
+                elif "脚本" in self.object.currentData():
+
+                    if Config.member_dict[self.object.currentData()]["Type"] == "Maa":
+
+                        logger.info(f"用户添加任务：{self.object.currentData()}")
+                        TaskManager.add_task(
+                            f"{self.mode.currentText()}_主调度台",
+                            "自定义队列",
+                            {"Queue": {"Member_1": self.object.currentData()}},
+                        )
+
+        class DispatchInfoCard(HeaderCardWidget):
 
             def __init__(self, parent=None):
                 super().__init__(parent)
-                self.setTitle("任务队列")
 
-                self.Layout = QVBoxLayout()
-                self.viewLayout.addLayout(self.Layout)
-                self.viewLayout.setContentsMargins(3, 0, 3, 3)
+                self.setTitle("调度信息")
 
-                self.task_cards: List[StatefulItemCard] = []
+                self.task = self.TaskInfoCard(self)
+                self.user = self.UserInfoCard(self)
+                self.log_text = self.LogCard(self)
 
-            def create_task(self, task_list: list):
-                """创建任务队列"""
+                self.viewLayout.addWidget(self.task)
+                self.viewLayout.addWidget(self.user)
+                self.viewLayout.addWidget(self.log_text)
 
-                while self.Layout.count() > 0:
-                    item = self.Layout.takeAt(0)
-                    if item.spacerItem():
-                        self.Layout.removeItem(item.spacerItem())
-                    elif item.widget():
-                        item.widget().deleteLater()
+                self.viewLayout.setStretch(0, 1)
+                self.viewLayout.setStretch(1, 1)
+                self.viewLayout.setStretch(2, 5)
 
-                self.task_cards = []
+            def update_board(self, task_list: list, user_list: list, log: str):
+                """更新调度信息"""
 
-                for task in task_list:
+                self.task.update_task(task_list)
+                self.user.update_user(user_list)
+                self.log_text.text.setText(log)
 
-                    self.task_cards.append(StatefulItemCard(task))
-                    self.Layout.addWidget(self.task_cards[-1])
+            class TaskInfoCard(HeaderCardWidget):
 
-                self.Layout.addStretch(1)
+                def __init__(self, parent=None):
+                    super().__init__(parent)
+                    self.setTitle("任务队列")
 
-            def update_task(self, task_list: list):
-                """更新任务队列"""
+                    self.Layout = QVBoxLayout()
+                    self.viewLayout.addLayout(self.Layout)
+                    self.viewLayout.setContentsMargins(3, 0, 3, 3)
 
-                for i in range(len(task_list)):
+                    self.task_cards: List[StatefulItemCard] = []
 
-                    self.task_cards[i].update_status(task_list[i][1])
+                def create_task(self, task_list: list):
+                    """创建任务队列"""
 
-        class UserInfoCard(HeaderCardWidget):
+                    while self.Layout.count() > 0:
+                        item = self.Layout.takeAt(0)
+                        if item.spacerItem():
+                            self.Layout.removeItem(item.spacerItem())
+                        elif item.widget():
+                            item.widget().deleteLater()
 
-            def __init__(self, parent=None):
-                super().__init__(parent)
-                self.setTitle("用户队列")
+                    self.task_cards = []
 
-                self.Layout = QVBoxLayout()
-                self.viewLayout.addLayout(self.Layout)
-                self.viewLayout.setContentsMargins(3, 0, 3, 3)
+                    for task in task_list:
 
-                self.user_cards: List[StatefulItemCard] = []
+                        self.task_cards.append(StatefulItemCard(task))
+                        self.Layout.addWidget(self.task_cards[-1])
 
-            def create_user(self, user_list: list):
-                """创建用户队列"""
+                    self.Layout.addStretch(1)
 
-                while self.Layout.count() > 0:
-                    item = self.Layout.takeAt(0)
-                    if item.spacerItem():
-                        self.Layout.removeItem(item.spacerItem())
-                    elif item.widget():
-                        item.widget().deleteLater()
+                def update_task(self, task_list: list):
+                    """更新任务队列"""
 
-                self.user_cards = []
+                    for i in range(len(task_list)):
 
-                for user in user_list:
+                        self.task_cards[i].update_status(task_list[i][1])
 
-                    self.user_cards.append(StatefulItemCard(user))
-                    self.Layout.addWidget(self.user_cards[-1])
+            class UserInfoCard(HeaderCardWidget):
 
-                self.Layout.addStretch(1)
+                def __init__(self, parent=None):
+                    super().__init__(parent)
+                    self.setTitle("用户队列")
 
-            def update_user(self, user_list: list):
-                """更新用户队列"""
+                    self.Layout = QVBoxLayout()
+                    self.viewLayout.addLayout(self.Layout)
+                    self.viewLayout.setContentsMargins(3, 0, 3, 3)
 
-                for i in range(len(user_list)):
+                    self.user_cards: List[StatefulItemCard] = []
 
-                    self.user_cards[i].Label.setText(user_list[i][0])
-                    self.user_cards[i].update_status(user_list[i][1])
+                def create_user(self, user_list: list):
+                    """创建用户队列"""
 
-        class LogCard(HeaderCardWidget):
+                    while self.Layout.count() > 0:
+                        item = self.Layout.takeAt(0)
+                        if item.spacerItem():
+                            self.Layout.removeItem(item.spacerItem())
+                        elif item.widget():
+                            item.widget().deleteLater()
 
-            def __init__(self, parent=None):
-                super().__init__(parent)
-                self.setTitle("日志")
+                    self.user_cards = []
 
-                self.text = TextBrowser()
-                self.viewLayout.setContentsMargins(3, 0, 3, 3)
-                self.viewLayout.addWidget(self.text)
+                    for user in user_list:
 
-                self.text.textChanged.connect(self.to_end)
+                        self.user_cards.append(StatefulItemCard(user))
+                        self.Layout.addWidget(self.user_cards[-1])
 
-            def to_end(self):
-                """滚动到底部"""
+                    self.Layout.addStretch(1)
 
-                self.text.moveCursor(QTextCursor.End)
-                self.text.ensureCursorVisible()
+                def update_user(self, user_list: list):
+                    """更新用户队列"""
+
+                    for i in range(len(user_list)):
+
+                        self.user_cards[i].Label.setText(user_list[i][0])
+                        self.user_cards[i].update_status(user_list[i][1])
+
+            class LogCard(HeaderCardWidget):
+
+                def __init__(self, parent=None):
+                    super().__init__(parent)
+                    self.setTitle("日志")
+
+                    self.text = TextBrowser()
+                    self.viewLayout.setContentsMargins(3, 0, 3, 3)
+                    self.viewLayout.addWidget(self.text)
+
+                    self.text.textChanged.connect(self.to_end)
+
+                def to_end(self):
+                    """滚动到底部"""
+
+                    self.text.moveCursor(QTextCursor.End)
+                    self.text.ensureCursorVisible()

app/ui/downloader.py

@@ -0,0 +1,591 @@
+#   AUTO_MAA:A MAA Multi Account Management and Automation Tool
+#   Copyright © 2024-2025 DLmaster361
+
+#   This file is part of AUTO_MAA.
+
+#   AUTO_MAA is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published
+#   by the Free Software Foundation, either version 3 of the License,
+#   or (at your option) any later version.
+
+#   AUTO_MAA is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty
+#   of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
+#   the GNU General Public License for more details.
+
+#   You should have received a copy of the GNU General Public License
+#   along with AUTO_MAA. If not, see <https://www.gnu.org/licenses/>.
+
+#   Contact: DLmaster_361@163.com
+
+"""
+AUTO_MAA
+AUTO_MAA更新器
+v4.3
+作者：DLmaster_361
+"""
+
+import zipfile
+import requests
+import subprocess
+import time
+import psutil
+from functools import partial
+from pathlib import Path
+
+from PySide6.QtWidgets import QDialog, QVBoxLayout
+from qfluentwidgets import (
+    ProgressBar,
+    IndeterminateProgressBar,
+    BodyLabel,
+    setTheme,
+    Theme,
+)
+from PySide6.QtGui import QCloseEvent
+from PySide6.QtCore import QThread, Signal, QTimer, QEventLoop
+
+from typing import List, Dict, Union
+
+
+def version_text(version_numb: list) -> str:
+    """将版本号列表转为可读的文本信息"""
+
+    while len(version_numb) < 4:
+        version_numb.append(0)
+
+    if version_numb[3] == 0:
+        version = f"v{'.'.join(str(_) for _ in version_numb[0:3])}"
+    else:
+        version = (
+            f"v{'.'.join(str(_) for _ in version_numb[0:3])}-beta.{version_numb[3]}"
+        )
+    return version
+
+
+class DownloadProcess(QThread):
+    """分段下载子线程"""
+
+    progress = Signal(int)
+    accomplish = Signal(float)
+
+    def __init__(
+        self,
+        url: str,
+        start_byte: int,
+        end_byte: int,
+        download_path: Path,
+        check_times: int = -1,
+    ) -> None:
+        super(DownloadProcess, self).__init__()
+
+        self.url = url
+        self.start_byte = start_byte
+        self.end_byte = end_byte
+        self.download_path = download_path
+        self.check_times = check_times
+
+    def run(self) -> None:
+
+        # 清理可能存在的临时文件
+        if self.download_path.exists():
+            self.download_path.unlink()
+
+        headers = {"Range": f"bytes={self.start_byte}-{self.end_byte}"}
+
+        while not self.isInterruptionRequested() and self.check_times != 0:
+
+            try:
+
+                start_time = time.time()
+
+                response = requests.get(
+                    self.url, headers=headers, timeout=10, stream=True
+                )
+
+                if response.status_code != 206:
+
+                    if self.check_times != -1:
+                        self.check_times -= 1
+
+                    time.sleep(1)
+                    continue
+
+                downloaded_size = 0
+                with self.download_path.open(mode="wb") as f:
+
+                    for chunk in response.iter_content(chunk_size=8192):
+
+                        if self.isInterruptionRequested():
+                            break
+
+                        f.write(chunk)
+                        downloaded_size += len(chunk)
+
+                        self.progress.emit(downloaded_size)
+
+                if self.isInterruptionRequested():
+
+                    if self.download_path.exists():
+                        self.download_path.unlink()
+                    self.accomplish.emit(0)
+
+                else:
+
+                    self.accomplish.emit(time.time() - start_time)
+
+                break
+
+            except Exception as e:
+
+                if self.check_times != -1:
+                    self.check_times -= 1
+                time.sleep(1)
+
+        else:
+
+            if self.download_path.exists():
+                self.download_path.unlink()
+            self.accomplish.emit(0)
+
+
+class ZipExtractProcess(QThread):
+    """解压子线程"""
+
+    info = Signal(str)
+    accomplish = Signal()
+
+    def __init__(self, name: str, app_path: Path, download_path: Path) -> None:
+        super(ZipExtractProcess, self).__init__()
+
+        self.name = name
+        self.app_path = app_path
+        self.download_path = download_path
+
+    def run(self) -> None:
+
+        try:
+
+            while True:
+
+                if self.isInterruptionRequested():
+                    self.download_path.unlink()
+                    return None
+                try:
+                    with zipfile.ZipFile(self.download_path, "r") as zip_ref:
+                        zip_ref.extractall(self.app_path)
+                    self.accomplish.emit()
+                    break
+                except PermissionError:
+                    if self.name == "AUTO_MAA":
+                        self.info.emit(f"解压出错：AUTO_MAA正在运行，正在尝试将其关闭")
+                        self.kill_process(self.app_path / "AUTO_MAA.exe")
+                    else:
+                        self.info.emit(f"解压出错：{self.name}正在运行，正在等待其关闭")
+                    time.sleep(1)
+
+        except Exception as e:
+
+            e = str(e)
+            e = "\n".join([e[_ : _ + 75] for _ in range(0, len(e), 75)])
+            self.info.emit(f"解压更新时出错：\n{e}")
+            return None
+
+    def kill_process(self, path: Path) -> None:
+        """根据路径中止进程"""
+
+        for pid in self.search_pids(path):
+            killprocess = subprocess.Popen(
+                f"taskkill /F /PID {pid}",
+                shell=True,
+                creationflags=subprocess.CREATE_NO_WINDOW,
+            )
+            killprocess.wait()
+
+    def search_pids(self, path: Path) -> list:
+        """根据路径查找进程PID"""
+
+        pids = []
+        for proc in psutil.process_iter(["pid", "exe"]):
+            try:
+                if proc.info["exe"] and proc.info["exe"].lower() == str(path).lower():
+                    pids.append(proc.info["pid"])
+            except (psutil.NoSuchProcess, psutil.AccessDenied, psutil.ZombieProcess):
+                # 进程可能在此期间已结束或无法访问，忽略这些异常
+                pass
+        return pids
+
+
+class DownloadManager(QDialog):
+    """下载管理器"""
+
+    speed_test_accomplish = Signal()
+    download_accomplish = Signal()
+    download_process_clear = Signal()
+
+    isInterruptionRequested = False
+
+    def __init__(self, app_path: Path, name: str, version: list, config: dict) -> None:
+        super().__init__()
+
+        self.app_path = app_path
+        self.name = name
+        self.version = version
+        self.config = config
+        self.download_path = app_path / "DOWNLOAD_TEMP.zip"  #  临时下载文件的路径
+        self.download_process_dict: Dict[str, DownloadProcess] = {}
+        self.timer_dict: Dict[str, QTimer] = {}
+
+        self.resize(700, 70)
+
+        setTheme(Theme.AUTO, lazy=True)
+
+        # 创建垂直布局
+        self.Layout = QVBoxLayout(self)
+
+        self.info = BodyLabel("正在初始化", self)
+        self.progress_1 = IndeterminateProgressBar(self)
+        self.progress_2 = ProgressBar(self)
+
+        self.update_progress(0, 0, 0)
+
+        self.Layout.addWidget(self.info)
+        self.Layout.addStretch(1)
+        self.Layout.addWidget(self.progress_1)
+        self.Layout.addWidget(self.progress_2)
+        self.Layout.addStretch(1)
+
+    def run(self) -> None:
+
+        if self.name == "AUTO_MAA":
+            if self.config["mode"] == "Proxy":
+                self.test_speed_task1()
+                self.speed_test_accomplish.connect(self.download_task1)
+            elif self.config["mode"] == "MirrorChyan":
+                self.download_task1()
+        elif self.config["mode"] == "MirrorChyan":
+            self.download_task1()
+
+    def get_download_url(self, mode: str) -> Union[str, Dict[str, str]]:
+        """获取下载链接"""
+
+        url_dict = {}
+
+        if mode == "测速":
+
+            url_dict["GitHub站"] = (
+                f"https://github.com/DLmaster361/AUTO_MAA/releases/download/{version_text(self.version)}/AUTO_MAA_{version_text(self.version)}.zip"
+            )
+            url_dict["官方镜像站"] = (
+                f"https://gitee.com/DLmaster_361/AUTO_MAA/releases/download/{version_text(self.version)}/AUTO_MAA_{version_text(self.version)}.zip"
+            )
+            for name, download_url_head in self.config["download_dict"].items():
+                url_dict[name] = (
+                    f"{download_url_head}AUTO_MAA_{version_text(self.version)}.zip"
+                )
+            for proxy_url in self.config["proxy_list"]:
+                url_dict[proxy_url] = (
+                    f"{proxy_url}https://github.com/DLmaster361/AUTO_MAA/releases/download/{version_text(self.version)}/AUTO_MAA_{version_text(self.version)}.zip"
+                )
+            return url_dict
+
+        elif mode == "下载":
+
+            if self.name == "AUTO_MAA":
+
+                if self.config["mode"] == "Proxy":
+
+                    if "selected" in self.config:
+                        selected_url = self.config["selected"]
+                    elif "speed_result" in self.config:
+                        selected_url = max(
+                            self.config["speed_result"],
+                            key=self.config["speed_result"].get,
+                        )
+
+                    if selected_url == "GitHub站":
+                        return f"https://github.com/DLmaster361/AUTO_MAA/releases/download/{version_text(self.version)}/AUTO_MAA_{version_text(self.version)}.zip"
+                    elif selected_url == "官方镜像站":
+                        return f"https://gitee.com/DLmaster_361/AUTO_MAA/releases/download/{version_text(self.version)}/AUTO_MAA_{version_text(self.version)}.zip"
+                    elif selected_url in self.config["download_dict"].keys():
+                        return f"{self.config["download_dict"][selected_url]}AUTO_MAA_{version_text(self.version)}.zip"
+                    else:
+                        return f"{selected_url}https://github.com/DLmaster361/AUTO_MAA/releases/download/{version_text(self.version)}/AUTO_MAA_{version_text(self.version)}.zip"
+
+                elif self.config["mode"] == "MirrorChyan":
+
+                    with requests.get(
+                        self.config["url"],
+                        allow_redirects=True,
+                        timeout=10,
+                        stream=True,
+                    ) as response:
+                        if response.status_code == 200:
+                            return response.url
+
+            elif self.config["mode"] == "MirrorChyan":
+
+                with requests.get(
+                    self.config["url"], allow_redirects=True, timeout=10, stream=True
+                ) as response:
+                    if response.status_code == 200:
+                        return response.url
+
+    def test_speed_task1(self) -> None:
+
+        if self.isInterruptionRequested:
+            return None
+
+        url_dict = self.get_download_url("测速")
+        self.test_speed_result: Dict[str, float] = {}
+
+        for name, url in url_dict.items():
+
+            if self.isInterruptionRequested:
+                break
+
+            # 创建测速线程，下载4MB文件以测试下载速度
+            self.download_process_dict[name] = DownloadProcess(
+                url,
+                0,
+                4194304,
+                self.app_path / f"{name.replace('/','').replace(':','')}.zip",
+                10,
+            )
+            self.test_speed_result[name] = -1
+            self.download_process_dict[name].accomplish.connect(
+                partial(self.test_speed_task2, name)
+            )
+
+            self.download_process_dict[name].start()
+            timer = QTimer(self)
+            timer.setSingleShot(True)
+            timer.timeout.connect(partial(self.kill_speed_test, name))
+            timer.start(30000)
+            self.timer_dict[name] = timer
+
+        self.update_info("正在测速，预计用时30秒")
+        self.update_progress(0, 1, 0)
+
+    def kill_speed_test(self, name: str) -> None:
+
+        if name in self.download_process_dict:
+            self.download_process_dict[name].requestInterruption()
+
+    def test_speed_task2(self, name: str, t: float) -> None:
+
+        # 计算下载速度
+        if self.isInterruptionRequested:
+            self.update_info(f"已中止测速进程：{name}")
+            self.test_speed_result[name] = 0
+        elif t != 0:
+            self.update_info(f"{name}：{ 4 / t:.2f} MB/s")
+            self.test_speed_result[name] = 4 / t
+        else:
+            self.update_info(f"{name}：{ 0:.2f} MB/s")
+            self.test_speed_result[name] = 0
+        self.update_progress(
+            0,
+            len(self.test_speed_result),
+            sum(1 for speed in self.test_speed_result.values() if speed != -1),
+        )
+
+        # 删除临时文件
+        if (self.app_path / f"{name.replace('/','').replace(':','')}.zip").exists():
+            (self.app_path / f"{name.replace('/','').replace(':','')}.zip").unlink()
+
+        # 清理下载线程
+        self.timer_dict[name].stop()
+        self.timer_dict[name].deleteLater()
+        self.timer_dict.pop(name)
+        self.download_process_dict[name].requestInterruption()
+        self.download_process_dict[name].quit()
+        self.download_process_dict[name].wait()
+        self.download_process_dict[name].deleteLater()
+        self.download_process_dict.pop(name)
+        if not self.download_process_dict:
+            self.download_process_clear.emit()
+
+        if any(speed == -1 for _, speed in self.test_speed_result.items()):
+            return None
+
+        # 保存测速结果
+        self.config["speed_result"] = self.test_speed_result
+
+        self.update_info("测速完成！")
+        self.speed_test_accomplish.emit()
+
+    def download_task1(self) -> None:
+
+        if self.isInterruptionRequested:
+            return None
+
+        url = self.get_download_url("下载")
+        self.downloaded_size_list: List[List[int, bool]] = []
+
+        response = requests.head(url, timeout=10)
+
+        self.file_size = int(response.headers.get("content-length", 0))
+        part_size = self.file_size // self.config["thread_numb"]
+        self.downloaded_size = 0
+        self.last_download_size = 0
+        self.last_time = time.time()
+        self.speed = 0
+
+        # 拆分下载任务，启用多线程下载
+        for i in range(self.config["thread_numb"]):
+
+            if self.isInterruptionRequested:
+                break
+
+            # 计算单任务下载范围
+            start_byte = i * part_size
+            end_byte = (
+                (i + 1) * part_size - 1
+                if (i != self.config["thread_numb"] - 1)
+                else self.file_size - 1
+            )
+
+            # 创建下载子线程
+            self.download_process_dict[f"part{i}"] = DownloadProcess(
+                url,
+                start_byte,
+                end_byte,
+                self.download_path.with_suffix(f".part{i}"),
+                1 if self.config["mode"] == "MirrorChyan" else -1,
+            )
+            self.downloaded_size_list.append([0, False])
+            self.download_process_dict[f"part{i}"].progress.connect(
+                partial(self.download_task2, i)
+            )
+            self.download_process_dict[f"part{i}"].accomplish.connect(
+                partial(self.download_task3, i)
+            )
+            self.download_process_dict[f"part{i}"].start()
+
+    def download_task2(self, index: str, current: int) -> None:
+        """更新下载进度"""
+
+        self.downloaded_size_list[index][0] = current
+        self.downloaded_size = sum([_[0] for _ in self.downloaded_size_list])
+        self.update_progress(0, self.file_size, self.downloaded_size)
+
+        if time.time() - self.last_time >= 1.0:
+            self.speed = (
+                (self.downloaded_size - self.last_download_size)
+                / (time.time() - self.last_time)
+                / 1024
+            )
+            self.last_download_size = self.downloaded_size
+            self.last_time = time.time()
+
+        if self.speed >= 1024:
+            self.update_info(
+                f"正在下载：{self.name} 已下载：{self.downloaded_size / 1048576:.2f}/{self.file_size / 1048576:.2f} MB （{self.downloaded_size / self.file_size * 100:.2f}%） 下载速度：{self.speed / 1024:.2f} MB/s",
+            )
+        else:
+            self.update_info(
+                f"正在下载：{self.name} 已下载：{self.downloaded_size / 1048576:.2f}/{self.file_size / 1048576:.2f} MB （{self.downloaded_size / self.file_size * 100:.2f}%） 下载速度：{self.speed:.2f} KB/s",
+            )
+
+    def download_task3(self, index: str, t: float) -> None:
+
+        # 标记下载线程完成
+        self.downloaded_size_list[index][1] = True
+
+        # 清理下载线程
+        self.download_process_dict[f"part{index}"].requestInterruption()
+        self.download_process_dict[f"part{index}"].quit()
+        self.download_process_dict[f"part{index}"].wait()
+        self.download_process_dict[f"part{index}"].deleteLater()
+        self.download_process_dict.pop(f"part{index}")
+        if not self.download_process_dict:
+            self.download_process_clear.emit()
+
+        if (
+            any([not _[1] for _ in self.downloaded_size_list])
+            or self.isInterruptionRequested
+        ):
+            return None
+
+        # 合并下载的分段文件
+        with self.download_path.open(mode="wb") as outfile:
+            for i in range(self.config["thread_numb"]):
+                with self.download_path.with_suffix(f".part{i}").open(
+                    mode="rb"
+                ) as infile:
+                    outfile.write(infile.read())
+                self.download_path.with_suffix(f".part{i}").unlink()
+
+        self.update_info("正在解压更新文件")
+        self.update_progress(0, 0, 0)
+
+        # 创建解压线程
+        self.zip_extract = ZipExtractProcess(
+            self.name, self.app_path, self.download_path
+        )
+        self.zip_loop = QEventLoop()
+        self.zip_extract.info.connect(self.update_info)
+        self.zip_extract.accomplish.connect(self.zip_loop.quit)
+        self.zip_extract.start()
+        self.zip_loop.exec()
+
+        self.update_info("正在删除临时文件")
+        self.update_progress(0, 0, 0)
+        if (self.app_path / "changes.json").exists():
+            (self.app_path / "changes.json").unlink()
+        if self.download_path.exists():
+            self.download_path.unlink()
+
+        # 下载完成后打开对应程序
+        if not self.isInterruptionRequested and self.name == "MAA":
+            subprocess.Popen(
+                [self.app_path / "MAA.exe"],
+                creationflags=subprocess.CREATE_NEW_PROCESS_GROUP
+                | subprocess.DETACHED_PROCESS
+                | subprocess.CREATE_NO_WINDOW,
+            )
+        if self.name == "AUTO_MAA":
+            self.update_info(f"即将安装{self.name}")
+        else:
+            self.update_info(f"{self.name}下载成功！")
+        self.update_progress(0, 100, 100)
+        self.download_accomplish.emit()
+
+    def update_info(self, text: str) -> None:
+        self.info.setText(text)
+
+    def update_progress(self, begin: int, end: int, current: int) -> None:
+
+        if begin == 0 and end == 0:
+            self.progress_2.setVisible(False)
+            self.progress_1.setVisible(True)
+        else:
+            self.progress_1.setVisible(False)
+            self.progress_2.setVisible(True)
+            self.progress_2.setRange(begin, end)
+            self.progress_2.setValue(current)
+
+    def requestInterruption(self) -> None:
+
+        self.isInterruptionRequested = True
+
+        if hasattr(self, "zip_extract") and self.zip_extract:
+            self.zip_extract.requestInterruption()
+
+        if hasattr(self, "zip_loop") and self.zip_loop:
+            self.zip_loop.quit()
+
+        for process in self.download_process_dict.values():
+            process.requestInterruption()
+
+        if self.download_process_dict:
+            loop = QEventLoop()
+            self.download_process_clear.connect(loop.quit)
+            loop.exec()
+
+    def closeEvent(self, event: QCloseEvent):
+        """清理残余进程"""
+
+        self.requestInterruption()
+
+        event.accept()

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,12 +16,12 @@
 #   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
 AUTO_MAA历史记录界面
-v4.2
+v4.3
 作者：DLmaster_361
 """
 
@@ -36,18 +36,23 @@ from qfluentwidgets import (
     FluentIcon,
     HeaderCardWidget,
     PushButton,
-    ExpandGroupSettingCard,
     TextBrowser,
+    CardWidget,
+    ComboBox,
+    ZhDatePicker,
+    SubtitleLabel,
 )
-from PySide6.QtCore import Signal
+from PySide6.QtCore import Signal, QDate
 import os
+import subprocess
+from datetime import datetime, timedelta
 from functools import partial
 from pathlib import Path
-from typing import List
+from typing import Union, List, Dict
 
 
 from app.core import Config
-from .Widget import StatefulItemCard, QuantifiedItemCard
+from .Widget import StatefulItemCard, QuantifiedItemCard, QuickExpandGroupCard
 
 
 class History(QWidget):
@@ -58,20 +63,24 @@ class History(QWidget):
 
         content_widget = QWidget()
         self.content_layout = QVBoxLayout(content_widget)
+        self.history_top_bar = self.HistoryTopBar(self)
+
+        self.history_top_bar.search_history.connect(self.reload_history)
 
         scrollArea = ScrollArea()
         scrollArea.setWidgetResizable(True)
+        scrollArea.setContentsMargins(0, 0, 0, 0)
+        scrollArea.setStyleSheet("background: transparent; border: none;")
         scrollArea.setWidget(content_widget)
         layout = QVBoxLayout()
+        layout.addWidget(self.history_top_bar)
         layout.addWidget(scrollArea)
         self.setLayout(layout)
 
         self.history_card_list = []
 
-        self.refresh()
-
-    def refresh(self):
-        """刷新脚本实例界面"""
+    def reload_history(self, mode: str, start_date: QDate, end_date: QDate) -> None:
+        """加载历史记录界面"""
 
         while self.content_layout.count() > 0:
             item = self.content_layout.takeAt(0)
@@ -82,177 +91,300 @@ class History(QWidget):
 
         self.history_card_list = []
 
-        history_dict = Config.search_history()
+        history_dict = Config.search_history(
+            mode,
+            datetime(start_date.year(), start_date.month(), start_date.day()),
+            datetime(end_date.year(), end_date.month(), end_date.day()),
+        )
 
-        for date, user_list in history_dict.items():
+        for date, user in history_dict.items():
 
-            self.history_card_list.append(HistoryCard(date, user_list, self))
+            self.history_card_list.append(self.HistoryCard(mode, date, user, self))
             self.content_layout.addWidget(self.history_card_list[-1])
 
         self.content_layout.addStretch(1)
 
+    class HistoryTopBar(CardWidget):
+        """历史记录顶部工具栏"""
 
-class HistoryCard(ExpandGroupSettingCard):
+        search_history = Signal(str, QDate, QDate)
 
-    def __init__(self, date: str, user_list: List[Path], parent=None):
-        super().__init__(
-            FluentIcon.HISTORY, date, f"{date}的历史运行记录与统计信息", parent
-        )
+        def __init__(self, parent=None):
+            super().__init__(parent)
 
-        widget = QWidget()
-        Layout = QVBoxLayout(widget)
-        self.viewLayout.setContentsMargins(0, 0, 0, 0)
-        self.viewLayout.setSpacing(0)
-        self.addGroupWidget(widget)
+            Layout = QHBoxLayout(self)
 
-        self.user_history_card_list = []
+            self.lable_1 = SubtitleLabel("查询范围：")
+            self.start_date = ZhDatePicker()
+            self.start_date.setDate(QDate(2019, 5, 1))
+            self.lable_2 = SubtitleLabel("→")
+            self.end_date = ZhDatePicker()
+            server_date = Config.server_date()
+            self.end_date.setDate(
+                QDate(server_date.year, server_date.month, server_date.day)
+            )
+            self.mode = ComboBox()
+            self.mode.setPlaceholderText("请选择查询模式")
+            self.mode.addItems(["按日合并", "按周合并", "按月合并"])
 
-        for user_path in user_list:
+            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.mode.currentText(),
+                    self.start_date.getDate(),
+                    self.end_date.getDate(),
+                )
+            )
 
-            self.user_history_card_list.append(self.UserHistoryCard(user_path, self))
-            Layout.addWidget(self.user_history_card_list[-1])
+            Layout.addWidget(self.lable_1)
+            Layout.addWidget(self.start_date)
+            Layout.addWidget(self.lable_2)
+            Layout.addWidget(self.end_date)
+            Layout.addWidget(self.mode)
+            Layout.addStretch(1)
+            Layout.addWidget(self.select_month)
+            Layout.addWidget(self.select_week)
+            Layout.addWidget(self.search)
 
-    class UserHistoryCard(HeaderCardWidget):
+        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)
+            )
+
+            self.search.clicked.emit()
+
+    class HistoryCard(QuickExpandGroupCard):
 
         def __init__(
             self,
-            user_history_path: Path,
+            mode: str,
+            date: str,
+            user: Union[List[Path], Dict[str, List[Path]]],
             parent=None,
         ):
-            super().__init__(parent)
+            super().__init__(
+                FluentIcon.HISTORY, date, f"{date}的历史运行记录与统计信息", parent
+            )
 
-            self.setTitle(user_history_path.name.replace(".json", ""))
-
-            self.user_history_path = user_history_path
-            self.main_history = Config.load_maa_logs("总览", user_history_path)
-
-            self.index_card = self.IndexCard(self.main_history["条目索引"], self)
-            self.statistics_card = QHBoxLayout()
-            self.log_card = self.LogCard(self)
-
-            self.index_card.index_changed.connect(self.update_info)
-
-            self.viewLayout.addWidget(self.index_card)
-            self.viewLayout.addLayout(self.statistics_card)
-            self.viewLayout.addWidget(self.log_card)
+            widget = QWidget()
+            Layout = QVBoxLayout(widget)
             self.viewLayout.setContentsMargins(0, 0, 0, 0)
             self.viewLayout.setSpacing(0)
-            self.viewLayout.setStretch(0, 1)
-            self.viewLayout.setStretch(2, 4)
+            self.addGroupWidget(widget)
 
-            self.update_info("数据总览")
+            self.user_history_card_list = []
 
-        def update_info(self, index: str) -> None:
-            """更新信息"""
+            if mode == "按日合并":
 
-            if index == "数据总览":
-
-                while self.statistics_card.count() > 0:
-                    item = self.statistics_card.takeAt(0)
-                    if item.spacerItem():
-                        self.statistics_card.removeItem(item.spacerItem())
-                    elif item.widget():
-                        item.widget().deleteLater()
-
-                for name, item_list in self.main_history["统计数据"].items():
-
-                    statistics_card = self.StatisticsCard(name, item_list, self)
-                    self.statistics_card.addWidget(statistics_card)
-
-                self.log_card.hide()
-
-            else:
-
-                single_history = Config.load_maa_logs(
-                    "单项",
-                    self.user_history_path.with_suffix("")
-                    / f"{index.replace(":","-")}.json",
-                )
-
-                while self.statistics_card.count() > 0:
-                    item = self.statistics_card.takeAt(0)
-                    if item.spacerItem():
-                        self.statistics_card.removeItem(item.spacerItem())
-                    elif item.widget():
-                        item.widget().deleteLater()
-
-                for name, item_list in single_history["统计数据"].items():
-
-                    statistics_card = self.StatisticsCard(name, item_list, self)
-                    self.statistics_card.addWidget(statistics_card)
-
-                self.log_card.text.setText(single_history["日志信息"])
-                self.log_card.button.clicked.disconnect()
-                self.log_card.button.clicked.connect(
-                    lambda: os.startfile(
-                        self.user_history_path.with_suffix("")
-                        / f"{index.replace(":","-")}.log"
+                for user_path in user:
+                    self.user_history_card_list.append(
+                        self.UserHistoryCard(mode, user_path.stem, user_path, self)
                     )
-                )
-                self.log_card.show()
+                    Layout.addWidget(self.user_history_card_list[-1])
 
-            self.viewLayout.setStretch(1, self.statistics_card.count())
+            elif mode in ["按周合并", "按月合并"]:
 
-            self.setMinimumHeight(300)
-
-        class IndexCard(HeaderCardWidget):
-
-            index_changed = Signal(str)
-
-            def __init__(self, index_list: list, parent=None):
-                super().__init__(parent)
-                self.setTitle("记录条目")
-
-                self.Layout = QVBoxLayout()
-                self.viewLayout.addLayout(self.Layout)
-                self.viewLayout.setContentsMargins(3, 0, 3, 3)
-
-                self.index_cards: List[StatefulItemCard] = []
-
-                for index in index_list:
-
-                    self.index_cards.append(StatefulItemCard(index))
-                    self.index_cards[-1].clicked.connect(
-                        partial(self.index_changed.emit, index[0])
+                for user, info in user.items():
+                    self.user_history_card_list.append(
+                        self.UserHistoryCard(mode, user, info, self)
                     )
-                    self.Layout.addWidget(self.index_cards[-1])
+                    Layout.addWidget(self.user_history_card_list[-1])
 
-                self.Layout.addStretch(1)
+        class UserHistoryCard(HeaderCardWidget):
+            """用户历史记录卡片"""
 
-        class StatisticsCard(HeaderCardWidget):
-
-            def __init__(self, name: str, item_list: list, parent=None):
+            def __init__(
+                self,
+                mode: str,
+                name: str,
+                user_history: Union[Path, List[Path]],
+                parent=None,
+            ):
                 super().__init__(parent)
+
                 self.setTitle(name)
 
-                self.Layout = QVBoxLayout()
-                self.viewLayout.addLayout(self.Layout)
-                self.viewLayout.setContentsMargins(3, 0, 3, 3)
+                if mode == "按日合并":
 
-                self.item_cards: List[QuantifiedItemCard] = []
+                    self.user_history_path = user_history
+                    self.main_history = Config.load_maa_logs("总览", user_history)
 
-                for item in item_list:
+                    self.index_card = self.IndexCard(
+                        self.main_history["条目索引"], self
+                    )
+                    self.index_card.index_changed.connect(self.update_info)
+                    self.viewLayout.addWidget(self.index_card)
 
-                    self.item_cards.append(QuantifiedItemCard(item))
-                    self.Layout.addWidget(self.item_cards[-1])
+                elif mode in ["按周合并", "按月合并"]:
 
-                if len(item_list) == 0:
-                    self.Layout.addWidget(QuantifiedItemCard(["暂无记录", ""]))
+                    history = Config.merge_maa_logs("指定项", user_history)
 
-                self.Layout.addStretch(1)
+                    self.main_history = {}
+                    self.main_history["统计数据"] = {
+                        "公招统计": list(history["recruit_statistics"].items())
+                    }
 
-        class LogCard(HeaderCardWidget):
+                    for game_id, drops in history["drop_statistics"].items():
+                        self.main_history["统计数据"][f"掉落统计：{game_id}"] = list(
+                            drops.items()
+                        )
 
-            def __init__(self, parent=None):
-                super().__init__(parent)
-                self.setTitle("日志")
+                self.statistics_card = QHBoxLayout()
+                self.log_card = self.LogCard(self)
 
-                self.text = TextBrowser(self)
-                self.button = PushButton("打开日志文件", self)
-                self.button.clicked.connect(lambda: print("打开日志文件"))
+                self.viewLayout.addLayout(self.statistics_card)
+                self.viewLayout.addWidget(self.log_card)
+                self.viewLayout.setContentsMargins(0, 0, 0, 0)
+                self.viewLayout.setSpacing(0)
+                self.viewLayout.setStretch(0, 1)
+                self.viewLayout.setStretch(2, 4)
 
-                Layout = QVBoxLayout()
-                Layout.addWidget(self.text)
-                Layout.addWidget(self.button)
-                self.viewLayout.setContentsMargins(3, 0, 3, 3)
-                self.viewLayout.addLayout(Layout)
+                self.update_info("数据总览")
+
+            def update_info(self, index: str) -> None:
+                """更新信息"""
+
+                if index == "数据总览":
+
+                    while self.statistics_card.count() > 0:
+                        item = self.statistics_card.takeAt(0)
+                        if item.spacerItem():
+                            self.statistics_card.removeItem(item.spacerItem())
+                        elif item.widget():
+                            item.widget().deleteLater()
+
+                    for name, item_list in self.main_history["统计数据"].items():
+
+                        statistics_card = self.StatisticsCard(name, item_list, self)
+                        self.statistics_card.addWidget(statistics_card)
+
+                    self.log_card.hide()
+
+                else:
+
+                    single_history = Config.load_maa_logs(
+                        "单项",
+                        self.user_history_path.with_suffix("")
+                        / f"{index.replace(":","-")}.json",
+                    )
+
+                    while self.statistics_card.count() > 0:
+                        item = self.statistics_card.takeAt(0)
+                        if item.spacerItem():
+                            self.statistics_card.removeItem(item.spacerItem())
+                        elif item.widget():
+                            item.widget().deleteLater()
+
+                    for name, item_list in single_history["统计数据"].items():
+
+                        statistics_card = self.StatisticsCard(name, item_list, self)
+                        self.statistics_card.addWidget(statistics_card)
+
+                    self.log_card.text.setText(single_history["日志信息"])
+                    self.log_card.open_file.clicked.disconnect()
+                    self.log_card.open_file.clicked.connect(
+                        lambda: os.startfile(
+                            self.user_history_path.with_suffix("")
+                            / f"{index.replace(":","-")}.log"
+                        )
+                    )
+                    self.log_card.open_dir.clicked.disconnect()
+                    self.log_card.open_dir.clicked.connect(
+                        lambda: subprocess.Popen(
+                            [
+                                "explorer",
+                                "/select,",
+                                str(
+                                    self.user_history_path.with_suffix("")
+                                    / f"{index.replace(":","-")}.log"
+                                ),
+                            ]
+                        )
+                    )
+                    self.log_card.show()
+
+                self.viewLayout.setStretch(1, self.statistics_card.count())
+
+                self.setMinimumHeight(300)
+
+            class IndexCard(HeaderCardWidget):
+
+                index_changed = Signal(str)
+
+                def __init__(self, index_list: list, parent=None):
+                    super().__init__(parent)
+                    self.setTitle("记录条目")
+
+                    self.Layout = QVBoxLayout()
+                    self.viewLayout.addLayout(self.Layout)
+                    self.viewLayout.setContentsMargins(3, 0, 3, 3)
+
+                    self.index_cards: List[StatefulItemCard] = []
+
+                    for index in index_list:
+
+                        self.index_cards.append(StatefulItemCard(index))
+                        self.index_cards[-1].clicked.connect(
+                            partial(self.index_changed.emit, index[0])
+                        )
+                        self.Layout.addWidget(self.index_cards[-1])
+
+                    self.Layout.addStretch(1)
+
+            class StatisticsCard(HeaderCardWidget):
+
+                def __init__(self, name: str, item_list: list, parent=None):
+                    super().__init__(parent)
+                    self.setTitle(name)
+
+                    self.Layout = QVBoxLayout()
+                    self.viewLayout.addLayout(self.Layout)
+                    self.viewLayout.setContentsMargins(3, 0, 3, 3)
+
+                    self.item_cards: List[QuantifiedItemCard] = []
+
+                    for item in item_list:
+
+                        self.item_cards.append(QuantifiedItemCard(item))
+                        self.Layout.addWidget(self.item_cards[-1])
+
+                    if len(item_list) == 0:
+                        self.Layout.addWidget(QuantifiedItemCard(["暂无记录", ""]))
+
+                    self.Layout.addStretch(1)
+
+            class LogCard(HeaderCardWidget):
+
+                def __init__(self, parent=None):
+                    super().__init__(parent)
+                    self.setTitle("日志")
+
+                    self.text = TextBrowser(self)
+                    self.open_file = PushButton("打开日志文件", self)
+                    self.open_file.clicked.connect(lambda: print("打开日志文件"))
+                    self.open_dir = PushButton("打开所在目录", self)
+                    self.open_dir.clicked.connect(lambda: print("打开所在文件"))
+
+                    Layout = QVBoxLayout()
+                    h_layout = QHBoxLayout()
+                    h_layout.addWidget(self.open_file)
+                    h_layout.addWidget(self.open_dir)
+                    Layout.addWidget(self.text)
+                    Layout.addLayout(h_layout)
+                    self.viewLayout.setContentsMargins(3, 0, 3, 3)
+                    self.viewLayout.addLayout(Layout)

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,12 +16,12 @@
 #   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
 AUTO_MAA主界面
-v4.2
+v4.3
 作者：DLmaster_361
 """
 
@@ -45,13 +45,11 @@ from qfluentwidgets import (
 )
 import re
 import shutil
-import requests
 import json
-import time
 from datetime import datetime
 from pathlib import Path
 
-from app.core import Config, MainInfoBar
+from app.core import Config, MainInfoBar, Network
 from .Widget import Banner, IconButton
 
 
@@ -151,6 +149,8 @@ class Home(QWidget):
         layout = QVBoxLayout()
         scrollArea = ScrollArea()
         scrollArea.setWidgetResizable(True)
+        scrollArea.setContentsMargins(0, 0, 0, 0)
+        scrollArea.setStyleSheet("background: transparent; border: none;")
         scrollArea.setWidget(widget)
         layout.addWidget(scrollArea)
         self.setLayout(layout)
@@ -160,15 +160,9 @@ class Home(QWidget):
     def get_home_image(self) -> None:
         """获取主页图片"""
 
-        if (
-            Config.global_config.get(Config.global_config.function_HomeImageMode)
-            == "默认"
-        ):
+        if Config.get(Config.function_HomeImageMode) == "默认":
             pass
-        elif (
-            Config.global_config.get(Config.global_config.function_HomeImageMode)
-            == "自定义"
-        ):
+        elif Config.get(Config.function_HomeImageMode) == "自定义":
 
             file_path, _ = QFileDialog.getOpenFileName(
                 self, "打开自定义主页图片", "", "图片文件 (*.png *.jpg *.bmp)"
@@ -202,29 +196,24 @@ class Home(QWidget):
                     "未选择图片文件！",
                     5000,
                 )
-        elif (
-            Config.global_config.get(Config.global_config.function_HomeImageMode)
-            == "主题图像"
-        ):
+        elif Config.get(Config.function_HomeImageMode) == "主题图像":
 
             # 从远程服务器获取最新主题图像
-            for _ in range(3):
-                try:
-                    response = requests.get(
-                        "https://gitee.com/DLmaster_361/AUTO_MAA/raw/server/theme_image.json"
-                    )
-                    theme_image = response.json()
-                    break
-                except Exception as e:
-                    err = e
-                    time.sleep(0.1)
+            Network.set_info(
+                mode="get",
+                url="https://gitee.com/DLmaster_361/AUTO_MAA/raw/server/theme_image.json",
+            )
+            Network.start()
+            Network.loop.exec()
+            if Network.stutus_code == 200:
+                theme_image = Network.response_json
             else:
-                logger.error(f"获取最新主题图像时出错：\n{err}")
+                logger.warning(f"获取最新主题图像时出错：{Network.error_message}")
                 MainInfoBar.push_info_bar(
-                    "error",
-                    "主题图像获取失败",
-                    f"获取最新主题图像信息时出错：\n{err}",
-                    -1,
+                    "warning",
+                    "获取最新主题图像时出错",
+                    f"网络错误：{Network.stutus_code}",
+                    5000,
                 )
                 return None
 
@@ -244,19 +233,25 @@ class Home(QWidget):
             ).exists() or (
                 datetime.now()
                 > datetime.strptime(theme_image["time"], "%Y-%m-%d %H:%M")
-                and datetime.strptime(theme_image["time"], "%Y-%m-%d %H:%M")
                 > time_local
             ):
 
-                response = requests.get(theme_image["url"])
-                if response.status_code == 200:
+                Network.set_info(
+                    mode="get_file",
+                    url=theme_image["url"],
+                    path=Config.app_path / "resources/images/Home/BannerTheme.jpg",
+                )
+                Network.start()
+                Network.loop.exec()
 
-                    with open(
-                        Config.app_path / "resources/images/Home/BannerTheme.jpg", "wb"
-                    ) as file:
-                        file.write(response.content)
+                if Network.stutus_code == 200:
 
-                    logger.info(f"主题图像「{theme_image["name"]}」下载成功")
+                    with (Config.app_path / "resources/theme_image.json").open(
+                        mode="w", encoding="utf-8"
+                    ) as f:
+                        json.dump(theme_image, f, ensure_ascii=False, indent=4)
+
+                    logger.success(f"主题图像「{theme_image["name"]}」下载成功")
                     MainInfoBar.push_info_bar(
                         "success",
                         "主题图像下载成功",
@@ -266,19 +261,14 @@ class Home(QWidget):
 
                 else:
 
-                    logger.error("主题图像下载失败")
+                    logger.warning(f"下载最新主题图像时出错：{Network.error_message}")
                     MainInfoBar.push_info_bar(
-                        "error",
-                        "主题图像下载失败",
-                        f"主题图像下载失败：{response.status_code}",
-                        -1,
+                        "warning",
+                        "下载最新主题图像时出错",
+                        f"网络错误：{Network.stutus_code}",
+                        5000,
                     )
 
-                with (Config.app_path / "resources/theme_image.json").open(
-                    mode="w", encoding="utf-8"
-                ) as f:
-                    json.dump(theme_image, f, ensure_ascii=False, indent=4)
-
             else:
 
                 logger.info("主题图像已是最新")
@@ -293,28 +283,19 @@ class Home(QWidget):
 
     def set_banner(self):
         """设置主页图像"""
-        if (
-            Config.global_config.get(Config.global_config.function_HomeImageMode)
-            == "默认"
-        ):
+        if Config.get(Config.function_HomeImageMode) == "默认":
             self.banner.set_banner_image(
                 str(Config.app_path / "resources/images/Home/BannerDefault.png")
             )
             self.imageButton.hide()
             self.banner_text.setVisible(False)
-        elif (
-            Config.global_config.get(Config.global_config.function_HomeImageMode)
-            == "自定义"
-        ):
+        elif Config.get(Config.function_HomeImageMode) == "自定义":
             for file in Config.app_path.glob("resources/images/Home/BannerCustomize.*"):
                 self.banner.set_banner_image(str(file))
                 break
             self.imageButton.show()
             self.banner_text.setVisible(False)
-        elif (
-            Config.global_config.get(Config.global_config.function_HomeImageMode)
-            == "主题图像"
-        ):
+        elif Config.get(Config.function_HomeImageMode) == "主题图像":
             self.banner.set_banner_image(
                 str(Config.app_path / "resources/images/Home/BannerTheme.jpg")
             )
@@ -388,11 +369,11 @@ class ButtonGroup(SimpleCardWidget):
         doc_button.clicked.connect(self.open_chat)
         layout.addWidget(doc_button)
 
-        # 创建 官方店铺 按钮 (当然没有)
+        # 创建 MirrorChyan 按钮
         doc_button = IconButton(
             FluentIcon.SHOPPING_CART.icon(color=QColor("#fff")),
-            tip_title="官方店铺",
-            tip_content="暂时没有官方店铺，但是可以加入官方群聊哦~",
+            tip_title="非官方店铺",
+            tip_content="获取 MirrorChyan CDK，更新快人一步",
             isTooltip=True,
         )
         doc_button.setIconSize(QSize(32, 32))
@@ -419,5 +400,5 @@ class ButtonGroup(SimpleCardWidget):
         QDesktopServices.openUrl(QUrl("https://clozya.github.io/AUTOMAA_docs"))
 
     def open_sales(self):
-        """其实还是打开 Q群 链接"""
-        QDesktopServices.openUrl(QUrl("https://qm.qq.com/q/bd9fISNoME"))
+        """打开 MirrorChyan 链接"""
+        QDesktopServices.openUrl(QUrl("https://mirrorchyan.com/"))

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,38 +16,34 @@
 #   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
 AUTO_MAA主界面
-v4.2
+v4.3
 作者：DLmaster_361
 """
 
 from loguru import logger
-from PySide6.QtWidgets import QSystemTrayIcon
+from PySide6.QtWidgets import QApplication, QSystemTrayIcon
 from qfluentwidgets import (
     Action,
-    PushButton,
     SystemTrayMenu,
     SplashScreen,
     FluentIcon,
-    InfoBar,
-    InfoBarPosition,
     setTheme,
     isDarkTheme,
     SystemThemeListener,
     Theme,
     MSFluentWindow,
     NavigationItemPosition,
-    qconfig,
 )
 from PySide6.QtGui import QIcon, QCloseEvent
-from PySide6.QtCore import Qt, QTimer
-import json
+from PySide6.QtCore import QTimer
 from datetime import datetime, timedelta
 import shutil
+import darkdetect
 
 from app.core import Config, TaskManager, MainTimer, MainInfoBar
 from app.services import Notify, Crypto, System
@@ -65,15 +61,22 @@ class AUTO_MAA(MSFluentWindow):
         super().__init__()
 
         self.setWindowIcon(QIcon(str(Config.app_path / "resources/icons/AUTO_MAA.ico")))
-        self.setWindowTitle("AUTO_MAA")
 
-        setTheme(Theme.AUTO, lazy=True)
+        version_numb = list(map(int, Config.VERSION.split(".")))
+        version_text = (
+            f"v{'.'.join(str(_) for _ in version_numb[0:3])}"
+            if version_numb[3] == 0
+            else f"v{'.'.join(str(_) for _ in version_numb[0:3])}-beta.{version_numb[3]}"
+        )
+
+        self.setWindowTitle(f"AUTO_MAA - {version_text}")
+
+        self.switch_theme()
 
         self.splashScreen = SplashScreen(self.windowIcon(), self)
         self.show_ui("显示主窗口", if_quick=True)
 
-        MainInfoBar.main_window = self.window()
-        System.main_window = self.window()
+        Config.main_window = self.window()
 
         # 创建主窗口
         self.home = Home(self)
@@ -126,10 +129,9 @@ class AUTO_MAA(MSFluentWindow):
             NavigationItemPosition.BOTTOM,
         )
         self.stackedWidget.currentChanged.connect(
-            lambda index: (self.member_manager.refresh() if index == 1 else None)
-        )
-        self.stackedWidget.currentChanged.connect(
-            lambda index: self.queue_manager.refresh() if index == 2 else None
+            lambda index: (
+                self.queue_manager.reload_member_name() if index == 2 else None
+            )
         )
         self.stackedWidget.currentChanged.connect(
             lambda index: (
@@ -143,9 +145,6 @@ class AUTO_MAA(MSFluentWindow):
                 self.dispatch_center.update_top_bar() if index == 3 else None
             )
         )
-        self.stackedWidget.currentChanged.connect(
-            lambda index: (self.history.refresh() if index == 4 else None)
-        )
 
         # 创建系统托盘及其菜单
         self.tray = QSystemTrayIcon(
@@ -179,13 +178,21 @@ class AUTO_MAA(MSFluentWindow):
 
         # 退出主程序菜单项
         self.tray_menu.addAction(
-            Action(FluentIcon.POWER_BUTTON, "退出主程序", triggered=self.window().close)
+            Action(
+                FluentIcon.POWER_BUTTON,
+                "退出主程序",
+                triggered=lambda: System.set_power("KillSelf"),
+            )
         )
 
         # 设置托盘菜单
         self.tray.setContextMenu(self.tray_menu)
         self.tray.activated.connect(self.on_tray_activated)
 
+        self.set_min_method()
+
+        Config.user_info_changed.connect(self.member_manager.refresh_dashboard)
+        Config.power_sign_changed.connect(self.dispatch_center.update_power_sign)
         TaskManager.create_gui.connect(self.dispatch_center.add_board)
         TaskManager.connect_gui.connect(self.dispatch_center.connect_main_board)
         Notify.push_info_bar.connect(MainInfoBar.push_info_bar)
@@ -205,77 +212,76 @@ class AUTO_MAA(MSFluentWindow):
         self.themeListener.systemThemeChanged.connect(self.switch_theme)
         self.themeListener.start()
 
-    def switch_theme(self):
+    def switch_theme(self) -> None:
         """切换主题"""
 
-        setTheme(Theme.AUTO, lazy=True)
-        QTimer.singleShot(100, lambda: setTheme(Theme.AUTO, lazy=True))
+        setTheme(
+            Theme(darkdetect.theme()) if darkdetect.theme() else Theme.LIGHT, lazy=True
+        )
+        QTimer.singleShot(300, lambda: setTheme(Theme.AUTO, lazy=True))
 
         # 云母特效启用时需要增加重试机制
+        # 云母特效不兼容Win10,如果True则通过云母进行主题转换,False则根据当前主题设置背景颜色
         if self.isMicaEffectEnabled():
             QTimer.singleShot(
-                100,
+                300,
                 lambda: self.windowEffect.setMicaEffect(self.winId(), isDarkTheme()),
             )
 
+        else:
+            # 根据当前主题设置背景颜色
+            if isDarkTheme():
+                self.setStyleSheet(
+                    """
+                    CardWidget {background-color: #313131;}
+                    HeaderCardWidget {background-color: #313131;}
+                    background-color: #313131;
+                """
+                )
+            else:
+                self.setStyleSheet("background-color: #ffffff;")
+
     def start_up_task(self) -> None:
         """启动时任务"""
 
-        # 加载配置
-        qconfig.load(Config.config_path, Config.global_config)
-        Config.global_config.save()
-
         # 清理旧日志
         self.clean_old_logs()
 
+        # 清理安装包
+        if (Config.app_path / "AUTO_MAA-Setup.exe").exists():
+            try:
+                (Config.app_path / "AUTO_MAA-Setup.exe").unlink()
+            except Exception:
+                pass
+
         # 检查密码
         self.setting.check_PASSWORD()
 
         # 获取主题图像
-        if (
-            Config.global_config.get(Config.global_config.function_HomeImageMode)
-            == "主题图像"
-        ):
+        if Config.get(Config.function_HomeImageMode) == "主题图像":
             self.home.get_home_image()
 
-        # 获取公告
-        self.setting.show_notice(if_show=False)
-
-        # 检查更新
-        if Config.global_config.get(Config.global_config.update_IfAutoUpdate):
-            result = self.setting.get_update_info()
-            if result == "已是最新版本~":
-                MainInfoBar.push_info_bar("success", "更新检查", result, 3000)
-            else:
-                info = InfoBar.info(
-                    title="更新检查",
-                    content=result,
-                    orient=Qt.Horizontal,
-                    isClosable=True,
-                    position=InfoBarPosition.BOTTOM_LEFT,
-                    duration=-1,
-                    parent=self,
-                )
-                Up = PushButton("更新")
-                Up.clicked.connect(lambda: self.setting.get_update(if_question=False))
-                Up.clicked.connect(info.close)
-                info.addWidget(Up)
-                info.show()
-
         # 直接运行主任务
-        if Config.global_config.get(Config.global_config.start_IfRunDirectly):
+        if Config.get(Config.start_IfRunDirectly):
 
             self.start_main_task()
 
+        # 获取公告
+        self.setting.show_notice(if_first=True)
+
+        # 检查更新
+        if Config.get(Config.update_IfAutoUpdate):
+            self.setting.check_update(if_first=True)
+
         # 直接最小化
-        if Config.global_config.get(Config.global_config.start_IfMinimizeDirectly):
+        if Config.get(Config.start_IfMinimizeDirectly):
 
             self.titleBar.minBtn.click()
 
     def set_min_method(self) -> None:
         """设置最小化方法"""
 
-        if Config.global_config.get(Config.global_config.ui_IfToTray):
+        if Config.get(Config.ui_IfToTray):
 
             self.titleBar.minBtn.clicked.disconnect()
             self.titleBar.minBtn.clicked.connect(lambda: self.show_ui("隐藏到托盘"))
@@ -295,10 +301,7 @@ class AUTO_MAA(MSFluentWindow):
         删除超过用户设定天数的日志文件（基于目录日期）
         """
 
-        if (
-            Config.global_config.get(Config.global_config.function_HistoryRetentionTime)
-            == 0
-        ):
+        if Config.get(Config.function_HistoryRetentionTime) == 0:
             logger.info("由于用户设置日志永久保留，跳过日志清理")
             return
 
@@ -312,9 +315,7 @@ class AUTO_MAA(MSFluentWindow):
                 # 只检查 `YYYY-MM-DD` 格式的文件夹
                 folder_date = datetime.strptime(date_folder.name, "%Y-%m-%d")
                 if datetime.now() - folder_date > timedelta(
-                    days=Config.global_config.get(
-                        Config.global_config.function_HistoryRetentionTime
-                    )
+                    days=Config.get(Config.function_HistoryRetentionTime)
                 ):
                     shutil.rmtree(date_folder, ignore_errors=True)
                     deleted_count += 1
@@ -327,26 +328,25 @@ class AUTO_MAA(MSFluentWindow):
     def start_main_task(self) -> None:
         """启动主任务"""
 
-        if (Config.app_path / "config/QueueConfig/调度队列_1.json").exists():
-
-            with (Config.app_path / "config/QueueConfig/调度队列_1.json").open(
-                mode="r", encoding="utf-8"
-            ) as f:
-                info = json.load(f)
+        if "调度队列_1" in Config.queue_dict:
 
             logger.info("自动添加任务：调度队列_1")
-            TaskManager.add_task("自动代理_主调度台", "主任务队列", info)
+            TaskManager.add_task(
+                "自动代理_主调度台",
+                "调度队列_1",
+                Config.queue_dict["调度队列_1"]["Config"].toDict(),
+            )
 
-        elif (Config.app_path / "config/MaaConfig/脚本_1").exists():
-
-            info = {"Queue": {"Member_1": "脚本_1"}}
+        elif "脚本_1" in Config.member_dict:
 
             logger.info("自动添加任务：脚本_1")
-            TaskManager.add_task("自动代理_主调度台", "主任务队列", info)
+            TaskManager.add_task(
+                "自动代理_主调度台", "自定义队列", {"Queue": {"Member_1": "脚本_1"}}
+            )
 
         else:
 
-            logger.worning("启动主任务失败：未找到有效的主任务配置文件")
+            logger.warning("启动主任务失败：未找到有效的主任务配置文件")
             MainInfoBar.push_info_bar(
                 "warning", "启动主任务失败", "“调度队列_1”与“脚本_1”均不存在", -1
             )
@@ -354,36 +354,46 @@ class AUTO_MAA(MSFluentWindow):
     def show_ui(self, mode: str, if_quick: bool = False) -> None:
         """配置窗口状态"""
 
+        self.switch_theme()
+
         if mode == "显示主窗口":
 
             # 配置主窗口
-            size = list(
-                map(
-                    int,
-                    Config.global_config.get(Config.global_config.ui_size).split("x"),
+            if not self.window().isVisible():
+                size = list(
+                    map(
+                        int,
+                        Config.get(Config.ui_size).split("x"),
+                    )
                 )
-            )
-            location = list(
-                map(
-                    int,
-                    Config.global_config.get(Config.global_config.ui_location).split(
-                        "x"
-                    ),
+                location = list(
+                    map(
+                        int,
+                        Config.get(Config.ui_location).split("x"),
+                    )
                 )
-            )
-            self.window().setGeometry(location[0], location[1], size[0], size[1])
-            self.window().show()
+                if self.window().isMaximized():
+                    self.window().showNormal()
+                self.window().setGeometry(location[0], location[1], size[0], size[1])
+                self.window().show()
+                if not if_quick:
+                    if Config.get(Config.ui_maximized):
+                        self.titleBar.maxBtn.click()
+                    self.show_ui("配置托盘")
+
+            if not any(
+                self.window().geometry().intersects(screen.availableGeometry())
+                for screen in QApplication.screens()
+            ):
+                self.window().showNormal()
+                self.window().setGeometry(100, 100, 1200, 700)
+
             self.window().raise_()
             self.window().activateWindow()
-            if not if_quick:
-                if Config.global_config.get(Config.global_config.ui_maximized):
-                    self.window().showMaximized()
-                self.set_min_method()
-                self.show_ui("配置托盘")
 
         elif mode == "配置托盘":
 
-            if Config.global_config.get(Config.global_config.ui_IfShowTray):
+            if Config.get(Config.ui_IfShowTray):
                 self.tray.show()
             else:
                 self.tray.hide()
@@ -393,18 +403,17 @@ class AUTO_MAA(MSFluentWindow):
             # 保存窗口相关属性
             if not self.window().isMaximized():
 
-                Config.global_config.set(
-                    Config.global_config.ui_size,
+                Config.set(
+                    Config.ui_size,
                     f"{self.geometry().width()}x{self.geometry().height()}",
                 )
-                Config.global_config.set(
-                    Config.global_config.ui_location,
+                Config.set(
+                    Config.ui_location,
                     f"{self.geometry().x()}x{self.geometry().y()}",
                 )
-            Config.global_config.set(
-                Config.global_config.ui_maximized, self.window().isMaximized()
-            )
-            Config.global_config.save()
+
+            Config.set(Config.ui_maximized, self.window().isMaximized())
+            Config.save()
 
             # 隐藏主窗口
             if not if_quick:
@@ -420,11 +429,10 @@ class AUTO_MAA(MSFluentWindow):
         # 清理各功能线程
         MainTimer.Timer.stop()
         MainTimer.Timer.deleteLater()
+        MainTimer.LongTimer.stop()
+        MainTimer.LongTimer.deleteLater()
         TaskManager.stop_task("ALL")
 
-        # 关闭数据库连接
-        Config.close_database()
-
         # 关闭主题监听
         self.themeListener.terminate()
         self.themeListener.deleteLater()

app/utils/AUTO_MAA.iss

@@ -0,0 +1,88 @@
+; Script generated by the Inno Setup Script Wizard.
+; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
+
+#define MyAppName "AUTO_MAA"
+#define MyAppVersion ""
+#define MyAppPublisher "AUTO_MAA Team"
+#define MyAppURL "https://doc.automaa.xyz/"
+#define MyAppExeName "AUTO_MAA.exe"
+#define MyAppPath ""
+#define OutputDir ""
+
+[Setup]
+; NOTE: The value of AppId uniquely identifies this application. Do not use the same AppId value in installers for other applications.
+; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
+AppId={{D116A92A-E174-4699-B777-61C5FD837B19}
+AppName={#MyAppName}
+AppVersion={#MyAppVersion}
+AppVerName={#MyAppName}
+AppPublisher={#MyAppPublisher}
+AppPublisherURL={#MyAppURL}
+AppSupportURL={#MyAppURL}
+AppUpdatesURL={#MyAppURL}
+DefaultDirName=D:\{#MyAppName}
+UninstallDisplayIcon={app}\{#MyAppExeName}
+; "ArchitecturesAllowed=x64compatible" specifies that Setup cannot run
+; on anything but x64 and Windows 11 on Arm.
+ArchitecturesAllowed=x64compatible
+; "ArchitecturesInstallIn64BitMode=x64compatible" requests that the
+; install be done in "64-bit mode" on x64 or Windows 11 on Arm,
+; meaning it should use the native 64-bit Program Files directory and
+; the 64-bit view of the registry.
+ArchitecturesInstallIn64BitMode=x64compatible
+DisableProgramGroupPage=yes
+LicenseFile={#MyAppPath}\LICENSE
+; Remove the following line to run in administrative install mode (install for all users).
+PrivilegesRequired=lowest
+OutputDir={#OutputDir}
+OutputBaseFilename=AUTO_MAA-Setup
+SetupIconFile={#MyAppPath}\resources\icons\AUTO_MAA.ico
+SolidCompression=yes
+WizardStyle=modern
+
+[Languages]
+Name: "Chinese"; MessagesFile: "{#MyAppPath}\resources\docs\ChineseSimplified.isl"
+Name: "English"; MessagesFile: "compiler:Default.isl"
+
+[Tasks]
+Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
+
+[Files]
+Source: "{#MyAppPath}\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
+Source: "{#MyAppPath}\app\*"; DestDir: "{app}\app"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "{#MyAppPath}\resources\*"; DestDir: "{app}\resources"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "{#MyAppPath}\main.py"; DestDir: "{app}"; Flags: ignoreversion
+Source: "{#MyAppPath}\requirements.txt"; DestDir: "{app}"; Flags: ignoreversion
+Source: "{#MyAppPath}\README.md"; DestDir: "{app}"; Flags: ignoreversion
+Source: "{#MyAppPath}\LICENSE"; DestDir: "{app}"; Flags: ignoreversion
+; NOTE: Don't use "Flags: ignoreversion" on any shared system files
+
+[Icons]
+Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
+Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
+
+[Run]
+Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall
+
+[Code]
+var
+  DeleteDataQuestion: Boolean;
+
+function InitializeUninstall: Boolean;
+begin
+  DeleteDataQuestion := MsgBox('您确认要完全移除 AUTO_MAA 的所有用户数据文件与子组件吗？', mbConfirmation, MB_YESNO) = IDYES;
+  Result := True;
+end;
+
+procedure CurUninstallStepChanged(CurUninstallStep: TUninstallStep);
+begin
+  if CurUninstallStep = usPostUninstall then
+  begin
+    DelTree(ExpandConstant('{app}\app'), True, True, True);
+    DelTree(ExpandConstant('{app}\resources'), True, True, True);
+    if DeleteDataQuestion then
+    begin
+      DelTree(ExpandConstant('{app}'), True, True, True);
+    end;
+  end;
+end;

app/utils/Updater.py

@@ -1,490 +0,0 @@
-#   <AUTO_MAA:A MAA Multi Account Management and Automation Tool>
-#   Copyright © <2024> <DLmaster361>
-
-#   This file is part of AUTO_MAA.
-
-#   AUTO_MAA is free software: you can redistribute it and/or modify
-#   it under the terms of the GNU General Public License as published
-#   by the Free Software Foundation, either version 3 of the License,
-#   or (at your option) any later version.
-
-#   AUTO_MAA is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty
-#   of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
-#   the GNU General Public License for more details.
-
-#   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
-
-"""
-AUTO_MAA
-AUTO_MAA更新器
-v1.1
-作者：DLmaster_361
-"""
-
-import sys
-import json
-import zipfile
-import requests
-import subprocess
-import time
-from pathlib import Path
-
-from PySide6.QtWidgets import QApplication, QDialog, QVBoxLayout, QHBoxLayout
-from qfluentwidgets import (
-    ProgressBar,
-    IndeterminateProgressBar,
-    BodyLabel,
-    PushButton,
-    EditableComboBox,
-)
-from PySide6.QtGui import QIcon, QCloseEvent
-from PySide6.QtCore import QThread, Signal, QEventLoop
-
-
-def version_text(version_numb: list) -> str:
-    """将版本号列表转为可读的文本信息"""
-
-    if version_numb[3] == 0:
-        version = f"v{'.'.join(str(_) for _ in version_numb[0:3])}"
-    else:
-        version = (
-            f"v{'.'.join(str(_) for _ in version_numb[0:3])}-beta.{version_numb[3]}"
-        )
-    return version
-
-
-class UpdateProcess(QThread):
-
-    info = Signal(str)
-    progress = Signal(int, int, int)
-    question = Signal(dict)
-    question_response = Signal(str)
-    accomplish = Signal()
-
-    def __init__(
-        self, app_path: Path, name: str, main_version: list, updater_version: list
-    ) -> None:
-        super(UpdateProcess, self).__init__()
-
-        self.app_path = app_path
-        self.name = name
-        self.main_version = main_version
-        self.updater_version = updater_version
-        self.download_path = app_path / "DOWNLOAD_TEMP.zip"  #  临时下载文件的路径
-        self.version_path = app_path / "resources/version.json"
-        self.response = None
-
-        self.question_response.connect(self._capture_response)
-
-    def run(self) -> None:
-
-        # 清理可能存在的临时文件
-        if self.download_path.exists():
-            self.download_path.unlink()
-
-        self.info.emit("正在获取下载链接")
-        url_list = self.get_download_url()
-        url_dict = {}
-
-        # 验证下载地址
-        for i, url in enumerate(url_list):
-
-            if self.isInterruptionRequested():
-                return None
-
-            self.progress.emit(0, len(url_list), i)
-
-            try:
-                self.info.emit(f"正在验证下载地址：{url}")
-                response = requests.get(url, stream=True)
-                if response.status_code != 200:
-                    self.info.emit(f"连接失败，错误代码 {response.status_code}")
-                    time.sleep(1)
-                    continue
-                url_dict[url] = response.elapsed.total_seconds()
-            except requests.RequestException:
-                self.info.emit(f"请求超时")
-                time.sleep(1)
-
-        download_url = self.push_question(url_dict)
-
-        # 获取文件大小
-        try:
-            self.info.emit(f"正在连接下载地址：{download_url}")
-            self.progress.emit(0, 0, 0)
-            response = requests.get(download_url, stream=True)
-            if response.status_code != 200:
-                self.info.emit(f"连接失败，错误代码 {response.status_code}")
-                return None
-            file_size = response.headers.get("Content-Length")
-        except requests.RequestException:
-            self.info.emit(f"请求超时")
-            return None
-
-        if file_size is None:
-            file_size = 1
-        else:
-            file_size = int(file_size)
-
-        try:
-            # 下载文件
-            with open(self.download_path, "wb") as f:
-
-                downloaded_size = 0
-                last_download_size = 0
-                speed = 0
-                last_time = time.time()
-
-                for chunk in response.iter_content(chunk_size=8192):
-
-                    if self.isInterruptionRequested():
-                        break
-
-                    # 写入已下载数据
-                    f.write(chunk)
-                    downloaded_size += len(chunk)
-
-                    # 计算下载速度
-                    if time.time() - last_time >= 1.0:
-                        speed = (
-                            (downloaded_size - last_download_size)
-                            / (time.time() - last_time)
-                            / 1024
-                        )
-                        last_download_size = downloaded_size
-                        last_time = time.time()
-
-                    # 更新下载进度
-                    if speed >= 1024:
-                        self.info.emit(
-                            f"正在下载：{self.name} 已下载：{downloaded_size / 1048576:.2f}/{file_size / 1048576:.2f} MB （{downloaded_size / file_size * 100:.2f}%） 下载速度：{speed / 1024:.2f} MB/s",
-                        )
-                    else:
-                        self.info.emit(
-                            f"正在下载：{self.name} 已下载：{downloaded_size / 1048576:.2f}/{file_size / 1048576:.2f} MB （{downloaded_size / file_size * 100:.2f}%） 下载速度：{speed:.2f} KB/s",
-                        )
-                    self.progress.emit(0, 100, int(downloaded_size / file_size * 100))
-
-                if self.isInterruptionRequested() and self.download_path.exists():
-                    self.download_path.unlink()
-                    return None
-
-        except Exception as e:
-            e = str(e)
-            e = "\n".join([e[_ : _ + 75] for _ in range(0, len(e), 75)])
-            self.info.emit(f"下载{self.name}时出错：\n{e}")
-            return None
-
-        # 解压
-        try:
-
-            while True:
-                if self.isInterruptionRequested():
-                    self.download_path.unlink()
-                    return None
-                try:
-                    self.info.emit("正在解压更新文件")
-                    self.progress.emit(0, 0, 0)
-                    with zipfile.ZipFile(self.download_path, "r") as zip_ref:
-                        zip_ref.extractall(self.app_path)
-                    break
-                except PermissionError:
-                    self.info.emit(f"解压出错：{self.name}正在运行，正在等待其关闭")
-                    time.sleep(1)
-
-            self.info.emit("正在删除临时文件")
-            self.progress.emit(0, 0, 0)
-            self.download_path.unlink()
-
-            self.info.emit(f"{self.name}更新成功！")
-            self.progress.emit(0, 100, 100)
-
-        except Exception as e:
-
-            e = str(e)
-            e = "\n".join([e[_ : _ + 75] for _ in range(0, len(e), 75)])
-            self.info.emit(f"解压更新时出错：\n{e}")
-            return None
-
-        # 更新version文件
-        if not self.isInterruptionRequested and self.name in [
-            "AUTO_MAA主程序",
-            "AUTO_MAA更新器",
-        ]:
-            with open(self.version_path, "r", encoding="utf-8") as f:
-                version_info = json.load(f)
-            if self.name == "AUTO_MAA主程序":
-                version_info["main_version"] = ".".join(map(str, self.main_version))
-            elif self.name == "AUTO_MAA更新器":
-                version_info["updater_version"] = ".".join(
-                    map(str, self.updater_version)
-                )
-            with open(self.version_path, "w", encoding="utf-8") as f:
-                json.dump(version_info, f, ensure_ascii=False, indent=4)
-
-        # 主程序更新完成后打开AUTO_MAA
-        if not self.isInterruptionRequested and self.name == "AUTO_MAA主程序":
-            subprocess.Popen(
-                str(self.app_path / "AUTO_MAA.exe"),
-                shell=True,
-                creationflags=subprocess.CREATE_NO_WINDOW,
-            )
-        elif not self.isInterruptionRequested and self.name == "MAA":
-            subprocess.Popen(
-                str(self.app_path / "MAA.exe"),
-                shell=True,
-                creationflags=subprocess.CREATE_NO_WINDOW,
-            )
-
-        self.accomplish.emit()
-
-    def get_download_url(self) -> list:
-        """获取下载链接"""
-
-        try_num = 3
-        for i in range(try_num):
-            try:
-                response = requests.get(
-                    "https://gitee.com/DLmaster_361/AUTO_MAA/raw/main/resources/version.json"
-                )
-                if response.status_code != 200:
-                    self.info.emit(
-                        f"连接失败，错误代码 {response.status_code} ，正在重试（{i+1}/{try_num}）"
-                    )
-                    time.sleep(0.1)
-                    continue
-                version_remote = response.json()
-                PROXY_list = version_remote["proxy_list"]
-                break
-            except requests.RequestException:
-                self.info.emit(f"请求超时，正在重试（{i+1}/{try_num}）")
-                time.sleep(0.1)
-            except KeyError:
-                self.info.emit(f"未找到远端代理网址项，正在重试（{i+1}/{try_num}）")
-                time.sleep(0.1)
-        else:
-            self.info.emit("获取远端代理信息失败，将使用默认代理地址")
-            PROXY_list = [
-                "",
-                "https://gitproxy.click/",
-                "https://cdn.moran233.xyz/",
-                "https://gh.llkk.cc/",
-                "https://github.akams.cn/",
-                "https://www.ghproxy.cn/",
-                "https://ghfast.top/",
-            ]
-            time.sleep(1)
-
-        url_list = []
-        if self.name == "AUTO_MAA主程序":
-            url_list.append(
-                f"https://gitee.com/DLmaster_361/AUTO_MAA/releases/download/{version_text(self.main_version)}/AUTO_MAA_{version_text(self.main_version)}.zip"
-            )
-            url_list.append(
-                f"https://jp-download.fearr.xyz/AUTO_MAA/AUTO_MAA_{version_text(self.main_version)}.zip"
-            )
-            for i in range(len(PROXY_list)):
-                url_list.append(
-                    f"{PROXY_list[i]}https://github.com/DLmaster361/AUTO_MAA/releases/download/{version_text(self.main_version)}/AUTO_MAA_{version_text(self.main_version)}.zip"
-                )
-        elif self.name == "AUTO_MAA更新器":
-            url_list.append(
-                f"https://gitee.com/DLmaster_361/AUTO_MAA/releases/download/{version_text(self.main_version)}/Updater_{version_text(self.updater_version)}.zip"
-            )
-            url_list.append(
-                f"https://jp-download.fearr.xyz/AUTO_MAA/Updater_{version_text(self.updater_version)}.zip"
-            )
-            for i in range(len(PROXY_list)):
-                url_list.append(
-                    f"{PROXY_list[i]}https://github.com/DLmaster361/AUTO_MAA/releases/download/{version_text(self.main_version)}/Updater_{version_text(self.updater_version)}.zip"
-                )
-        elif self.name == "MAA":
-            url_list.append(
-                f"https://jp-download.fearr.xyz/MAA/MAA-{version_text(self.main_version)}-win-x64.zip"
-            )
-            for i in range(len(PROXY_list)):
-                url_list.append(
-                    f"{PROXY_list[i]}https://github.com/MaaAssistantArknights/MaaAssistantArknights/releases/download/{version_text(self.main_version)}/MAA-{version_text(self.main_version)}-win-x64.zip"
-                )
-        return url_list
-
-    def push_question(self, url_dict: dict) -> str:
-        self.question.emit(url_dict)
-        loop = QEventLoop()
-        self.question_response.connect(loop.quit)
-        loop.exec()
-        return self.response
-
-    def _capture_response(self, response: str) -> None:
-        self.response = response
-
-
-class Updater(QDialog):
-
-    def __init__(
-        self, app_path: Path, name: str, main_version: list, updater_version: list
-    ) -> None:
-        super().__init__()
-
-        self.setWindowTitle("AUTO_MAA更新器")
-        self.setWindowIcon(
-            QIcon(
-                str(
-                    Path(sys.argv[0]).resolve().parent
-                    / "resources/icons/AUTO_MAA_Updater.ico"
-                )
-            )
-        )
-
-        # 创建垂直布局
-        self.Layout = QVBoxLayout(self)
-
-        self.info = BodyLabel("正在初始化", self)
-        self.progress_1 = IndeterminateProgressBar(self)
-        self.progress_2 = ProgressBar(self)
-        self.combo_box = EditableComboBox(self)
-
-        self.button = PushButton("继续", self)
-        self.h_layout = QHBoxLayout()
-        self.h_layout.addStretch(1)
-        self.h_layout.addWidget(self.button)
-
-        self.update_progress(0, 0, 0)
-
-        self.Layout.addWidget(self.info)
-        self.Layout.addStretch(1)
-        self.Layout.addWidget(self.progress_1)
-        self.Layout.addWidget(self.progress_2)
-        self.Layout.addWidget(self.combo_box)
-        self.Layout.addLayout(self.h_layout)
-        self.Layout.addStretch(1)
-
-        self.update_process = UpdateProcess(
-            app_path, name, main_version, updater_version
-        )
-
-        self.update_process.info.connect(self.update_info)
-        self.update_process.progress.connect(self.update_progress)
-        self.update_process.question.connect(self.question)
-
-        self.update_process.start()
-
-    def update_info(self, text: str) -> None:
-        self.info.setText(text)
-
-    def update_progress(
-        self, begin: int, end: int, current: int, if_show_combo_box: bool = False
-    ) -> None:
-
-        self.combo_box.setVisible(if_show_combo_box)
-        self.button.setVisible(if_show_combo_box)
-
-        if if_show_combo_box:
-            self.progress_1.setVisible(False)
-            self.progress_2.setVisible(False)
-            self.resize(1000, 90)
-        elif begin == 0 and end == 0:
-            self.progress_2.setVisible(False)
-            self.progress_1.setVisible(True)
-            self.resize(700, 70)
-        else:
-            self.progress_1.setVisible(False)
-            self.progress_2.setVisible(True)
-            self.progress_2.setRange(begin, end)
-            self.progress_2.setValue(current)
-            self.resize(700, 70)
-
-    def question(self, url_dict: dict) -> None:
-
-        self.update_info("测速完成，请选择或自行输入一个合适下载地址：")
-        self.update_progress(0, 0, 0, True)
-
-        url_dict = dict(sorted(url_dict.items(), key=lambda item: item[1]))
-
-        for url, time in url_dict.items():
-            self.combo_box.addItem(f"{url} | 响应时间：{time:.3f}秒")
-
-        self.button.clicked.connect(
-            lambda: self.update_process.question_response.emit(
-                self.combo_box.currentText().split(" | ")[0]
-            )
-        )
-
-    def closeEvent(self, event: QCloseEvent):
-        """清理残余进程"""
-
-        self.update_process.requestInterruption()
-        self.update_process.quit()
-        self.update_process.wait()
-
-        event.accept()
-
-
-class AUTO_MAA_Updater(QApplication):
-    def __init__(
-        self, app_path: Path, name: str, main_version: list, updater_version: list
-    ) -> None:
-        super().__init__()
-
-        self.main = Updater(app_path, name, main_version, updater_version)
-        self.main.show()
-
-
-if __name__ == "__main__":
-
-    # 获取软件自身的路径
-    app_path = Path(sys.argv[0]).resolve().parent
-
-    # 从本地版本信息文件获取当前版本信息
-    if (app_path / "resources/version.json").exists():
-        with (app_path / "resources/version.json").open(
-            mode="r", encoding="utf-8"
-        ) as f:
-            version_current = json.load(f)
-        main_version_current = list(
-            map(int, version_current["main_version"].split("."))
-        )
-    else:
-        main_version_current = [0, 0, 0, 0]
-
-    # 从本地配置文件获取更新类型
-    if (app_path / "config/config.json").exists():
-        with (app_path / "config/config.json").open(mode="r", encoding="utf-8") as f:
-            config = json.load(f)
-        if "Update" in config and "UpdateType" in config["Update"]:
-            update_type = config["Update"]["UpdateType"]
-        else:
-            update_type = "main"
-    else:
-        update_type = "main"
-
-    # 从远程服务器获取最新版本信息
-    for _ in range(3):
-        try:
-            response = requests.get(
-                f"https://gitee.com/DLmaster_361/AUTO_MAA/raw/{update_type}/resources/version.json"
-            )
-            version_remote = response.json()
-            main_version_remote = list(
-                map(int, version_remote["main_version"].split("."))
-            )
-            break
-        except Exception as e:
-            err = e
-            time.sleep(0.1)
-    else:
-        sys.exit(f"获取版本信息时出错：\n{err}")
-
-    # 启动更新线程
-    if main_version_remote > main_version_current:
-        app = AUTO_MAA_Updater(
-            app_path,
-            "AUTO_MAA主程序",
-            main_version_remote,
-            [],
-        )
-        sys.exit(app.exec())

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,12 +16,12 @@
 #   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
 AUTO_MAA工具包
-v4.2
+v4.3
 作者：DLmaster_361
 """
 
@@ -29,6 +29,4 @@ __version__ = "4.2.0"
 __author__ = "DLmaster361 <DLmaster_361@163.com>"
 __license__ = "GPL-3.0 license"
 
-from .Updater import Updater
-
-__all__ = ["Updater"]
+__all__ = []

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,12 +16,12 @@
 #   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
 AUTO_MAA打包程序
-v4.2
+v4.3
 作者：DLmaster_361
 """
 
@@ -35,6 +35,9 @@ from pathlib import Path
 def version_text(version_numb: list) -> str:
     """将版本号列表转为可读的文本信息"""
 
+    while len(version_numb) < 4:
+        version_numb.append(0)
+
     if version_numb[3] == 0:
         version = f"v{'.'.join(str(_) for _ in version_numb[0:3])}"
     else:
@@ -44,6 +47,17 @@ def version_text(version_numb: list) -> str:
     return version
 
 
+def version_info_markdown(info: dict) -> str:
+    """将版本信息字典转为markdown信息"""
+
+    version_info = ""
+    for key, value in info.items():
+        version_info += f"## {key}\n"
+        for v in value:
+            version_info += f"- {v}\n"
+    return version_info
+
+
 if __name__ == "__main__":
 
     root_path = Path(sys.argv[0]).resolve().parent
@@ -52,7 +66,6 @@ if __name__ == "__main__":
         version = json.load(f)
 
     main_version_numb = list(map(int, version["main_version"].split(".")))
-    updater_version_numb = list(map(int, version["updater_version"].split(".")))
 
     print("Packaging AUTO_MAA main program ...")
 
@@ -65,45 +78,66 @@ 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"
     )
 
     print("AUTO_MAA main program packaging completed !")
 
-    shutil.copy(root_path / "app/utils/Updater.py", root_path)
+    print("start to create setup program ...")
 
-    file_content = (root_path / "Updater.py").read_text(encoding="utf-8")
+    (root_path / "AUTO_MAA").mkdir(parents=True, exist_ok=True)
+    shutil.move(root_path / "AUTO_MAA.exe", root_path / "AUTO_MAA/")
+    shutil.copytree(root_path / "app", root_path / "AUTO_MAA/app")
+    shutil.copytree(root_path / "resources", root_path / "AUTO_MAA/resources")
+    shutil.copy(root_path / "main.py", root_path / "AUTO_MAA/")
+    shutil.copy(root_path / "requirements.txt", root_path / "AUTO_MAA/")
+    shutil.copy(root_path / "README.md", root_path / "AUTO_MAA/")
+    shutil.copy(root_path / "LICENSE", root_path / "AUTO_MAA/")
 
-    (root_path / "Updater.py").write_text(
-        file_content.replace(
-            "from .version import version_text", "from app import version_text"
-        ),
-        encoding="utf-8",
+    with (root_path / "app/utils/AUTO_MAA.iss").open(mode="r", encoding="utf-8") as f:
+        iss = f.read()
+    iss = (
+        iss.replace(
+            '#define MyAppVersion ""',
+            f'#define MyAppVersion "{version["main_version"]}"',
+        )
+        .replace(
+            '#define MyAppPath ""', f'#define MyAppPath "{root_path / "AUTO_MAA"}"'
+        )
+        .replace('#define OutputDir ""', f'#define OutputDir "{root_path}"')
+    )
+    with (root_path / "AUTO_MAA.iss").open(mode="w", encoding="utf-8") as f:
+        f.write(iss)
+
+    os.system(f'ISCC "{root_path / "AUTO_MAA.iss"}"')
+
+    (root_path / "AUTO_MAA_Setup").mkdir(parents=True, exist_ok=True)
+    shutil.move(root_path / "AUTO_MAA-Setup.exe", root_path / "AUTO_MAA_Setup")
+
+    shutil.make_archive(
+        base_name=root_path / f"AUTO_MAA_{version_text(main_version_numb)}",
+        format="zip",
+        root_dir=root_path / "AUTO_MAA_Setup",
+        base_dir=".",
     )
 
-    print("Packaging AUTO_MAA update program ...")
+    print("setup program created !")
 
-    os.system(
-        "powershell -Command python -m nuitka --standalone --onefile --mingw64"
-        " --enable-plugins=pyside6 --windows-console-mode=disable"
-        " --onefile-tempdir-spec='{TEMP}\\AUTO_MAA_Updater'"
-        " --windows-icon-from-ico=resources\\icons\\AUTO_MAA_Updater.ico"
-        " --company-name='AUTO_MAA Team' --product-name=AUTO_MAA"
-        f" --file-version={version["updater_version"]}"
-        f" --product-version={version["main_version"]}"
-        " --file-description='AUTO_MAA Component'"
-        " --copyright='Copyright © 2024 DLmaster361'"
-        " --assume-yes-for-downloads --output-filename=Updater"
-        " --remove-output Updater.py"
-    )
+    (root_path / "AUTO_MAA.iss").unlink(missing_ok=True)
+    shutil.rmtree(root_path / "AUTO_MAA")
+    shutil.rmtree(root_path / "AUTO_MAA_Setup")
 
-    print("AUTO_MAA update program packaging completed !")
-
-    (root_path / "Updater.py").unlink()
+    all_version_info = {}
+    for v_i in version["version_info"].values():
+        for key, value in v_i.items():
+            if key in all_version_info:
+                all_version_info[key] += value.copy()
+            else:
+                all_version_info[key] = value.copy()
 
     (root_path / "version_info.txt").write_text(
-        f"{version_text(main_version_numb)}\n{version_text(updater_version_numb)}{version["announcement"]}",
+        f"{version_text(main_version_numb)}\n\n<!--{json.dumps(version["version_info"], ensure_ascii=False)}-->\n{version_info_markdown(all_version_info)}",
         encoding="utf-8",
     )

main.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,18 +16,17 @@
 #   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
 AUTO_MAA主程序
-v4.2
+v4.3
 作者：DLmaster_361
 """
 
 from loguru import logger
 from PySide6.QtWidgets import QApplication
-from PySide6.QtCore import Qt
 from qfluentwidgets import FluentTranslator
 import sys
 
@@ -36,7 +35,6 @@ import sys
 def main():
 
     application = QApplication(sys.argv)
-    QApplication.setAttribute(Qt.AA_DontCreateNativeWidgetSiblings)
 
     translator = FluentTranslator()
     application.installTranslator(translator)
@@ -45,6 +43,7 @@ def main():
 
     window = AUTO_MAA()
     window.show_ui("显示主窗口")
+    window.show_ui("配置托盘")
     window.start_up_task()
     sys.exit(application.exec())
 

requirements.txt

@@ -8,6 +8,6 @@ pywin32
 pyautogui
 pycryptodome
 requests
+markdown
 Jinja2
-serverchan_sdk
-nuitka==2.6
+nuitka

res/version.json

@@ -1,14 +0,0 @@
-{
-    "main_version": "4.2.0.0",
-    "updater_version": "1.1.0.0",
-    "announcement": "\n# 这是一个中转版本，此版本后更换程序架构方式。\n# 由于更新方法无法通用，您需要在完成本次更新后再次检查更新以获取最新版本。\n",
-    "proxy_list":[
-        "",
-        "https://gitproxy.click/",
-        "https://cdn.moran233.xyz/",
-        "https://gh.llkk.cc/",
-        "https://github.akams.cn/",
-        "https://www.ghproxy.cn/",
-        "https://ghfast.top/"
-    ]
-}

resources/docs/ChineseSimplified.isl

@@ -0,0 +1,403 @@
+; *** Inno Setup version 6.4.0+ Chinese Simplified messages ***
+;
+; To download user-contributed translations of this file, go to:
+;   https://jrsoftware.org/files/istrans/
+;
+; Note: When translating this text, do not add periods (.) to the end of
+; messages that didn't have them already, because on those messages Inno
+; Setup adds the periods automatically (appending a period would result in
+; two periods being displayed).
+;
+; Maintained by Zhenghan Yang
+; Email: 847320916@QQ.com
+; Translation based on network resource
+; The latest Translation is on https://github.com/kira-96/Inno-Setup-Chinese-Simplified-Translation
+;
+
+[LangOptions]
+; The following three entries are very important. Be sure to read and 
+; understand the '[LangOptions] section' topic in the help file.
+LanguageName=简体中文
+; If Language Name display incorrect, uncomment next line
+; LanguageName=<7B80><4F53><4E2D><6587>
+; About LanguageID, to reference link:
+; https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-lcid/a9eac961-e77d-41a6-90a5-ce1a8b0cdb9c
+LanguageID=$0804
+; About CodePage, to reference link:
+; https://docs.microsoft.com/en-us/windows/win32/intl/code-page-identifiers
+LanguageCodePage=936
+; If the language you are translating to requires special font faces or
+; sizes, uncomment any of the following entries and change them accordingly.
+;DialogFontName=
+;DialogFontSize=8
+;WelcomeFontName=Verdana
+;WelcomeFontSize=12
+;TitleFontName=Arial
+;TitleFontSize=29
+;CopyrightFontName=Arial
+;CopyrightFontSize=8
+
+[Messages]
+
+; *** 应用程序标题
+SetupAppTitle=安装
+SetupWindowTitle=安装 - %1
+UninstallAppTitle=卸载
+UninstallAppFullTitle=%1 卸载
+
+; *** Misc. common
+InformationTitle=信息
+ConfirmTitle=确认
+ErrorTitle=错误
+
+; *** SetupLdr messages
+SetupLdrStartupMessage=现在将安装 %1。您想要继续吗？
+LdrCannotCreateTemp=无法创建临时文件。安装程序已中止
+LdrCannotExecTemp=无法执行临时目录中的文件。安装程序已中止
+HelpTextNote=
+
+; *** 启动错误消息
+LastErrorMessage=%1。%n%n错误 %2: %3
+SetupFileMissing=安装目录中缺少文件 %1。请修正这个问题或者获取程序的新副本。
+SetupFileCorrupt=安装文件已损坏。请获取程序的新副本。
+SetupFileCorruptOrWrongVer=安装文件已损坏，或是与这个安装程序的版本不兼容。请修正这个问题或获取新的程序副本。
+InvalidParameter=无效的命令行参数：%n%n%1
+SetupAlreadyRunning=安装程序正在运行。
+WindowsVersionNotSupported=此程序不支持当前计算机运行的 Windows 版本。
+WindowsServicePackRequired=此程序需要 %1 服务包 %2 或更高版本。
+NotOnThisPlatform=此程序不能在 %1 上运行。
+OnlyOnThisPlatform=此程序只能在 %1 上运行。
+OnlyOnTheseArchitectures=此程序只能安装到为下列处理器架构设计的 Windows 版本中：%n%n%1
+WinVersionTooLowError=此程序需要 %1 版本 %2 或更高。
+WinVersionTooHighError=此程序不能安装于 %1 版本 %2 或更高。
+AdminPrivilegesRequired=在安装此程序时您必须以管理员身份登录。
+PowerUserPrivilegesRequired=在安装此程序时您必须以管理员身份或有权限的用户组身份登录。
+SetupAppRunningError=安装程序发现 %1 当前正在运行。%n%n请先关闭正在运行的程序，然后点击“确定”继续，或点击“取消”退出。
+UninstallAppRunningError=卸载程序发现 %1 当前正在运行。%n%n请先关闭正在运行的程序，然后点击“确定”继续，或点击“取消”退出。
+
+; *** 启动问题
+PrivilegesRequiredOverrideTitle=选择安装程序模式
+PrivilegesRequiredOverrideInstruction=选择安装模式
+PrivilegesRequiredOverrideText1=%1 可以为所有用户安装(需要管理员权限)，或仅为您安装。
+PrivilegesRequiredOverrideText2=%1 只能为您安装，或为所有用户安装(需要管理员权限)。
+PrivilegesRequiredOverrideAllUsers=为所有用户安装(&A)
+PrivilegesRequiredOverrideAllUsersRecommended=为所有用户安装(&A) (建议选项)
+PrivilegesRequiredOverrideCurrentUser=只为我安装(&M)
+PrivilegesRequiredOverrideCurrentUserRecommended=只为我安装(&M) (建议选项)
+
+; *** 其他错误
+ErrorCreatingDir=安装程序无法创建目录“%1”
+ErrorTooManyFilesInDir=无法在目录“%1”中创建文件，因为里面包含太多文件
+
+; *** 安装程序公共消息
+ExitSetupTitle=退出安装程序
+ExitSetupMessage=安装程序尚未完成。如果现在退出，将不会安装该程序。%n%n您之后可以再次运行安装程序完成安装。%n%n现在退出安装程序吗？
+AboutSetupMenuItem=关于安装程序(&A)...
+AboutSetupTitle=关于安装程序
+AboutSetupMessage=%1 版本 %2%n%3%n%n%1 主页：%n%4
+AboutSetupNote=
+TranslatorNote=简体中文翻译由Kira(847320916@qq.com)维护。项目地址：https://github.com/kira-96/Inno-Setup-Chinese-Simplified-Translation
+
+; *** 按钮
+ButtonBack=< 上一步(&B)
+ButtonNext=下一步(&N) >
+ButtonInstall=安装(&I)
+ButtonOK=确定
+ButtonCancel=取消
+ButtonYes=是(&Y)
+ButtonYesToAll=全是(&A)
+ButtonNo=否(&N)
+ButtonNoToAll=全否(&O)
+ButtonFinish=完成(&F)
+ButtonBrowse=浏览(&B)...
+ButtonWizardBrowse=浏览(&R)...
+ButtonNewFolder=新建文件夹(&M)
+
+; *** “选择语言”对话框消息
+SelectLanguageTitle=选择安装语言
+SelectLanguageLabel=选择安装时使用的语言。
+
+; *** 公共向导文字
+ClickNext=点击“下一步”继续，或点击“取消”退出安装程序。
+BeveledLabel=
+BrowseDialogTitle=浏览文件夹
+BrowseDialogLabel=在下面的列表中选择一个文件夹，然后点击“确定”。
+NewFolderName=新建文件夹
+
+; *** “欢迎”向导页
+WelcomeLabel1=欢迎使用 [name] 安装向导
+WelcomeLabel2=现在将安装 [name/ver] 到您的电脑中。%n%n建议您在继续安装前关闭所有其他应用程序。
+
+; *** “密码”向导页
+WizardPassword=密码
+PasswordLabel1=这个安装程序有密码保护。
+PasswordLabel3=请输入密码，然后点击“下一步”继续。密码区分大小写。
+PasswordEditLabel=密码(&P)：
+IncorrectPassword=您输入的密码不正确，请重新输入。
+
+; *** “许可协议”向导页
+WizardLicense=许可协议
+LicenseLabel=请在继续安装前阅读以下重要信息。
+LicenseLabel3=请仔细阅读下列许可协议。在继续安装前您必须同意这些协议条款。
+LicenseAccepted=我同意此协议(&A)
+LicenseNotAccepted=我不同意此协议(&D)
+
+; *** “信息”向导页
+WizardInfoBefore=信息
+InfoBeforeLabel=请在继续安装前阅读以下重要信息。
+InfoBeforeClickLabel=准备好继续安装后，点击“下一步”。
+WizardInfoAfter=信息
+InfoAfterLabel=请在继续安装前阅读以下重要信息。
+InfoAfterClickLabel=准备好继续安装后，点击“下一步”。
+
+; *** “用户信息”向导页
+WizardUserInfo=用户信息
+UserInfoDesc=请输入您的信息。
+UserInfoName=用户名(&U)：
+UserInfoOrg=组织(&O)：
+UserInfoSerial=序列号(&S)：
+UserInfoNameRequired=您必须输入用户名。
+
+; *** “选择目标目录”向导页
+WizardSelectDir=选择目标位置
+SelectDirDesc=您想将 [name] 安装在哪里？
+SelectDirLabel3=安装程序将安装 [name] 到下面的文件夹中。
+SelectDirBrowseLabel=点击“下一步”继续。如果您想选择其他文件夹，点击“浏览”。
+DiskSpaceGBLabel=至少需要有 [gb] GB 的可用磁盘空间。
+DiskSpaceMBLabel=至少需要有 [mb] MB 的可用磁盘空间。
+CannotInstallToNetworkDrive=安装程序无法安装到一个网络驱动器。
+CannotInstallToUNCPath=安装程序无法安装到一个 UNC 路径。
+InvalidPath=您必须输入一个带驱动器卷标的完整路径，例如：%n%nC:\APP%n%n或UNC路径：%n%n\\server\share
+InvalidDrive=您选定的驱动器或 UNC 共享不存在或不能访问。请选择其他位置。
+DiskSpaceWarningTitle=磁盘空间不足
+DiskSpaceWarning=安装程序至少需要 %1 KB 的可用空间才能安装，但选定驱动器只有 %2 KB 的可用空间。%n%n您一定要继续吗？
+DirNameTooLong=文件夹名称或路径太长。
+InvalidDirName=文件夹名称无效。
+BadDirName32=文件夹名称不能包含下列任何字符：%n%n%1
+DirExistsTitle=文件夹已存在
+DirExists=文件夹：%n%n%1%n%n已经存在。您一定要安装到这个文件夹中吗？
+DirDoesntExistTitle=文件夹不存在
+DirDoesntExist=文件夹：%n%n%1%n%n不存在。您想要创建此文件夹吗？
+
+; *** “选择组件”向导页
+WizardSelectComponents=选择组件
+SelectComponentsDesc=您想安装哪些程序组件？
+SelectComponentsLabel2=选中您想安装的组件；取消您不想安装的组件。然后点击“下一步”继续。
+FullInstallation=完全安装
+; if possible don't translate 'Compact' as 'Minimal' (I mean 'Minimal' in your language)
+CompactInstallation=简洁安装
+CustomInstallation=自定义安装
+NoUninstallWarningTitle=组件已存在
+NoUninstallWarning=安装程序检测到下列组件已安装在您的电脑中：%n%n%1%n%n取消选中这些组件不会卸载它们。%n%n确定要继续吗？
+ComponentSize1=%1 KB
+ComponentSize2=%1 MB
+ComponentsDiskSpaceGBLabel=当前选择的组件需要至少 [gb] GB 的磁盘空间。
+ComponentsDiskSpaceMBLabel=当前选择的组件需要至少 [mb] MB 的磁盘空间。
+
+; *** “选择附加任务”向导页
+WizardSelectTasks=选择附加任务
+SelectTasksDesc=您想要安装程序执行哪些附加任务？
+SelectTasksLabel2=选择您想要安装程序在安装 [name] 时执行的附加任务，然后点击“下一步”。
+
+; *** “选择开始菜单文件夹”向导页
+WizardSelectProgramGroup=选择开始菜单文件夹
+SelectStartMenuFolderDesc=安装程序应该在哪里放置程序的快捷方式？
+SelectStartMenuFolderLabel3=安装程序将在下列“开始”菜单文件夹中创建程序的快捷方式。
+SelectStartMenuFolderBrowseLabel=点击“下一步”继续。如果您想选择其他文件夹，点击“浏览”。
+MustEnterGroupName=您必须输入一个文件夹名。
+GroupNameTooLong=文件夹名或路径太长。
+InvalidGroupName=无效的文件夹名字。
+BadGroupName=文件夹名不能包含下列任何字符：%n%n%1
+NoProgramGroupCheck2=不创建开始菜单文件夹(&D)
+
+; *** “准备安装”向导页
+WizardReady=准备安装
+ReadyLabel1=安装程序准备就绪，现在可以开始安装 [name] 到您的电脑。
+ReadyLabel2a=点击“安装”继续此安装程序。如果您想重新考虑或修改任何设置，点击“上一步”。
+ReadyLabel2b=点击“安装”继续此安装程序。
+ReadyMemoUserInfo=用户信息：
+ReadyMemoDir=目标位置：
+ReadyMemoType=安装类型：
+ReadyMemoComponents=已选择组件：
+ReadyMemoGroup=开始菜单文件夹：
+ReadyMemoTasks=附加任务：
+
+; *** TExtractionWizardPage wizard page and Extract7ZipArchive
+ExtractionLabel=正在提取附加文件...
+ButtonStopExtraction=停止提取(&S)
+StopExtraction=您确定要停止提取吗？
+ErrorExtractionAborted=提取已中止
+ErrorExtractionFailed=提取失败：%1
+
+; *** TDownloadWizardPage wizard page and DownloadTemporaryFile
+DownloadingLabel=正在下载附加文件...
+ButtonStopDownload=停止下载(&S)
+StopDownload=您确定要停止下载吗？
+ErrorDownloadAborted=下载已中止
+ErrorDownloadFailed=下载失败：%1 %2
+ErrorDownloadSizeFailed=获取下载大小失败：%1 %2
+ErrorFileHash1=校验文件哈希失败：%1
+ErrorFileHash2=无效的文件哈希：预期 %1，实际 %2
+ErrorProgress=无效的进度：%1 / %2
+ErrorFileSize=文件大小错误：预期 %1，实际 %2
+
+; *** “正在准备安装”向导页
+WizardPreparing=正在准备安装
+PreparingDesc=安装程序正在准备安装 [name] 到您的电脑。
+PreviousInstallNotCompleted=先前的程序安装或卸载未完成，您需要重启您的电脑以完成。%n%n在重启电脑后，再次运行安装程序以完成 [name] 的安装。
+CannotContinue=安装程序不能继续。请点击“取消”退出。
+ApplicationsFound=以下应用程序正在使用将由安装程序更新的文件。建议您允许安装程序自动关闭这些应用程序。
+ApplicationsFound2=以下应用程序正在使用将由安装程序更新的文件。建议您允许安装程序自动关闭这些应用程序。安装完成后，安装程序将尝试重新启动这些应用程序。
+CloseApplications=自动关闭应用程序(&A)
+DontCloseApplications=不要关闭应用程序(&D)
+ErrorCloseApplications=安装程序无法自动关闭所有应用程序。建议您在继续之前，关闭所有在使用需要由安装程序更新的文件的应用程序。
+PrepareToInstallNeedsRestart=安装程序必须重启您的计算机。计算机重启后，请再次运行安装程序以完成 [name] 的安装。%n%n是否立即重新启动？
+
+; *** “正在安装”向导页
+WizardInstalling=正在安装
+InstallingLabel=安装程序正在安装 [name] 到您的电脑，请稍候。
+
+; *** “安装完成”向导页
+FinishedHeadingLabel=[name] 安装完成
+FinishedLabelNoIcons=安装程序已在您的电脑中安装了 [name]。
+FinishedLabel=安装程序已在您的电脑中安装了 [name]。您可以通过已安装的快捷方式运行此应用程序。
+ClickFinish=点击“完成”退出安装程序。
+FinishedRestartLabel=为完成 [name] 的安装，安装程序必须重新启动您的电脑。要立即重启吗？
+FinishedRestartMessage=为完成 [name] 的安装，安装程序必须重新启动您的电脑。%n%n要立即重启吗？
+ShowReadmeCheck=是，我想查阅自述文件
+YesRadio=是，立即重启电脑(&Y)
+NoRadio=否，稍后重启电脑(&N)
+; used for example as 'Run MyProg.exe'
+RunEntryExec=运行 %1
+; used for example as 'View Readme.txt'
+RunEntryShellExec=查阅 %1
+
+; *** “安装程序需要下一张磁盘”提示
+ChangeDiskTitle=安装程序需要下一张磁盘
+SelectDiskLabel2=请插入磁盘 %1 并点击“确定”。%n%n如果这个磁盘中的文件可以在下列文件夹之外的文件夹中找到，请输入正确的路径或点击“浏览”。
+PathLabel=路径(&P)：
+FileNotInDir2=“%2”中找不到文件“%1”。请插入正确的磁盘或选择其他文件夹。
+SelectDirectoryLabel=请指定下一张磁盘的位置。
+
+; *** 安装状态消息
+SetupAborted=安装程序未完成安装。%n%n请修正这个问题并重新运行安装程序。
+AbortRetryIgnoreSelectAction=选择操作
+AbortRetryIgnoreRetry=重试(&T)
+AbortRetryIgnoreIgnore=忽略错误并继续(&I)
+AbortRetryIgnoreCancel=关闭安装程序
+
+; *** 安装状态消息
+StatusClosingApplications=正在关闭应用程序...
+StatusCreateDirs=正在创建目录...
+StatusExtractFiles=正在解压缩文件...
+StatusCreateIcons=正在创建快捷方式...
+StatusCreateIniEntries=正在创建 INI 条目...
+StatusCreateRegistryEntries=正在创建注册表条目...
+StatusRegisterFiles=正在注册文件...
+StatusSavingUninstall=正在保存卸载信息...
+StatusRunProgram=正在完成安装...
+StatusRestartingApplications=正在重启应用程序...
+StatusRollback=正在撤销更改...
+
+; *** 其他错误
+ErrorInternal2=内部错误：%1
+ErrorFunctionFailedNoCode=%1 失败
+ErrorFunctionFailed=%1 失败；错误代码 %2
+ErrorFunctionFailedWithMessage=%1 失败；错误代码 %2.%n%3
+ErrorExecutingProgram=无法执行文件：%n%1
+
+; *** 注册表错误
+ErrorRegOpenKey=打开注册表项时出错：%n%1\%2
+ErrorRegCreateKey=创建注册表项时出错：%n%1\%2
+ErrorRegWriteKey=写入注册表项时出错：%n%1\%2
+
+; *** INI 错误
+ErrorIniEntry=在文件“%1”中创建 INI 条目时出错。
+
+; *** 文件复制错误
+FileAbortRetryIgnoreSkipNotRecommended=跳过此文件(&S) (不推荐)
+FileAbortRetryIgnoreIgnoreNotRecommended=忽略错误并继续(&I) (不推荐)
+SourceIsCorrupted=源文件已损坏
+SourceDoesntExist=源文件“%1”不存在
+ExistingFileReadOnly2=无法替换现有文件，它是只读的。
+ExistingFileReadOnlyRetry=移除只读属性并重试(&R)
+ExistingFileReadOnlyKeepExisting=保留现有文件(&K)
+ErrorReadingExistingDest=尝试读取现有文件时出错：
+FileExistsSelectAction=选择操作
+FileExists2=文件已经存在。
+FileExistsOverwriteExisting=覆盖已存在的文件(&O)
+FileExistsKeepExisting=保留现有的文件(&K)
+FileExistsOverwriteOrKeepAll=为所有冲突文件执行此操作(&D)
+ExistingFileNewerSelectAction=选择操作
+ExistingFileNewer2=现有的文件比安装程序将要安装的文件还要新。
+ExistingFileNewerOverwriteExisting=覆盖已存在的文件(&O)
+ExistingFileNewerKeepExisting=保留现有的文件(&K) (推荐)
+ExistingFileNewerOverwriteOrKeepAll=为所有冲突文件执行此操作(&D)
+ErrorChangingAttr=尝试更改下列现有文件的属性时出错：
+ErrorCreatingTemp=尝试在目标目录创建文件时出错：
+ErrorReadingSource=尝试读取下列源文件时出错：
+ErrorCopying=尝试复制下列文件时出错：
+ErrorReplacingExistingFile=尝试替换现有文件时出错：
+ErrorRestartReplace=重启并替换失败：
+ErrorRenamingTemp=尝试重命名下列目标目录中的一个文件时出错：
+ErrorRegisterServer=无法注册 DLL/OCX：%1
+ErrorRegSvr32Failed=RegSvr32 失败；退出代码 %1
+ErrorRegisterTypeLib=无法注册类库：%1
+
+; *** 卸载显示名字标记
+; used for example as 'My Program (32-bit)'
+UninstallDisplayNameMark=%1 (%2)
+; used for example as 'My Program (32-bit, All users)'
+UninstallDisplayNameMarks=%1 (%2, %3)
+UninstallDisplayNameMark32Bit=32 位
+UninstallDisplayNameMark64Bit=64 位
+UninstallDisplayNameMarkAllUsers=所有用户
+UninstallDisplayNameMarkCurrentUser=当前用户
+
+; *** 安装后错误
+ErrorOpeningReadme=尝试打开自述文件时出错。
+ErrorRestartingComputer=安装程序无法重启电脑，请手动重启。
+
+; *** 卸载消息
+UninstallNotFound=文件“%1”不存在。无法卸载。
+UninstallOpenError=文件“%1”不能被打开。无法卸载。
+UninstallUnsupportedVer=此版本的卸载程序无法识别卸载日志文件“%1”的格式。无法卸载
+UninstallUnknownEntry=卸载日志中遇到一个未知条目 (%1)
+ConfirmUninstall=您确认要完全移除 %1 及其所有组件吗？
+UninstallOnlyOnWin64=仅允许在 64 位 Windows 中卸载此程序。
+OnlyAdminCanUninstall=仅使用管理员权限的用户能完成此卸载。
+UninstallStatusLabel=正在从您的电脑中移除 %1，请稍候。
+UninstalledAll=已顺利从您的电脑中移除 %1。
+UninstalledMost=%1 卸载完成。%n%n有部分内容未能被删除，但您可以手动删除它们。
+UninstalledAndNeedsRestart=为完成 %1 的卸载，需要重启您的电脑。%n%n立即重启电脑吗？
+UninstallDataCorrupted=文件“%1”已损坏。无法卸载
+
+; *** 卸载状态消息
+ConfirmDeleteSharedFileTitle=删除共享的文件吗？
+ConfirmDeleteSharedFile2=系统表示下列共享的文件已不有其他程序使用。您希望卸载程序删除这些共享的文件吗？%n%n如果删除这些文件，但仍有程序在使用这些文件，则这些程序可能出现异常。如果您不能确定，请选择“否”，在系统中保留这些文件以免引发问题。
+SharedFileNameLabel=文件名：
+SharedFileLocationLabel=位置：
+WizardUninstalling=卸载状态
+StatusUninstalling=正在卸载 %1...
+
+; *** Shutdown block reasons
+ShutdownBlockReasonInstallingApp=正在安装 %1。
+ShutdownBlockReasonUninstallingApp=正在卸载 %1。
+
+; The custom messages below aren't used by Setup itself, but if you make
+; use of them in your scripts, you'll want to translate them.
+
+[CustomMessages]
+
+NameAndVersion=%1 版本 %2
+AdditionalIcons=附加快捷方式：
+CreateDesktopIcon=创建桌面快捷方式(&D)
+CreateQuickLaunchIcon=创建快速启动栏快捷方式(&Q)
+ProgramOnTheWeb=%1 网站
+UninstallProgram=卸载 %1
+LaunchProgram=运行 %1
+AssocFileExtension=将 %2 文件扩展名与 %1 建立关联(&A)
+AssocingFileExtension=正在将 %2 文件扩展名与 %1 建立关联...
+AutoStartProgramGroupDescription=启动：
+AutoStartProgram=自动启动 %1
+AddonHostProgramNotFound=您选择的文件夹中无法找到 %1。%n%n您要继续吗？

resources/docs/MAA_config_info.txt

@@ -6,11 +6,21 @@
 "TaskQueue.Recruiting.IsChecked": "True"        #自动公招
 "TaskQueue.Base.IsChecked": "True"      #基建换班
 "TaskQueue.Combat.IsChecked": "True"        #刷理智
-"TaskQueue.Mission.IsChecked": "True"       #领取奖励
 "TaskQueue.Mall.IsChecked": "True"       #获取信用及购物
+"TaskQueue.Mission.IsChecked": "True"       #领取奖励
 "TaskQueue.AutoRoguelike.IsChecked": "False"        #自动肉鸽
 "TaskQueue.Reclamation.IsChecked": "False"      #生息演算
+"TaskQueue.Order.WakeUp": "0"
+"TaskQueue.Order.Recruiting": "1"
+"TaskQueue.Order.Base": "2"
+"TaskQueue.Order.Combat": "3"
+"TaskQueue.Order.Mall": "4"
+"TaskQueue.Order.Mission": "5"
+"TaskQueue.Order.AutoRoguelike": "6"
+"TaskQueue.Order.Reclamation": "7"
 #刷理智
+"MainFunction.UseMedicine": "True"        #吃理智药
+"MainFunction.UseMedicine.Quantity": "999"        #吃理智药数量
 "MainFunction.Stage1": ""        #主关卡
 "MainFunction.Stage2": ""        #备选关卡1
 "MainFunction.Stage3": ""        #备选关卡2
@@ -28,14 +38,16 @@
 "Penguin.EnablePenguin": "True"        #上报企鹅物流
 "Yituliu.EnableYituliu": "True"        #上报一图流
 #基建换班
-"Infrast.CustomInfrastEnabled": "True"        #启用自定义基建配置
-"Infrast.CustomInfrastPlanIndex": "1"        #自定义基建配置索引
+"Infrast.InfrastMode": "Normal"、"Rotation"、"Custom"        #基建模式
+"Infrast.CustomInfrastPlanIndex": "1"        #自定义基建配置索引号
 "Infrast.DefaultInfrast": "user_defined"        #内置配置
 "Infrast.IsCustomInfrastFileReadOnly": "False"        #自定义基建配置文件只读
 "Infrast.CustomInfrastFile": ""        #自定义基建配置文件地址
 #设置
 "Start.ClientType": "Bilibili"、 "Official"        #服务器
 G"Timer.Timer1": "False"        #时间设置1
+"Connect.AdbPath"        #ADB路径
+"Connect.Address": "127.0.0.1:16448"        #连接地址
 G"VersionUpdate.ScheduledUpdateCheck": "True"        #定时检查更新
 G"VersionUpdate.AutoDownloadUpdatePackage": "True"        #自动下载更新包
 G"VersionUpdate.AutoInstallUpdatePackage": "True"        #自动安装更新包
@@ -44,4 +56,6 @@ G"Start.MinimizeDirectly": "True"        #启动MAA后直接最小化
 "Start.OpenEmulatorAfterLaunch": "True"        #启动MAA后自动开启模拟器
 G"GUI.UseTray": "True"        #显示托盘图标
 G"GUI.MinimizeToTray": "False"        #最小化时隐藏至托盘
-"Start.EmulatorPath"        #模拟器路径
+"Start.EmulatorPath"        #模拟器路径
+"Start.EmulatorAddCommand": "-v 2"        #附加命令
+G"VersionUpdate.package": "MirrorChyanAppv5.15.6.zip"        #更新包标识

resources/version.json

@@ -1,14 +1,31 @@
 {
-    "main_version": "4.2.5.1",
-    "updater_version": "1.1.2.1",
-    "announcement": "\n## 新增功能\n- 暂无\n## 修复BUG\n- 修复统计信息HTML模板公招匹配错误\n## 程序优化\n- 暂无",
-    "proxy_list": [
-        "",
-        "https://gitproxy.click/",
-        "https://cdn.moran233.xyz/",
-        "https://gh.llkk.cc/",
-        "https://github.akams.cn/",
-        "https://www.ghproxy.cn/",
-        "https://ghfast.top/"
-    ]
+    "main_version": "4.3.8.2",
+    "version_info": {
+        "4.3.8.2": {
+            "修复bug": [
+                "日志分析忽略MAA超时提示"
+            ]
+        },
+        "4.3.8.1": {
+            "新增功能": [
+                "自定义基建显示配置名称 #46",
+                "主调度台添加仅一次电源任务"
+            ],
+            "修复bug": [
+                "电源相关选项改为所有任务完成后生效",
+                "适配MAAv5.16.3的ADB报错信息更改"
+            ],
+            "程序优化": [
+                "UI样式优化，进一步适配win10主题"
+            ]
+        },
+        "4.3.7.0": {
+            "新增功能": [
+                "下载器支持完整mirrorc列表"
+            ],
+            "程序优化": [
+                "重构更新逻辑，去除独立更新器"
+            ]
+        }
+    }
 }