chore(utils): 修改代理优先级

This reverts commit 662eb0bc7f.

.github/workflows/build-app.yml

@@ -26,11 +26,6 @@ on:
     paths-ignore:
       - '**.md'
       - 'LICENSE'
-  pull_request:
-    branches: [ "main" ]
-    paths-ignore:
-      - '**.md'
-      - 'LICENSE'
 
 permissions:
   contents: read

.github/workflows/build-pre.yml

@@ -0,0 +1,153 @@
+#   <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 }}

README.md

@@ -27,14 +27,15 @@ MAA多账号管理与自动化软件
 
 1. **配置：** 根据对应用户的配置信息，生成配置文件并将其导入MAA。
 2. **监测：** 在MAA开始代理后，持续读取MAA的日志以判断其运行状态。当软件认定MAA出现异常时，通过重启MAA使之仍能继续完成任务。
-3. **循环：** 重复上述步骤，使MAA依次完成各个用户的日常代理任务。
+3. **循环：** 重复上述步骤，使MAA依次完成各个用户的自动代理任务。
 
 ### 优势
 
 - **节省运行开销：** 只需要一份MAA软件与一个模拟器，无需多开就能完成多账号代理，羸弱的电脑也能代理日常。
-- **自定义空间大：** 依靠高级用户配置模式，支持MAA几乎所有设置选项自定义，同时保留对模拟器多开的支持。
+- **自定义空间大：** 依靠高级用户配置模式，支持MAA几乎所有设置选项自定义，支持模拟器多开。
+- **调度方法自由：** 通过调度队列功能，自由实现MAA多开等多种调度方式。
 - **一键代理无忧：** 无须中途手动修改MAA配置，将繁琐交给AUTO_MAA，把游戏留给自己。
-- **代理结果复核：** 通过人工排查功能核实各用户代理情况，堵住日常代理的最后一丝风险。
+- **代理结果复核：** 通过人工排查功能核实各用户代理情况，堵住自动代理的最后一丝风险。
 
 ## 重要声明
 
@@ -44,8 +45,7 @@ MAA多账号管理与自动化软件
 - **使用：** AUTO_MAA使用者可以按自己的意愿自由使用本软件。依据GPL，对于由此可能产生的损失，AUTO_MAA项目组不负任何责任。
 - **分发：** AUTO_MAA允许任何人自由分发本软件，包括进行商业活动牟利。若为直接分发本软件，必须遵循GPL向接收者提供本软件项目地址、完整的软件源码与GPL协议原文（件）；若为修改软件后进行分发，必须遵循GPL向接收者提供本软件项目地址、修改前的完整软件源码副本与GPL协议原文（件），违反者可能会被追究法律责任。
 - **传播：** AUTO_MAA原则上允许传播者自由传播本软件，但无论在何种传播过程中，不得删除项目作者与开发者所留版权声明，不得隐瞒项目作者与相关开发者的存在。由于软件性质，项目组不希望发现任何人在明日方舟官方媒体（包括官方媒体账号与森空岛社区等）或明日方舟游戏相关内容（包括同好群、线下活动与游戏内容讨论等）下提及AUTO_MAA或MAA，希望各位理解。
-- **衍生：** AUTO_MAA允许任何人对软件本体或软件部分代码进行二次开发或利用。但依据GPL，相关成果也必须使用GPL开源。
-- **授权：** 如果希望在使用AUTO_MAA的相关成果后仍保持自己的项目闭源，请在Issues中说明来意。得到项目组认可后，我们可以提供另一份使用不同协议的代码，此协议主要内容如下：被授权者可以自由使用该代码并维持闭源；被授权者必须定期为AUTO_MAA作出贡献。
+- **衍生：** AUTO_MAA允许任何人对软件本体或软件部分代码进行二次开发或利用。但依据GPL，相关成果再次分发时也必须使用GPL或兼容的协议开源。
 - **贡献：** 不论是直接参与软件的维护编写，或是撰写文档、测试、反馈BUG、给出建议、参与讨论，都为AUTO_MAA项目的发展完善做出了不可忽视的贡献。项目组提倡各位贡献者遵照GitHub开源社区惯例，发布Issues参与项目。避免私信或私发邮件（安全性漏洞或敏感问题除外），以帮助更多用户。
 
 以上细则是本项目对GPL的相关补充与强调。未提及的以GPL为准，发生冲突的以本细则为准。如有不清楚的部分，请发Issues询问。若发生纠纷，相关内容也没有在Issues上提及的，项目组拥有最终解释权。
@@ -67,13 +67,11 @@ MAA多账号管理与自动化软件
 ### 下载MAA
 
 - 什么是MAA？    [官网](https://maa.plus/)/[GitHub](https://github.com/MaaAssistantArknights/MaaAssistantArknights)
-
 - MAA下载地址    [GitHub下载](https://github.com/MaaAssistantArknights/MaaAssistantArknights/releases)
 
 ### 安装MAA
 
 - 将MAA压缩包解压至任意普通文件夹即可。
-
 - 若为首次安装MAA，请双击`MAA.exe`启动MAA程序以生成MAA配置文件。
 
 ### 下载AUTO_MAA [![](https://img.shields.io/github/downloads/DLmaster361/AUTO_MAA/total?color=66ccff)](https://github.com/DLmaster361/AUTO_MAA/releases)
@@ -95,58 +93,46 @@ MAA多账号管理与自动化软件
 
     首次启动时会要求设置管理密钥。
 
-    管理密钥是解密用户密码的唯一凭证，与数据库绑定。
+    管理密钥是解密用户密码的唯一凭证，与用户数据库绑定。
     密钥丢失或data/key/目录下任一文件损坏都将导致解密无法正常进行。
 
     本项目采用自主开发的混合加密模式，项目组也无法找回您的管理密钥或修复data/key/目录下的文件。
-    如果不幸的事发生，建议您删除data/key/目录与data/data.db文件后重新录入信息。
+    如果不幸的事发生，建议您删除data/key目录与config目录后重新录入信息。
 ```
 
 ### 配置信息
 
-#### 设置MAA
+#### 设置脚本实例
 
-1. 通过`浏览`绑定MAA后，单击`设置MAA`进行MAA全局设置。
-
-2. 在打开的MAA界面完成`性能设置`、`游戏设置`、`连接设置`、`启动设置`、`界面设置`、`软件更新`等基本配置以及代理任务的详细配置。
-
-3. 完成基本配置后，关闭MAA页面，AUTO_MAA会自动保存您的配置。
+1. 单击`+`并选择`MAA`以添加MAA脚本实例。
+2. 在`MAA目录`选项卡中通过`选择文件夹`打开MAA软件目录以绑定MAA。
+3. 在`MAA全局配置`选项卡中通过`设置`进行MAA全局设置。在打开的MAA界面完成`性能设置`、`游戏设置`、`连接设置`、`启动设置`、`界面设置`、`软件更新`等基本配置以及代理任务的详细配置。
+4. 完成基本配置后，关闭MAA页面，AUTO_MAA会自动保存您的配置。
 
 - 注意：在MAA的设置过程中，若MAA要求`立刻重启应用更改`，请选择`稍后`。否则，MAA重启后的一切更改都不会被程序记录。
 
-- 特别的，您需要确保自己：
+- 特别的，在设置MAA过程中，您需要确保自己：
+  - 在`切换配置`选项卡中选择了`Default`项。
   - 取消勾选`开机自启动MAA`。
   - 配置自己模拟器所在的位置并根据实际情况填写`等待模拟器启动时间`（建议预留10s以防意外）。
   - 如果是模拟器多开用户，还需要填写`附加命令`，具体填写值参见多开模拟器对应快捷方式路径（如`-v 1`）。
 
 ![MAA配置](https://github.com/DLmaster361/AUTO_MAA/blob/main/resources/images/README/MAA配置.png "MAA配置")
 
-#### 设置AUTO_MAA
-
-本项目已基本完成GUI开发，您可以直接在设置页配置AUTO_MAA相关信息，页面简介如下：
-- `MAA路径`：该项无法直接编辑，仅用于展示当前程序所绑定MAA的路径。
-- `浏览`：选择MAA文件夹。
-- `设置MAA`：编辑MAA全局配置，具体使用方法参见前文。
-- `日常限制`：执行日常代理的日常部分时的超时阈值，当MAA日志无变化时间超过阈值时，视为超时。
-- `剿灭限制`：执行日常代理的剿灭部分时的超时阈值，当MAA日志无变化时间超过阈值时，视为超时。
-- `运行失败重试次数上限`：对于每一用户，若超过该次数限制仍未完成代理，视为代理失败。
-- `开机自动启动AUTO_MAA`：实现AUTO_MAA的自启动。
-- `AUTO_MAA启动时禁止电脑休眠`：仅阻止电脑自动休眠，不会影响屏幕是否熄灭。
-- `启动AUTO_MAA后直接代理`：在AUTO_MAA启动后立即执行代理任务。
-- `通过邮件通知结果`：在AUTO_MAA完成任务后将结果发送至用户指定邮箱。
-- `检查版本更新`：从GitHub镜像源获取版本更新信息，并调起更新器完成程序更新，更新器已支持多个代理地址。
-- `修改管理密钥`：修改管理密钥，当用户列表中无用户时，将跳过验证旧管理密钥。
 
 #### 设置用户配置
 
-本项目已基本完成GUI开发，您可以直接在用户管理页配置用户相关信息，页面简介如下：
-- `新建`、`删除`：新建一个用户到当前用户配置列表、删除当前所选第一行所对应的用户。
-- `转为高级/简洁`：将当前所选第一行所对应的用户转为高级/简洁配置模式。
+每一个脚本实例都有独立的用户数据库，您可以直接在`用户列表`选项卡配置用户相关信息，页面简介如下：
+- `新建用户`、`删除用户`：新建一个用户到当前用户配置列表、删除当前所选第一行所对应的用户。
+- `向上移动`、`向下移动`：移动用户位置，用户位置即代理顺序。
+- `模式转换`：将当前所选第一行所对应的用户转为高级/简洁配置模式。
+- `用户选项配置`：选择用户与对应配置项目，执行对应配置流程。
+  - `自定义基建`：选择自定义基建配置文件。
+  - `日常`、`剿灭`：打开MAA界面进行设置，设置方法与MAA全局配置相同。
 - `显示密码`：输入管理密钥以显示用户密码，仅当管理密钥正确时能够修改`密码栏目`。
-- `刷新`：清除临时保存的管理密钥。
 - `简洁用户配置列表`：仅支持核心代理选项的设置，其它设置选项沿用MAA的全局设置，部分代理核心功能选项由程序托管。
-- `高级用户配置列表`：支持几乎所有代理选项的设置，通过`修改配置`进行MAA自定义，仅部分代理核心功能选项由程序托管。
-- `用户配置列表栏目`：详解如下：
+- `高级用户配置列表`：支持几乎所有代理选项的设置，通过`用户选项配置`进行MAA自定义，仅部分代理核心功能选项由程序托管。
+- `用户配置列表栏目`详解如下：
   - `用户名`：展示在执行界面的用户名，用于区分不同用户。
   - `账号ID`：MAA进行账号切换所需的凭据，官服用户请输入手机号码、B服请输入B站ID。
   - `服务器`：当前支持官服、B服。
@@ -154,8 +140,8 @@ MAA多账号管理与自动化软件
   - `状态`：用户的状态，禁用时将不再对其进行代理或排查。
   - `执行情况`：当日执行情况，不可编辑。
   - `关卡`、`备选关卡-1`、`备选关卡-2`：关卡号。
-  - `日常`：单独设定是否进行日常代理的日常部分，可进一步配置MAA的具体代理任务，该配置与全局MAA配置相互独立。
-  - `剿灭`：单独设定是否进行日常代理的剿灭部分，高级配置模式下可进一步配置MAA的具体代理任务，该配置与全局MAA配置相互独立。
+  - `日常`：单独设定是否进行自动代理的日常部分，可进一步配置MAA的具体代理任务，该配置与全局MAA配置相互独立。
+  - `剿灭`：单独设定是否进行自动代理的剿灭部分，高级配置模式下可进一步配置MAA的具体代理任务，该配置与全局MAA配置相互独立。
   - `自定义基建`：是否启用自定义基建功能，需要进一步配置自定义基建文件，该配置与其他用户相互独立。
   - `密码`：仅用于登记用户的密码，可留空。
   - `备注`：用于备注用户信息。
@@ -167,42 +153,45 @@ MAA多账号管理与自动化软件
 
 ![gameid](https://github.com/DLmaster361/AUTO_MAA/blob/main/resources/images/README/gameid.png "gameid")
 
+#### 设置调度队列
+
+- 单个调度队列可包含至多10个定时与至多10个任务实例。
+- 调度队列状态为关闭时，将不会定时启动该调度队列，但仍能在主调度台直接运行该调度队列。
+- 同一调度队列内任务实例被依次挨个调起运行，非同一调度队列内的不同任务实例可被同时调起。
+- 同一时间内，任何脚本实例或调度队列都不会被重复调起，若某一任务运行时发现同一任务已在运行，将自动跳过。
+
+#### 设置AUTO_MAA
+
+- 详见软件中对应选项卡的注解。
+
 ## 运行代理任务
 
 ### 直接运行
 
-- 在执行页单击`立即执行`直接运行。
+- 在`调度中心`的`主调度台`选择对应任务与`自动代理`模式，单击`开始任务`即可开始代理。
 
 ### 定时运行
 
-- 在执行页的`定时执行`栏设置时间。
-
-- 保持软件打开，软件会在设定的时间自动运行。
+- 将调度队列状态设为开启，并在`定时`选项卡设置定时启动时间。
+- 保持软件开启，软件会在设定的时间自动运行。
 
 ## 人工排查代理结果
 
 ### 直接开始人工排查
 
-- 在执行页单击`开始排查`启动排查进程。
-
+- 在`调度中心`的`主调度台`选择对应任务与`人工排查`模式，单击`开始任务`即可开始人工排查。
 - 软件将调起MAA，依次登录各用户的账号。
-
 - 完成PRTS登录后，请人工检查代理情况，可以手动完成未代理的任务。
-
 - 在对话框中单击对应账号的代理情况。
-
 - 结束人工排查后，相应排查情况将被写入用户管理页的`备注栏目`。
 
 ---
 
 # 关于
 
-## 未来开发方向
+## 项目开发情况
 
-- [ ] 尝试接入更多开源社区成果
-- [ ] 支持对MAA运行状况的进一步识别
-- [x] 添加更多通知手段
-- [ ] GUI界面美化
+可在[《AUTO_MAA开发者协作文档》](https://docs.qq.com/aio/DQ3Z5eHNxdmxFQmZX)的`开发任务`页面中查看开发进度。
 
 ## 贡献者
 
@@ -224,7 +213,7 @@ MAA多账号管理与自动化软件
 
 欢迎加入AUTO_MAA项目组，欢迎反馈bug
 
-- QQ群：[957750551](https://qm.qq.com/cgi-bin/qm/qr?k=EET-OL_o52KPlDLEmbzaNkKUXuyQ4WZY&jump_from=webapi&authKey=6NxGwEu9JAOLHqfdEmNfrZy4tUvC/3ar2j5+Go7Hgf3j+ntAK1VS6SUOLOjYVKTt)
+- QQ群：[957750551](https://qm.qq.com/q/bd9fISNoME)
 
 ---
 

app/__init__.py

@@ -29,18 +29,23 @@ __version__ = "4.2.0"
 __author__ = "DLmaster361 <DLmaster_361@163.com>"
 __license__ = "GPL-3.0 license"
 
-from .config import AppConfig
+from .core import AppConfig, QueueConfig, MaaConfig, Task, Task_manager, Main_timer
 from .models import MaaManager
-from .services import Notification, CryptoHandler
+from .services import Notify, Crypto, System
 from .ui import AUTO_MAA
-from .utils import Updater, version_text
+from .utils import Updater
 
 __all__ = [
     "AppConfig",
+    "QueueConfig",
+    "MaaConfig",
+    "Task",
+    "Task_manager",
+    "Main_timer",
     "MaaManager",
-    "Notification",
-    "CryptoHandler",
+    "Notify",
+    "Crypto",
+    "System",
     "AUTO_MAA",
     "Updater",
-    "version_text",
 ]

app/config.py

@@ -1,240 +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配置管理
-v4.2
-作者：DLmaster_361
-"""
-
-import sqlite3
-import json
-import os
-import sys
-from pathlib import Path
-from typing import Dict, Union
-
-
-class AppConfig:
-
-    def __init__(self) -> None:
-
-        self.app_path = Path.cwd()  # 获取软件根目录
-        self.app_path_sys = os.path.realpath(sys.argv[0])  # 获取软件自身的路径
-        self.app_name = os.path.basename(self.app_path)  # 获取软件自身的名称
-
-        self.database_path = self.app_path / "data/data.db"
-        self.config_path = self.app_path / "config/gui.json"
-        self.key_path = self.app_path / "data/key"
-        self.gameid_path = self.app_path / "data/gameid.txt"
-        self.version_path = self.app_path / "resources/version.json"
-
-        # 检查文件完整性
-        self.initialize()
-
-    def initialize(self) -> None:
-        """初始化程序的配置文件"""
-
-        # 检查目录
-        (self.app_path / "config").mkdir(parents=True, exist_ok=True)
-        (self.app_path / "data/MAAconfig/simple").mkdir(parents=True, exist_ok=True)
-        (self.app_path / "data/MAAconfig/beta").mkdir(parents=True, exist_ok=True)
-        (self.app_path / "data/MAAconfig/Default").mkdir(parents=True, exist_ok=True)
-
-        # 生成版本信息文件
-        if not self.version_path.exists():
-            version = {
-                "main_version": "0.0.0.0",
-                "updater_version": "0.0.0.0",
-            }
-            with self.version_path.open(mode="w", encoding="utf-8") as f:
-                json.dump(version, f, indent=4)
-
-        # 生成配置文件
-        if not self.config_path.exists():
-            config = {"Default": {}}
-            with self.config_path.open(mode="w", encoding="utf-8") as f:
-                json.dump(config, f, indent=4)
-
-        # 生成预设gameid替换方案文件
-        if not self.gameid_path.exists():
-            self.gameid_path.write_text(
-                "龙门币：CE-6\n技能：CA-5\n红票：AP-5\n经验：LS-6\n剿灭模式：Annihilation",
-                encoding="utf-8",
-            )
-
-        self.check_config()
-        self.check_database()
-
-    def check_config(self) -> None:
-        """检查配置文件字段完整性并补全"""
-
-        config_list = [
-            ["TimeSet.set1", "False"],
-            ["TimeSet.run1", "00:00"],
-            ["TimeSet.set2", "False"],
-            ["TimeSet.run2", "00:00"],
-            ["TimeSet.set3", "False"],
-            ["TimeSet.run3", "00:00"],
-            ["TimeSet.set4", "False"],
-            ["TimeSet.run4", "00:00"],
-            ["TimeSet.set5", "False"],
-            ["TimeSet.run5", "00:00"],
-            ["TimeSet.set6", "False"],
-            ["TimeSet.run6", "00:00"],
-            ["TimeSet.set7", "False"],
-            ["TimeSet.run7", "00:00"],
-            ["TimeSet.set8", "False"],
-            ["TimeSet.run8", "00:00"],
-            ["TimeSet.set9", "False"],
-            ["TimeSet.run9", "00:00"],
-            ["TimeSet.set10", "False"],
-            ["TimeSet.run10", "00:00"],
-            ["MaaSet.path", ""],
-            ["TimeLimit.routine", 10],
-            ["TimeLimit.annihilation", 40],
-            ["TimesLimit.run", 3],
-            ["SelfSet.IfSelfStart", "False"],
-            ["SelfSet.IfSleep", "False"],
-            ["SelfSet.IfProxyDirectly", "False"],
-            ["SelfSet.IfSendMail", "False"],
-            ["SelfSet.MailAddress", ""],
-            ["SelfSet.IfSendMail.OnlyError", "False"],
-            ["SelfSet.IfSilence", "False"],
-            ["SelfSet.BossKey", ""],
-            ["SelfSet.IfToTray", "False"],
-            ["SelfSet.UIsize", "1200x700"],
-            ["SelfSet.UIlocation", "100x100"],
-            ["SelfSet.UImaximized", "False"],
-            ["SelfSet.MainIndex", 2],
-        ]
-
-        # 导入配置文件
-        with self.config_path.open(mode="r", encoding="utf-8") as f:
-            config = json.load(f)
-
-        # 检查并补充缺失的字段
-        for i in range(len(config_list)):
-            if not config_list[i][0] in config["Default"]:
-                config["Default"][config_list[i][0]] = config_list[i][1]
-
-        # 初始化配置信息
-        self.content: Dict[str, Dict[str, Union[str, int]]] = config
-
-        # 导出配置文件
-        self.save_config()
-
-    def check_database(self) -> None:
-        """检查用户数据库文件并处理数据库版本更新"""
-
-        # 生成用户数据库
-        if not self.database_path.exists():
-            db = sqlite3.connect(self.database_path)
-            cur = db.cursor()
-            cur.execute(
-                "CREATE TABLE adminx(admin text,id text,server text,day int,status text,last date,game text,game_1 text,game_2 text,routine text,annihilation text,infrastructure text,password byte,notes text,numb int,mode text,uid int)"
-            )
-            cur.execute("CREATE TABLE version(v text)")
-            cur.execute("INSERT INTO version VALUES(?)", ("v1.3",))
-            db.commit()
-            cur.close()
-            db.close()
-
-        # 数据库版本更新
-        db = sqlite3.connect(self.database_path)
-        cur = db.cursor()
-        cur.execute("SELECT * FROM version WHERE True")
-        version = cur.fetchall()
-        # v1.0-->v1.1
-        if version[0][0] == "v1.0":
-            cur.execute("SELECT * FROM adminx WHERE True")
-            data = cur.fetchall()
-            cur.execute("DROP TABLE IF EXISTS adminx")
-            cur.execute(
-                "CREATE TABLE adminx(admin text,id text,server text,day int,status text,last date,game text,game_1 text,game_2 text,routines text,annihilation text,infrastructure text,password byte,notes text,numb int,mode text,uid int)"
-            )
-            for i in range(len(data)):
-                cur.execute(
-                    "INSERT INTO adminx VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)",
-                    (
-                        data[i][0],  # 0 0 0
-                        data[i][1],  # 1 1 -
-                        "Official",  # 2 2 -
-                        data[i][2],  # 3 3 1
-                        data[i][3],  # 4 4 2
-                        data[i][4],  # 5 5 3
-                        data[i][5],  # 6 6 -
-                        data[i][6],  # 7 7 -
-                        data[i][7],  # 8 8 -
-                        "y",  # 9 - 4
-                        data[i][8],  # 10 9 5
-                        data[i][9],  # 11 10 -
-                        data[i][10],  # 12 11 6
-                        data[i][11],  # 13 12 7
-                        data[i][12],  # 14 - -
-                        "simple",  # 15 - -
-                        data[i][13],  # 16 - -
-                    ),
-                )
-            cur.execute("DELETE FROM version WHERE v = ?", ("v1.0",))
-            cur.execute("INSERT INTO version VALUES(?)", ("v1.1",))
-            db.commit()
-        # v1.1-->v1.2
-        if version[0][0] == "v1.1":
-            cur.execute("SELECT * FROM adminx WHERE True")
-            data = cur.fetchall()
-            for i in range(len(data)):
-                cur.execute(
-                    "UPDATE adminx SET infrastructure = 'n' WHERE mode = ? AND uid = ?",
-                    (
-                        data[i][15],
-                        data[i][16],
-                    ),
-                )
-            cur.execute("DELETE FROM version WHERE v = ?", ("v1.1",))
-            cur.execute("INSERT INTO version VALUES(?)", ("v1.2",))
-            db.commit()
-        # v1.2-->v1.3
-        if version[0][0] == "v1.2":
-            cur.execute("ALTER TABLE adminx RENAME COLUMN routines TO routine")
-            cur.execute("DELETE FROM version WHERE v = ?", ("v1.2",))
-            cur.execute("INSERT INTO version VALUES(?)", ("v1.3",))
-            db.commit()
-        cur.close()
-        db.close()
-
-    def open_database(self) -> None:
-        """打开数据库"""
-
-        self.db = sqlite3.connect(self.database_path)
-        self.cur = self.db.cursor()
-
-    def close_database(self) -> None:
-        """关闭数据库"""
-
-        self.cur.close()
-        self.db.close()
-
-    def save_config(self) -> None:
-        """保存配置文件"""
-
-        with self.config_path.open(mode="w", encoding="utf-8") as f:
-            json.dump(self.content, f, indent=4)

app/core/__init__.py

@@ -20,19 +20,27 @@
 
 """
 AUTO_MAA
-AUTO_MAA版本号工具
+AUTO_MAA核心组件包
 v4.2
 作者：DLmaster_361
 """
 
+__version__ = "4.2.0"
+__author__ = "DLmaster361 <DLmaster_361@163.com>"
+__license__ = "GPL-3.0 license"
 
-def version_text(version_numb: list) -> str:
-    """将版本号列表转为可读的文本信息"""
+from .config import AppConfig, QueueConfig, MaaConfig, Config
+from .main_info_bar import MainInfoBar
+from .task_manager import Task, Task_manager
+from .timer import Main_timer
 
-    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
+__all__ = [
+    "AppConfig",
+    "Config",
+    "QueueConfig",
+    "MaaConfig",
+    "MainInfoBar",
+    "Task",
+    "Task_manager",
+    "Main_timer",
+]

app/core/config.py

@@ -0,0 +1,645 @@
+#   <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配置管理
+v4.2
+作者：DLmaster_361
+"""
+
+from loguru import logger
+import sqlite3
+import json
+import sys
+import shutil
+from pathlib import Path
+from qfluentwidgets import (
+    QConfig,
+    ConfigItem,
+    OptionsConfigItem,
+    RangeConfigItem,
+    FolderValidator,
+    BoolValidator,
+    RangeValidator,
+    OptionsValidator,
+    qconfig,
+)
+
+
+class AppConfig:
+
+    def __init__(self) -> None:
+
+        self.app_path = Path(sys.argv[0]).resolve().parent  # 获取软件根目录
+        self.app_path_sys = str(Path(sys.argv[0]).resolve())  # 获取软件自身的路径
+
+        self.log_path = self.app_path / "debug/AUTO_MAA.log"
+        self.database_path = self.app_path / "data/data.db"
+        self.config_path = self.app_path / "config/config.json"
+        self.history_path = self.app_path / "config/history.json"
+        self.key_path = self.app_path / "data/key"
+        self.gameid_path = self.app_path / "data/gameid.txt"
+        self.version_path = self.app_path / "resources/version.json"
+
+        self.PASSWORD = ""
+        self.running_list = []
+        self.silence_list = []
+        self.if_database_opened = False
+
+        # 检查文件完整性
+        self.initialize()
+
+    def initialize(self) -> None:
+        """初始化程序的配置文件"""
+
+        # 检查目录
+        (self.app_path / "config").mkdir(parents=True, exist_ok=True)
+        (self.app_path / "data").mkdir(parents=True, exist_ok=True)
+        (self.app_path / "debug").mkdir(parents=True, exist_ok=True)
+
+        # 生成版本信息文件
+        if not self.version_path.exists():
+            version = {
+                "main_version": "0.0.0.0",
+                "updater_version": "0.0.0.0",
+            }
+            with self.version_path.open(mode="w", encoding="utf-8") as f:
+                json.dump(version, f, ensure_ascii=False, indent=4)
+
+        # 生成预设gameid替换方案文件
+        if not self.gameid_path.exists():
+            self.gameid_path.write_text(
+                "龙门币：CE-6\n技能：CA-5\n红票：AP-5\n经验：LS-6\n剿灭模式：Annihilation",
+                encoding="utf-8",
+            )
+
+        self.init_logger()
+        self.init_config()
+        self.check_data()
+        logger.info("程序配置管理模块初始化完成")
+
+    def init_logger(self) -> None:
+        """初始化日志记录器"""
+
+        logger.remove(0)
+
+        logger.add(
+            sink=self.log_path,
+            level="DEBUG",
+            format="<green>{time:YYYY-MM-DD HH:mm:ss.SSS}</green> | <level>{level: <8}</level> | <level>{message}</level>",
+            enqueue=True,
+            backtrace=True,
+            diagnose=True,
+            rotation="1 week",
+            retention="1 month",
+            compression="zip",
+        )
+        logger.info("===================================")
+        logger.info("AUTO_MAA 主程序")
+        logger.info("版本号： v4.2.1.1")
+        logger.info(f"根目录： {self.app_path}")
+        logger.info("===================================")
+
+        logger.info("日志记录器初始化完成")
+
+    def init_config(self) -> None:
+        """初始化配置类"""
+
+        self.global_config = GlobalConfig()
+        self.queue_config = QueueConfig()
+        self.maa_config = MaaConfig()
+
+        config_list = self.search_config()
+        for config in config_list:
+            if config[0] == "Maa":
+                qconfig.load(config[1], self.maa_config)
+                self.maa_config.save()
+            elif config[0] == "Queue":
+                qconfig.load(config[1], self.queue_config)
+                self.queue_config.save()
+
+        logger.info("配置类初始化完成")
+
+    def init_database(self, mode: str) -> None:
+        """初始化用户数据库"""
+
+        if mode == "Maa":
+            self.cur.execute(
+                "CREATE TABLE adminx(admin text,id text,server text,day int,status text,last date,game text,game_1 text,game_2 text,routine text,annihilation text,infrastructure text,password byte,notes text,numb int,mode text,uid int)"
+            )
+            self.cur.execute("CREATE TABLE version(v text)")
+            self.cur.execute("INSERT INTO version VALUES(?)", ("v1.4",))
+            self.db.commit()
+
+        logger.info("用户数据库初始化完成")
+
+    def check_data(self) -> None:
+        """检查用户数据文件并处理数据文件版本更新"""
+
+        # 生成主数据库
+        if not self.database_path.exists():
+            db = sqlite3.connect(self.database_path)
+            cur = db.cursor()
+            cur.execute("CREATE TABLE version(v text)")
+            cur.execute("INSERT INTO version VALUES(?)", ("v1.4",))
+            db.commit()
+            cur.close()
+            db.close()
+
+        # 数据文件版本更新
+        db = sqlite3.connect(self.database_path)
+        cur = db.cursor()
+        cur.execute("SELECT * FROM version WHERE True")
+        version = cur.fetchall()
+
+        if version[0][0] != "v1.4":
+            logger.info("数据文件版本更新开始")
+            if_streaming = False
+            # v1.0-->v1.1
+            if version[0][0] == "v1.0" or if_streaming:
+                logger.info("数据文件版本更新：v1.0-->v1.1")
+                if_streaming = True
+                cur.execute("SELECT * FROM adminx WHERE True")
+                data = cur.fetchall()
+                cur.execute("DROP TABLE IF EXISTS adminx")
+                cur.execute(
+                    "CREATE TABLE adminx(admin text,id text,server text,day int,status text,last date,game text,game_1 text,game_2 text,routines text,annihilation text,infrastructure text,password byte,notes text,numb int,mode text,uid int)"
+                )
+                for i in range(len(data)):
+                    cur.execute(
+                        "INSERT INTO adminx VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)",
+                        (
+                            data[i][0],  # 0 0 0
+                            data[i][1],  # 1 1 -
+                            "Official",  # 2 2 -
+                            data[i][2],  # 3 3 1
+                            data[i][3],  # 4 4 2
+                            data[i][4],  # 5 5 3
+                            data[i][5],  # 6 6 -
+                            data[i][6],  # 7 7 -
+                            data[i][7],  # 8 8 -
+                            "y",  # 9 - 4
+                            data[i][8],  # 10 9 5
+                            data[i][9],  # 11 10 -
+                            data[i][10],  # 12 11 6
+                            data[i][11],  # 13 12 7
+                            data[i][12],  # 14 - -
+                            "simple",  # 15 - -
+                            data[i][13],  # 16 - -
+                        ),
+                    )
+                cur.execute("DELETE FROM version WHERE v = ?", ("v1.0",))
+                cur.execute("INSERT INTO version VALUES(?)", ("v1.1",))
+                db.commit()
+            # v1.1-->v1.2
+            if version[0][0] == "v1.1" or if_streaming:
+                logger.info("数据文件版本更新：v1.1-->v1.2")
+                if_streaming = True
+                cur.execute("SELECT * FROM adminx WHERE True")
+                data = cur.fetchall()
+                for i in range(len(data)):
+                    cur.execute(
+                        "UPDATE adminx SET infrastructure = 'n' WHERE mode = ? AND uid = ?",
+                        (
+                            data[i][15],
+                            data[i][16],
+                        ),
+                    )
+                cur.execute("DELETE FROM version WHERE v = ?", ("v1.1",))
+                cur.execute("INSERT INTO version VALUES(?)", ("v1.2",))
+                db.commit()
+            # v1.2-->v1.3
+            if version[0][0] == "v1.2" or if_streaming:
+                logger.info("数据文件版本更新：v1.2-->v1.3")
+                if_streaming = True
+                cur.execute("ALTER TABLE adminx RENAME COLUMN routines TO routine")
+                cur.execute("DELETE FROM version WHERE v = ?", ("v1.2",))
+                cur.execute("INSERT INTO version VALUES(?)", ("v1.3",))
+                db.commit()
+            # v1.3-->v1.4
+            if version[0][0] == "v1.3" or if_streaming:
+                logger.info("数据文件版本更新：v1.3-->v1.4")
+                if_streaming = True
+                (self.app_path / "config/MaaConfig").mkdir(parents=True, exist_ok=True)
+                shutil.move(
+                    self.app_path / "data/MaaConfig",
+                    self.app_path / "config/MaaConfig",
+                )
+                (self.app_path / "config/MaaConfig/MaaConfig").rename(
+                    self.app_path / "config/MaaConfig/脚本_1"
+                )
+                shutil.copy(
+                    self.database_path,
+                    self.app_path / "config/MaaConfig/脚本_1/user_data.db",
+                )
+                cur.execute("DROP TABLE IF EXISTS adminx")
+                cur.execute("DELETE FROM version WHERE v = ?", ("v1.3",))
+                cur.execute("INSERT INTO version VALUES(?)", ("v1.4",))
+                db.commit()
+                with (self.app_path / "config/gui.json").open(
+                    "r", encoding="utf-8"
+                ) as f:
+                    info = json.load(f)
+                maa_config = {
+                    "MaaSet": {
+                        "Name": "",
+                        "Path": info["Default"]["MaaSet.path"],
+                    },
+                    "RunSet": {
+                        "AnnihilationTimeLimit": info["Default"][
+                            "TimeLimit.annihilation"
+                        ],
+                        "RoutineTimeLimit": info["Default"]["TimeLimit.routine"],
+                        "RunTimesLimit": info["Default"]["TimesLimit.run"],
+                    },
+                }
+                with (self.app_path / "config/MaaConfig/脚本_1/config.json").open(
+                    "w", encoding="utf-8"
+                ) as f:
+                    json.dump(maa_config, f, ensure_ascii=False, indent=4)
+                config = {
+                    "Function": {
+                        "BossKey": info["Default"]["SelfSet.BossKey"],
+                        "IfAllowSleep": bool(
+                            info["Default"]["SelfSet.IfSleep"] == "True"
+                        ),
+                        "IfSilence": bool(
+                            info["Default"]["SelfSet.IfSilence"] == "True"
+                        ),
+                    },
+                    "Notify": {
+                        "IfPushPlyer": True,
+                        "IfSendErrorOnly": bool(
+                            info["Default"]["SelfSet.IfSendMail.OnlyError"] == "True"
+                        ),
+                        "IfSendMail": bool(
+                            info["Default"]["SelfSet.IfSendMail"] == "True"
+                        ),
+                        "MailAddress": info["Default"]["SelfSet.MailAddress"],
+                    },
+                    "Start": {
+                        "IfRunDirectly": bool(
+                            info["Default"]["SelfSet.IfProxyDirectly"] == "True"
+                        ),
+                        "IfSelfStart": bool(
+                            info["Default"]["SelfSet.IfSelfStart"] == "True"
+                        ),
+                    },
+                    "UI": {
+                        "IfShowTray": bool(
+                            info["Default"]["SelfSet.IfToTray"] == "True"
+                        ),
+                        "IfToTray": bool(info["Default"]["SelfSet.IfToTray"] == "True"),
+                        "location": info["Default"]["SelfSet.UIlocation"],
+                        "maximized": bool(
+                            info["Default"]["SelfSet.UImaximized"] == "True"
+                        ),
+                        "size": info["Default"]["SelfSet.UIsize"],
+                    },
+                    "Update": {"IfAutoUpdate": False},
+                }
+                with (self.app_path / "config/config.json").open(
+                    "w", encoding="utf-8"
+                ) as f:
+                    json.dump(config, f, ensure_ascii=False, indent=4)
+                queue_config = {
+                    "QueueSet": {"Enabled": True, "Name": ""},
+                    "Queue": {
+                        "Member_1": "脚本_1",
+                        "Member_10": "禁用",
+                        "Member_2": "禁用",
+                        "Member_3": "禁用",
+                        "Member_4": "禁用",
+                        "Member_5": "禁用",
+                        "Member_6": "禁用",
+                        "Member_7": "禁用",
+                        "Member_8": "禁用",
+                        "Member_9": "禁用",
+                    },
+                    "Time": {
+                        "TimeEnabled_0": bool(
+                            info["Default"]["TimeSet.set1"] == "True"
+                        ),
+                        "TimeEnabled_1": bool(
+                            info["Default"]["TimeSet.set2"] == "True"
+                        ),
+                        "TimeEnabled_2": bool(
+                            info["Default"]["TimeSet.set3"] == "True"
+                        ),
+                        "TimeEnabled_3": bool(
+                            info["Default"]["TimeSet.set4"] == "True"
+                        ),
+                        "TimeEnabled_4": bool(
+                            info["Default"]["TimeSet.set5"] == "True"
+                        ),
+                        "TimeEnabled_5": bool(
+                            info["Default"]["TimeSet.set6"] == "True"
+                        ),
+                        "TimeEnabled_6": bool(
+                            info["Default"]["TimeSet.set7"] == "True"
+                        ),
+                        "TimeEnabled_7": bool(
+                            info["Default"]["TimeSet.set8"] == "True"
+                        ),
+                        "TimeEnabled_8": bool(
+                            info["Default"]["TimeSet.set9"] == "True"
+                        ),
+                        "TimeEnabled_9": bool(
+                            info["Default"]["TimeSet.set10"] == "True"
+                        ),
+                        "TimeSet_0": info["Default"]["TimeSet.run1"],
+                        "TimeSet_1": info["Default"]["TimeSet.run2"],
+                        "TimeSet_2": info["Default"]["TimeSet.run3"],
+                        "TimeSet_3": info["Default"]["TimeSet.run4"],
+                        "TimeSet_4": info["Default"]["TimeSet.run5"],
+                        "TimeSet_5": info["Default"]["TimeSet.run6"],
+                        "TimeSet_6": info["Default"]["TimeSet.run7"],
+                        "TimeSet_7": info["Default"]["TimeSet.run8"],
+                        "TimeSet_8": info["Default"]["TimeSet.run9"],
+                        "TimeSet_9": info["Default"]["TimeSet.run10"],
+                    },
+                }
+                (self.app_path / "config/QueueConfig").mkdir(
+                    parents=True, exist_ok=True
+                )
+                with (self.app_path / "config/QueueConfig/调度队列_1.json").open(
+                    "w", encoding="utf-8"
+                ) as f:
+                    json.dump(queue_config, f, ensure_ascii=False, indent=4)
+                (self.app_path / "config/gui.json").unlink()
+            cur.close()
+            db.close()
+            logger.info("数据文件版本更新完成")
+
+    def search_config(self) -> list:
+        """搜索所有子配置文件"""
+
+        config_list = []
+
+        if (self.app_path / "config/MaaConfig").exists():
+            for subdir in (self.app_path / "config/MaaConfig").iterdir():
+                if subdir.is_dir():
+                    config_list.append(["Maa", subdir / "config.json"])
+
+        if (self.app_path / "config/QueueConfig").exists():
+            for json_file in (self.app_path / "config/QueueConfig").glob("*.json"):
+                config_list.append(["Queue", json_file])
+
+        return config_list
+
+    def open_database(self, mode: str, index: str = None) -> None:
+        """打开数据库"""
+
+        self.close_database()
+        self.db = sqlite3.connect(
+            self.app_path / f"config/{mode}Config/{index}/user_data.db"
+        )
+        self.cur = self.db.cursor()
+        self.if_database_opened = True
+
+    def close_database(self) -> None:
+        """关闭数据库"""
+
+        if self.if_database_opened:
+            self.cur.close()
+            self.db.close()
+        self.if_database_opened = False
+
+    def change_user_info(
+        self,
+        data_path: Path,
+        modes: list,
+        uids: list,
+        days: list,
+        lasts: list,
+        notes: list,
+        numbs: list,
+    ) -> None:
+        """将代理完成后发生改动的用户信息同步至本地数据库"""
+
+        db = sqlite3.connect(data_path / "user_data.db")
+        cur = db.cursor()
+
+        for index in range(len(uids)):
+            cur.execute(
+                "UPDATE adminx SET day = ? WHERE mode = ? AND uid = ?",
+                (days[index], modes[index], uids[index]),
+            )
+            cur.execute(
+                "UPDATE adminx SET last = ? WHERE mode = ? AND uid = ?",
+                (lasts[index], modes[index], uids[index]),
+            )
+            cur.execute(
+                "UPDATE adminx SET notes = ? WHERE mode = ? AND uid = ?",
+                (notes[index], modes[index], uids[index]),
+            )
+            cur.execute(
+                "UPDATE adminx SET numb = ? WHERE mode = ? AND uid = ?",
+                (numbs[index], modes[index], uids[index]),
+            )
+        db.commit()
+        cur.close()
+        db.close()
+
+    def save_history(self, key: str, content: dict) -> None:
+        """保存历史记录"""
+
+        history = {}
+        if self.history_path.exists():
+            with self.history_path.open(mode="r", encoding="utf-8") as f:
+                history = json.load(f)
+        history[key] = content
+        with self.history_path.open(mode="w", encoding="utf-8") as f:
+            json.dump(history, f, ensure_ascii=False, indent=4)
+
+    def get_history(self, key: str) -> dict:
+        """获取历史记录"""
+
+        history = {}
+        if self.history_path.exists():
+            with self.history_path.open(mode="r", encoding="utf-8") as f:
+                history = json.load(f)
+        return history.get(
+            key, {"Time": "0000-00-00 00:00", "History": "暂无历史运行记录"}
+        )
+
+    def clear_maa_config(self) -> None:
+        """清空MAA配置"""
+
+        self.maa_config.set(self.maa_config.MaaSet_Name, "")
+        self.maa_config.set(self.maa_config.MaaSet_Path, ".")
+        self.maa_config.set(self.maa_config.RunSet_ProxyTimesLimit, 0)
+        self.maa_config.set(self.maa_config.RunSet_AnnihilationTimeLimit, 40)
+        self.maa_config.set(self.maa_config.RunSet_RoutineTimeLimit, 10)
+        self.maa_config.set(self.maa_config.RunSet_RunTimesLimit, 3)
+        self.maa_config.set(self.maa_config.MaaSet_Name, "")
+        self.maa_config.set(self.maa_config.MaaSet_Name, "")
+        self.maa_config.set(self.maa_config.MaaSet_Name, "")
+
+    def clear_queue_config(self) -> None:
+        """清空队列配置"""
+
+        self.queue_config.set(self.queue_config.queueSet_Name, "")
+        self.queue_config.set(self.queue_config.queueSet_Enabled, False)
+
+        self.queue_config.set(self.queue_config.time_TimeEnabled_0, False)
+        self.queue_config.set(self.queue_config.time_TimeSet_0, "00:00")
+        self.queue_config.set(self.queue_config.time_TimeEnabled_1, False)
+        self.queue_config.set(self.queue_config.time_TimeSet_1, "00:00")
+        self.queue_config.set(self.queue_config.time_TimeEnabled_2, False)
+        self.queue_config.set(self.queue_config.time_TimeSet_2, "00:00")
+        self.queue_config.set(self.queue_config.time_TimeEnabled_3, False)
+        self.queue_config.set(self.queue_config.time_TimeSet_3, "00:00")
+        self.queue_config.set(self.queue_config.time_TimeEnabled_4, False)
+        self.queue_config.set(self.queue_config.time_TimeSet_4, "00:00")
+        self.queue_config.set(self.queue_config.time_TimeEnabled_5, False)
+        self.queue_config.set(self.queue_config.time_TimeSet_5, "00:00")
+        self.queue_config.set(self.queue_config.time_TimeEnabled_6, False)
+        self.queue_config.set(self.queue_config.time_TimeSet_6, "00:00")
+        self.queue_config.set(self.queue_config.time_TimeEnabled_7, False)
+        self.queue_config.set(self.queue_config.time_TimeSet_7, "00:00")
+        self.queue_config.set(self.queue_config.time_TimeEnabled_8, False)
+        self.queue_config.set(self.queue_config.time_TimeSet_8, "00:00")
+        self.queue_config.set(self.queue_config.time_TimeEnabled_9, False)
+        self.queue_config.set(self.queue_config.time_TimeSet_9, "00:00")
+
+        self.queue_config.set(self.queue_config.queue_Member_1, "禁用")
+        self.queue_config.set(self.queue_config.queue_Member_2, "禁用")
+        self.queue_config.set(self.queue_config.queue_Member_3, "禁用")
+        self.queue_config.set(self.queue_config.queue_Member_4, "禁用")
+        self.queue_config.set(self.queue_config.queue_Member_5, "禁用")
+        self.queue_config.set(self.queue_config.queue_Member_6, "禁用")
+        self.queue_config.set(self.queue_config.queue_Member_7, "禁用")
+        self.queue_config.set(self.queue_config.queue_Member_8, "禁用")
+        self.queue_config.set(self.queue_config.queue_Member_9, "禁用")
+        self.queue_config.set(self.queue_config.queue_Member_10, "禁用")
+
+
+class GlobalConfig(QConfig):
+    """全局配置"""
+
+    function_IfAllowSleep = ConfigItem(
+        "Function", "IfAllowSleep", False, BoolValidator()
+    )
+    function_IfSilence = ConfigItem("Function", "IfSilence", False, BoolValidator())
+    function_BossKey = ConfigItem("Function", "BossKey", "")
+
+    start_IfSelfStart = ConfigItem("Start", "IfSelfStart", False, BoolValidator())
+    start_IfRunDirectly = ConfigItem("Start", "IfRunDirectly", False, BoolValidator())
+
+    ui_IfShowTray = ConfigItem("UI", "IfShowTray", False, BoolValidator())
+    ui_IfToTray = ConfigItem("UI", "IfToTray", False, BoolValidator())
+    ui_size = ConfigItem("UI", "size", "1200x700")
+    ui_location = ConfigItem("UI", "location", "100x100")
+    ui_maximized = ConfigItem("UI", "maximized", False, BoolValidator())
+
+    notify_IfPushPlyer = ConfigItem("Notify", "IfPushPlyer", False, BoolValidator())
+    notify_IfSendMail = ConfigItem("Notify", "IfSendMail", False, BoolValidator())
+    notify_IfSendErrorOnly = ConfigItem(
+        "Notify", "IfSendErrorOnly", False, BoolValidator()
+    )
+    notify_MailAddress = ConfigItem("Notify", "MailAddress", "")
+    notify_IfServerChan = ConfigItem("Notify", "IfServerChan", False, BoolValidator())
+    notify_ServerChanKey = ConfigItem("Notify", "ServerChanKey", "")
+    notify_ServerChanChannel = ConfigItem("Notify", "ServerChanChannel", "")
+    notify_ServerChanTag = ConfigItem("Notify", "ServerChanTag", "")
+    notify_IfCompanyWebHookBot = ConfigItem(
+        "Notify", "IfCompanyWebHookBot", False, BoolValidator()
+    )
+    notify_CompanyWebHookBotUrl = ConfigItem("Notify", "CompanyWebHookBotUrl", "")
+    notify_IfPushDeer = ConfigItem("Notify", "IfPushDeer", False, BoolValidator())
+    notify_IfPushDeerKey = ConfigItem("Notify", "PushDeerKey", "")
+
+    update_IfAutoUpdate = ConfigItem("Update", "IfAutoUpdate", False, BoolValidator())
+    update_UpdateType = OptionsConfigItem(
+        "Update", "UpdateType", "main", OptionsValidator(["main", "dev"])
+    )
+
+
+class QueueConfig(QConfig):
+    """队列配置"""
+
+    queueSet_Name = ConfigItem("QueueSet", "Name", "")
+    queueSet_Enabled = ConfigItem("QueueSet", "Enabled", False, BoolValidator())
+
+    time_TimeEnabled_0 = ConfigItem("Time", "TimeEnabled_0", False, BoolValidator())
+    time_TimeSet_0 = ConfigItem("Time", "TimeSet_0", "00:00")
+
+    time_TimeEnabled_1 = ConfigItem("Time", "TimeEnabled_1", False, BoolValidator())
+    time_TimeSet_1 = ConfigItem("Time", "TimeSet_1", "00:00")
+
+    time_TimeEnabled_2 = ConfigItem("Time", "TimeEnabled_2", False, BoolValidator())
+    time_TimeSet_2 = ConfigItem("Time", "TimeSet_2", "00:00")
+
+    time_TimeEnabled_3 = ConfigItem("Time", "TimeEnabled_3", False, BoolValidator())
+    time_TimeSet_3 = ConfigItem("Time", "TimeSet_3", "00:00")
+
+    time_TimeEnabled_4 = ConfigItem("Time", "TimeEnabled_4", False, BoolValidator())
+    time_TimeSet_4 = ConfigItem("Time", "TimeSet_4", "00:00")
+
+    time_TimeEnabled_5 = ConfigItem("Time", "TimeEnabled_5", False, BoolValidator())
+    time_TimeSet_5 = ConfigItem("Time", "TimeSet_5", "00:00")
+
+    time_TimeEnabled_6 = ConfigItem("Time", "TimeEnabled_6", False, BoolValidator())
+    time_TimeSet_6 = ConfigItem("Time", "TimeSet_6", "00:00")
+
+    time_TimeEnabled_7 = ConfigItem("Time", "TimeEnabled_7", False, BoolValidator())
+    time_TimeSet_7 = ConfigItem("Time", "TimeSet_7", "00:00")
+
+    time_TimeEnabled_8 = ConfigItem("Time", "TimeEnabled_8", False, BoolValidator())
+    time_TimeSet_8 = ConfigItem("Time", "TimeSet_8", "00:00")
+
+    time_TimeEnabled_9 = ConfigItem("Time", "TimeEnabled_9", False, BoolValidator())
+    time_TimeSet_9 = ConfigItem("Time", "TimeSet_9", "00:00")
+
+    queue_Member_1 = OptionsConfigItem("Queue", "Member_1", "禁用")
+    queue_Member_2 = OptionsConfigItem("Queue", "Member_2", "禁用")
+    queue_Member_3 = OptionsConfigItem("Queue", "Member_3", "禁用")
+    queue_Member_4 = OptionsConfigItem("Queue", "Member_4", "禁用")
+    queue_Member_5 = OptionsConfigItem("Queue", "Member_5", "禁用")
+    queue_Member_6 = OptionsConfigItem("Queue", "Member_6", "禁用")
+    queue_Member_7 = OptionsConfigItem("Queue", "Member_7", "禁用")
+    queue_Member_8 = OptionsConfigItem("Queue", "Member_8", "禁用")
+    queue_Member_9 = OptionsConfigItem("Queue", "Member_9", "禁用")
+    queue_Member_10 = OptionsConfigItem("Queue", "Member_10", "禁用")
+
+
+class MaaConfig(QConfig):
+    """MAA配置"""
+
+    MaaSet_Name = ConfigItem("MaaSet", "Name", "")
+    MaaSet_Path = ConfigItem("MaaSet", "Path", ".", FolderValidator())
+
+    RunSet_ProxyTimesLimit = RangeConfigItem(
+        "RunSet", "ProxyTimesLimit", 0, RangeValidator(0, 1024)
+    )
+    RunSet_AnnihilationTimeLimit = RangeConfigItem(
+        "RunSet", "AnnihilationTimeLimit", 40, RangeValidator(1, 1024)
+    )
+    RunSet_RoutineTimeLimit = RangeConfigItem(
+        "RunSet", "RoutineTimeLimit", 10, RangeValidator(1, 1024)
+    )
+    RunSet_RunTimesLimit = RangeConfigItem(
+        "RunSet", "RunTimesLimit", 3, RangeValidator(1, 1024)
+    )
+
+
+Config = AppConfig()

app/core/main_info_bar.py

@@ -0,0 +1,92 @@
+#   <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信息通知栏
+v4.2
+作者：DLmaster_361
+"""
+
+from loguru import logger
+from PySide6.QtCore import Qt
+from qfluentwidgets import (
+    InfoBar,
+    InfoBarPosition,
+)
+
+
+class _MainInfoBar:
+    """信息通知栏"""
+
+    def __init__(self, parent=None):
+
+        self.parent = parent
+
+    def push_info_bar(self, mode: str, title: str, content: str, time: int):
+        """推送到信息通知栏"""
+
+        if self.parent is None:
+            logger.error("信息通知栏未设置父窗口")
+            return None
+
+        if mode == "success":
+            InfoBar.success(
+                title=title,
+                content=content,
+                orient=Qt.Horizontal,
+                isClosable=True,
+                position=InfoBarPosition.TOP_RIGHT,
+                duration=time,
+                parent=self.parent,
+            )
+        elif mode == "warning":
+            InfoBar.warning(
+                title=title,
+                content=content,
+                orient=Qt.Horizontal,
+                isClosable=True,
+                position=InfoBarPosition.TOP_RIGHT,
+                duration=time,
+                parent=self.parent,
+            )
+        elif mode == "error":
+            InfoBar.error(
+                title=title,
+                content=content,
+                orient=Qt.Horizontal,
+                isClosable=True,
+                position=InfoBarPosition.TOP_RIGHT,
+                duration=time,
+                parent=self.parent,
+            )
+        elif mode == "info":
+            InfoBar.info(
+                title=title,
+                content=content,
+                orient=Qt.Horizontal,
+                isClosable=True,
+                position=InfoBarPosition.TOP_RIGHT,
+                duration=time,
+                parent=self.parent,
+            )
+
+
+MainInfoBar = _MainInfoBar()

app/core/task_manager.py

@@ -0,0 +1,287 @@
+#   <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业务调度器
+v4.2
+作者：DLmaster_361
+"""
+
+from loguru import logger
+from PySide6.QtCore import QThread, QObject, Signal
+from qfluentwidgets import Dialog
+from pathlib import Path
+from datetime import datetime
+from typing import Dict, Union
+
+from .config import Config
+from .main_info_bar import MainInfoBar
+from app.models import MaaManager
+
+
+class Task(QThread):
+    """业务线程"""
+
+    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)
+    create_task_list = Signal(list)
+    create_user_list = Signal(list)
+    update_task_list = Signal(list)
+    update_user_list = Signal(list)
+    update_log_text = Signal(str)
+    accomplish = Signal(list)
+
+    def __init__(
+        self,
+        mode: str,
+        name: str,
+        info: Dict[str, Dict[str, Union[str, int, bool]]],
+    ):
+        super(Task, self).__init__()
+
+        self.mode = mode
+        self.name = name
+        self.info = info
+
+        self.logs = []
+
+        self.question_response.connect(lambda: print("response"))
+
+    def run(self):
+
+        if "设置MAA" in self.mode:
+
+            logger.info(f"任务开始：设置{self.name}")
+            self.push_info_bar.emit("info", "设置MAA", self.name, 3000)
+
+            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"]}"
+                ),
+            )
+            self.task.push_info_bar.connect(self.push_info_bar.emit)
+            self.task.accomplish.connect(lambda: self.accomplish.emit([]))
+
+            self.task.run()
+
+        else:
+
+            self.member_dict = self.search_member()
+            self.task_list = [
+                [value, "等待"]
+                for _, value in self.info["Queue"].items()
+                if value != "禁用"
+            ]
+
+            self.create_task_list.emit(self.task_list)
+
+            for i in range(len(self.task_list)):
+
+                if self.isInterruptionRequested():
+                    break
+
+                self.task_list[i][1] = "运行"
+                self.update_task_list.emit(self.task_list)
+
+                if self.task_list[i][0] in Config.running_list:
+
+                    self.task_list[i][1] = "跳过"
+                    self.update_task_list.emit(self.task_list)
+                    logger.info(f"跳过任务：{self.task_list[i][0]}")
+                    self.push_info_bar.emit(
+                        "info", "跳过任务", self.task_list[i][0], 3000
+                    )
+                    continue
+
+                Config.running_list.append(self.task_list[i][0])
+                logger.info(f"任务开始：{self.task_list[i][0]}")
+                self.push_info_bar.emit("info", "任务开始", self.task_list[i][0], 3000)
+
+                if self.member_dict[self.task_list[i][0]][0] == "Maa":
+
+                    self.task = MaaManager(
+                        self.mode[0:4],
+                        self.member_dict[self.task_list[i][0]][1],
+                    )
+
+                    self.task.question.connect(self.question.emit)
+                    self.question_response.disconnect()
+                    self.question_response.connect(self.task.question_response.emit)
+                    self.task.push_info_bar.connect(self.push_info_bar.emit)
+                    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_list[i][0]][1],
+                            modes,
+                            uids,
+                            days,
+                            lasts,
+                            notes,
+                            numbs,
+                        )
+                    )
+                    self.task.accomplish.connect(
+                        lambda log: self.save_log(self.task_list[i][0], log)
+                    )
+
+                    self.task.run()
+
+                Config.running_list.remove(self.task_list[i][0])
+
+                self.task_list[i][1] = "完成"
+                logger.info(f"任务完成：{self.task_list[i][0]}")
+                self.push_info_bar.emit("info", "任务完成", self.task_list[i][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 save_log(self, name: str, log: dict):
+        """保存保存任务结果"""
+
+        self.logs.append([name, log])
+
+
+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__()
+
+        self.task_list: Dict[str, Task] = {}
+
+    def add_task(
+        self, mode: str, name: str, info: Dict[str, Dict[str, Union[str, int, bool]]]
+    ):
+        """添加任务"""
+
+        if name in Config.running_list or name in self.task_list:
+
+            logger.warning(f"任务已存在：{name}")
+            MainInfoBar.push_info_bar("warning", "任务已存在", name, 5000)
+            return None
+
+        logger.info(f"任务开始：{name}")
+        MainInfoBar.push_info_bar("info", "任务开始", name, 3000)
+
+        Config.running_list.append(name)
+        self.task_list[name] = Task(mode, name, info)
+        self.task_list[name].question.connect(
+            lambda title, content: self.push_dialog(name, title, content)
+        )
+        self.task_list[name].push_info_bar.connect(MainInfoBar.push_info_bar)
+        self.task_list[name].update_user_info.connect(Config.change_user_info)
+        self.task_list[name].accomplish.connect(
+            lambda logs: self.remove_task(name, logs)
+        )
+
+        if "新调度台" in mode:
+            self.create_gui.emit(self.task_list[name])
+
+        elif "主调度台" in mode:
+            self.connect_gui.emit(self.task_list[name])
+
+        self.task_list[name].start()
+
+    def stop_task(self, name: str):
+        """中止任务"""
+
+        logger.info(f"中止任务：{name}")
+        MainInfoBar.push_info_bar("info", "中止任务", name, 3000)
+
+        if name == "ALL":
+
+            for name in self.task_list:
+
+                self.task_list[name].task.requestInterruption()
+                self.task_list[name].requestInterruption()
+                self.task_list[name].quit()
+                self.task_list[name].wait()
+
+        elif name in self.task_list:
+
+            self.task_list[name].task.requestInterruption()
+            self.task_list[name].requestInterruption()
+            self.task_list[name].quit()
+            self.task_list[name].wait()
+
+    def remove_task(self, name: str, logs: str):
+        """移除任务标记"""
+
+        logger.info(f"任务结束：{name}")
+        MainInfoBar.push_info_bar("info", "任务结束", name, 3000)
+
+        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_list.pop(name)
+        Config.running_list.remove(name)
+
+    def push_dialog(self, name: str, title: str, content: str):
+        """推送对话框"""
+
+        choice = Dialog(title, content, None)
+        choice.yesButton.setText("是")
+        choice.cancelButton.setText("否")
+
+        self.task_list[name].question_response.emit(bool(choice.exec_()))
+
+
+Task_manager = TaskManager()

app/core/timer.py

@@ -0,0 +1,123 @@
+#   <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主业务定时器
+v4.2
+作者：DLmaster_361
+"""
+
+from loguru import logger
+from PySide6.QtWidgets import QWidget
+from PySide6.QtCore import QTimer
+import json
+from datetime import datetime
+import pyautogui
+
+from .config import Config
+from .task_manager import Task_manager
+from app.services import System
+
+
+class MainTimer(QWidget):
+
+    def __init__(
+        self,
+        parent=None,
+    ):
+        super().__init__(parent)
+
+        self.if_FailSafeException = False
+
+        self.Timer = QTimer()
+        self.Timer.timeout.connect(self.timed_start)
+        self.Timer.timeout.connect(self.set_silence)
+        self.Timer.start(1000)
+
+    def timed_start(self):
+        """定时启动代理任务"""
+
+        # 获取定时列表
+        queue_list = self.search_queue()
+
+        for i in queue_list:
+
+            name, info = i
+
+            if not info["QueueSet"]["Enabled"]:
+                continue
+
+            history = Config.get_history(name)
+
+            time_set = [
+                info["Time"][f"TimeSet_{_}"]
+                for _ in range(10)
+                if info["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 name not in Config.running_list
+            ):
+
+                logger.info(f"定时任务：{name}")
+                Task_manager.add_task("自动代理_新调度台", name, info)
+
+    def set_silence(self):
+        """设置静默模式"""
+
+        windows = System.get_window_info()
+        if any(
+            str(emulator_path) in window
+            for window in windows
+            for emulator_path in Config.silence_list
+        ):
+            try:
+                pyautogui.hotkey(
+                    *[
+                        _.strip().lower()
+                        for _ in Config.global_config.get(
+                            Config.global_config.function_BossKey
+                        ).split("+")
+                    ]
+                )
+            except pyautogui.FailSafeException as e:
+                if not self.if_FailSafeException:
+                    logger.warning(f"FailSafeException: {e}")
+                    self.if_FailSafeException = True
+
+    def search_queue(self) -> list:
+        """搜索所有调度队列实例"""
+
+        queue_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])
+
+        return queue_list
+
+
+Main_timer = MainTimer()

app/models/MAA.py

@@ -25,174 +25,214 @@ v4.2
 作者：DLmaster_361
 """
 
-from PySide6 import QtCore
+from loguru import logger
+from PySide6.QtCore import QObject, Signal, QEventLoop
 import json
-import datetime
-import os
+import sqlite3
+from datetime import datetime, timedelta
 import subprocess
 import shutil
 import time
 from pathlib import Path
+from typing import List
 
-from app import AppConfig
+from app.core import Config
+from app.services import Notify
 
 
-class MaaManager(QtCore.QThread):
+class MaaManager(QObject):
     """MAA控制器"""
 
-    question = QtCore.Signal()
-    push_notification = QtCore.Signal(str, str, str, int)
-    send_mail = QtCore.Signal(str, str)
-    update_gui = QtCore.Signal(str, str, str, str, str)
-    update_user_info = QtCore.Signal(list, list, list, list, list, list)
-    set_silence = QtCore.Signal(str, str, list)
-    accomplish = QtCore.Signal()
-    get_json = QtCore.Signal(list)
+    question = Signal(str, str)
+    question_response = Signal(bool)
+    update_user_info = Signal(list, list, list, list, list, list)
+    push_info_bar = Signal(str, str, str, int)
+    create_user_list = Signal(list)
+    update_user_list = Signal(list)
+    update_log_text = Signal(str)
+    accomplish = Signal(dict)
 
-    def __init__(self, config: AppConfig):
+    isInterruptionRequested = False
+
+    def __init__(
+        self,
+        mode: str,
+        config_path: Path,
+        user_config_path: Path = None,
+    ):
         super(MaaManager, self).__init__()
 
-        self.config = config
-        self.mode = None
-        self.data = None
-        self.get_json_path = [0, 0, 0]
+        self.mode = mode
+        self.config_path = config_path
+        self.user_config_path = user_config_path
+
+        with (self.config_path / "config.json").open("r", encoding="utf-8") as f:
+            self.set = json.load(f)
+
+        if "设置MAA" not in self.mode:
+
+            db = sqlite3.connect(self.config_path / "user_data.db")
+            cur = db.cursor()
+            cur.execute("SELECT * FROM adminx WHERE True")
+            self.data = cur.fetchall()
+            self.data = [list(row) for row in self.data]
+            cur.close()
+            db.close()
+
+        else:
+            self.data = []
 
     def configure(self):
         """提取配置信息"""
 
-        self.maa_root_path = Path(self.config.content["Default"]["MaaSet.path"])
-        self.set_path = self.maa_root_path / "config/gui.json"
-        self.log_path = self.maa_root_path / "debug/gui.log"
-        self.maa_path = self.maa_root_path / "MAA.exe"
-        self.json_path = self.config.app_path / "data/MAAconfig"
-        self.routine = self.config.content["Default"]["TimeLimit.routine"]
-        self.annihilation = self.config.content["Default"]["TimeLimit.annihilation"]
-        self.num = self.config.content["Default"]["TimesLimit.run"]
-        self.boss_key = [
-            _.strip().lower()
-            for _ in self.config.content["Default"]["SelfSet.BossKey"].split("+")
-        ]
-        self.if_send_mail = bool(
-            self.config.content["Default"]["SelfSet.IfSendMail"] == "True"
-        )
-        self.if_send_error_only = bool(
-            self.config.content["Default"]["SelfSet.IfSendMail.OnlyError"] == "True"
-        )
-        self.if_silence = bool(
-            self.config.content["Default"]["SelfSet.IfSilence"] == "True"
-        )
+        self.maa_root_path = Path(self.set["MaaSet"]["Path"])
+        self.maa_set_path = self.maa_root_path / "config/gui.json"
+        self.maa_log_path = self.maa_root_path / "debug/gui.log"
+        self.maa_exe_path = self.maa_root_path / "MAA.exe"
 
     def run(self):
         """主进程，运行MAA代理进程"""
 
         curdate = self.server_date()
-        begin_time = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+        begin_time = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
 
         self.configure()
+        # 检查MAA路径是否可用
+        if not self.maa_exe_path.exists() or not self.maa_set_path.exists():
+
+            logger.error("未正确配置MAA路径，MAA代理进程中止")
+            self.push_info_bar.emit(
+                "error", "启动MAA代理进程失败", "您还未正确配置MAA路径！", -1
+            )
+            self.accomplish.emit(
+                {
+                    "Time": begin_time,
+                    "History": "由于未正确配置MAA路径，MAA代理进程中止",
+                }
+            )
+            return None
 
         # 整理用户数据，筛选需代理的用户
-        self.data = sorted(self.data, key=lambda x: (-len(x[15]), x[16]))
-        wait_index = []
-        over_index = []
-        error_index = []
-        all_index = [
-            _
-            for _ in range(len(self.data))
-            if (self.data[_][3] != 0 and self.data[_][4] == "y")
-        ]
+        if "设置MAA" not in self.mode:
 
-        # 日常代理模式
-        if self.mode == "日常代理":
+            self.data = sorted(self.data, key=lambda x: (-len(x[15]), x[16]))
+            user_list: List[List[str, str, int]] = [
+                [_[0], "等待", index]
+                for index, _ in enumerate(self.data)
+                if (_[3] != 0 and _[4] == "y")
+            ]
+            self.create_user_list.emit(user_list)
+
+        # 自动代理模式
+        if self.mode == "自动代理":
 
             # 执行情况预处理
-            for _ in all_index:
-                if self.data[_][5] != curdate:
-                    self.data[_][5] = curdate
-                    self.data[_][14] = 0
-                self.data[_][0] += f"_第{str(self.data[_][14] + 1)}次代理"
+            for _ in user_list:
+                if self.data[_[2]][5] != curdate:
+                    self.data[_[2]][5] = curdate
+                    self.data[_[2]][14] = 0
+                _[0] += f" - 第{self.data[_[2]][14] + 1}次代理"
 
             # 开始代理
-            for index in all_index:
+            for user in user_list:
 
-                if self.isInterruptionRequested():
+                if self.isInterruptionRequested:
                     break
 
+                if (
+                    self.set["RunSet"]["ProxyTimesLimit"] == 0
+                    or self.data[user[2]][14] < self.set["RunSet"]["ProxyTimesLimit"]
+                ):
+                    user[1] = "运行"
+                    self.update_user_list.emit(user_list)
+                else:
+                    user[1] = "跳过"
+                    self.update_user_list.emit(user_list)
+                    continue
+
                 # 初始化代理情况记录和模式替换记录
                 run_book = [False for _ in range(2)]
-                mode_book = ["日常代理_剿灭", "日常代理_日常"]
+                mode_book = ["自动代理_剿灭", "自动代理_日常"]
 
-                # 简洁模式用户默认开启日常代理
-                if self.data[index][15] == "simple":
-                    self.data[index][9] = "y"
+                # 简洁模式用户默认开启日常选项
+                if self.data[user[2]][15] == "simple":
+                    self.data[user[2]][9] = "y"
 
                 # 尝试次数循环
-                for i in range(self.num):
+                for i in range(self.set["RunSet"]["RunTimesLimit"]):
 
-                    if self.isInterruptionRequested():
+                    if self.isInterruptionRequested:
                         break
 
                     # 剿灭-日常模式循环
                     for j in range(2):
 
-                        if self.isInterruptionRequested():
+                        if self.isInterruptionRequested:
                             break
 
-                        if self.data[index][10 - j] == "n":
+                        if self.data[user[2]][10 - j] == "n":
                             run_book[j] = True
                             continue
                         if run_book[j]:
                             continue
 
                         # 配置MAA
-                        self.set_maa(mode_book[j], index)
+                        self.set_maa(mode_book[j], user[2])
                         # 记录当前时间
-                        start_time = datetime.datetime.now()
+                        start_time = datetime.now()
                         # 创建MAA任务
                         maa = subprocess.Popen(
-                            [self.maa_path],
+                            [self.maa_exe_path],
                             shell=True,
                             creationflags=subprocess.CREATE_NO_WINDOW,
                         )
-                        # 启动静默进程
-                        if self.if_silence:
-                            self.set_silence.emit(
-                                "启用", self.get_emulator_path(), self.boss_key
+                        # 添加静默进程标记
+                        if Config.global_config.get(
+                            Config.global_config.function_IfSilence
+                        ):
+                            with self.maa_set_path.open(
+                                mode="r", encoding="utf-8"
+                            ) as f:
+                                set = json.load(f)
+                            self.emulator_path = Path(
+                                set["Configurations"]["Default"]["Start.EmulatorPath"]
                             )
+                            Config.silence_list.append(self.emulator_path)
                         # 记录是否超时的标记
                         self.if_time_out = False
-                        # 更新运行信息
-                        wait_index = [
-                            _
-                            for _ in all_index
-                            if (not _ in over_index + error_index + [index])
-                        ]
 
                         # 监测MAA运行状态
-                        while not self.isInterruptionRequested():
+                        while not self.isInterruptionRequested:
 
                             # 获取MAA日志
                             logs = self.get_maa_log(start_time)
 
                             # 判断是否超时
                             if len(logs) > 0:
-                                latest_time = datetime.datetime.now()
+                                latest_time = datetime.now()
                                 for _ in range(-1, 0 - len(logs) - 1, -1):
                                     try:
-                                        latest_time = datetime.datetime.strptime(
+                                        latest_time = datetime.strptime(
                                             logs[_][1:20], "%Y-%m-%d %H:%M:%S"
                                         )
                                         break
                                     except ValueError:
                                         pass
-                                now_time = datetime.datetime.now()
+                                now_time = datetime.now()
                                 if (
                                     j == 0
                                     and now_time - latest_time
-                                    > datetime.timedelta(minutes=self.annihilation)
+                                    > timedelta(
+                                        minutes=self.set["RunSet"][
+                                            "AnnihilationTimeLimit"
+                                        ]
+                                    )
                                 ) or (
                                     j == 1
                                     and now_time - latest_time
-                                    > datetime.timedelta(minutes=self.routine)
+                                    > timedelta(
+                                        minutes=self.set["RunSet"]["RoutineTimeLimit"]
+                                    )
                                 ):
                                     self.if_time_out = True
 
@@ -201,38 +241,24 @@ class MaaManager(QtCore.QThread):
 
                             # 更新MAA日志
                             if len(logs) > 100:
-                                self.update_gui.emit(
-                                    f"{self.data[index][0]}_第{i + 1}次_{mode_book[j][5:7]}",
-                                    "\n".join([self.data[_][0] for _ in wait_index]),
-                                    "\n".join([self.data[_][0] for _ in over_index]),
-                                    "\n".join([self.data[_][0] for _ in error_index]),
-                                    "".join(logs[-100:]),
-                                )
+                                self.update_log_text.emit("".join(logs[-100:]))
                             else:
-                                self.update_gui.emit(
-                                    f"{self.data[index][0]}_第{i + 1}次_{mode_book[j][5:7]}",
-                                    "\n".join([self.data[_][0] for _ in wait_index]),
-                                    "\n".join([self.data[_][0] for _ in over_index]),
-                                    "\n".join([self.data[_][0] for _ in error_index]),
-                                    "".join(logs),
-                                )
+                                self.update_log_text.emit("".join(logs))
 
                             # 判断MAA程序运行状态
                             result = self.if_maa_success(log, mode_book[j])
                             if result == "Success!":
                                 run_book[j] = True
-                                self.update_gui.emit(
-                                    f"{self.data[index][0]}_第{i + 1}次_{mode_book[j][5:7]}",
-                                    "\n".join([self.data[_][0] for _ in wait_index]),
-                                    "\n".join([self.data[_][0] for _ in over_index]),
-                                    "\n".join([self.data[_][0] for _ in error_index]),
-                                    "检测到MAA进程完成代理任务\n正在等待相关程序结束\n请等待10s",
+                                self.update_log_text.emit(
+                                    "检测到MAA进程完成代理任务\n正在等待相关程序结束\n请等待10s"
                                 )
-                                # 关闭静默进程
-                                if self.if_silence:
-                                    self.set_silence.emit("禁用", "", [])
+                                # 移除静默进程标记
+                                if Config.global_config.get(
+                                    Config.global_config.function_IfSilence
+                                ):
+                                    Config.silence_list.remove(self.emulator_path)
                                 for _ in range(10):
-                                    if self.isInterruptionRequested():
+                                    if self.isInterruptionRequested:
                                         break
                                     time.sleep(1)
                                 break
@@ -242,13 +268,7 @@ class MaaManager(QtCore.QThread):
                             else:
                                 # 打印中止信息
                                 # 此时，log变量内存储的就是出现异常的日志信息，可以保存或发送用于问题排查
-                                self.update_gui.emit(
-                                    f"{self.data[index][0]}_第{i + 1}次_{mode_book[j][5:7]}",
-                                    "\n".join([self.data[_][0] for _ in wait_index]),
-                                    "\n".join([self.data[_][0] for _ in over_index]),
-                                    "\n".join([self.data[_][0] for _ in error_index]),
-                                    result,
-                                )
+                                self.update_log_text.emit(result)
                                 # 无命令行中止MAA与其子程序
                                 killprocess = subprocess.Popen(
                                     f"taskkill /F /T /PID {maa.pid}",
@@ -256,39 +276,43 @@ class MaaManager(QtCore.QThread):
                                     creationflags=subprocess.CREATE_NO_WINDOW,
                                 )
                                 killprocess.wait()
-                                # 关闭静默进程
-                                if self.if_silence:
-                                    self.set_silence.emit("禁用", "", [])
+                                # 移除静默进程标记
+                                if Config.global_config.get(
+                                    Config.global_config.function_IfSilence
+                                ):
+                                    Config.silence_list.remove(self.emulator_path)
                                 # 推送异常通知
-                                self.push_notification.emit(
-                                    "用户日常代理出现异常！",
-                                    f"用户 {self.data[index][0].replace("_", " 今天的")}的{mode_book[j][5:7]}部分出现一次异常",
-                                    f"{self.data[index][0].replace("_", " ")}的{mode_book[j][5:7]}出现异常",
+                                Notify.push_notification(
+                                    "用户自动代理出现异常！",
+                                    f"用户 {user[0].replace("_", " 今天的")}的{mode_book[j][5:7]}部分出现一次异常",
+                                    f"{user[0].replace("_", " ")}的{mode_book[j][5:7]}出现异常",
                                     1,
                                 )
                                 for _ in range(10):
-                                    if self.isInterruptionRequested():
+                                    if self.isInterruptionRequested:
                                         break
                                     time.sleep(1)
                                 break
 
                     # 成功完成代理的用户修改相关参数
                     if run_book[0] and run_book[1]:
-                        if self.data[index][14] == 0 and self.data[index][3] != -1:
-                            self.data[index][3] -= 1
-                        self.data[index][14] += 1
-                        over_index.append(index)
-                        self.push_notification.emit(
-                            "成功完成一个日常代理任务！",
-                            f"已完成用户 {self.data[index][0].replace("_", " 今天的")}任务",
-                            f"已完成 {self.data[index][0].replace("_", " 的")}",
+                        if self.data[user[2]][14] == 0 and self.data[user[2]][3] != -1:
+                            self.data[user[2]][3] -= 1
+                        self.data[user[2]][14] += 1
+                        user[1] = "完成"
+                        Notify.push_notification(
+                            "成功完成一个自动代理任务！",
+                            f"已完成用户 {user[0].replace("_", " 今天的")}任务",
+                            f"已完成 {user[0].replace("_", " 的")}",
                             3,
                         )
                         break
 
                 # 录入代理失败的用户
                 if not (run_book[0] and run_book[1]):
-                    error_index.append(index)
+                    user[1] = "异常"
+
+                self.update_user_list.emit(user_list)
 
         # 人工排查模式
         elif self.mode == "人工排查":
@@ -296,47 +320,44 @@ class MaaManager(QtCore.QThread):
             # 标记是否需要启动模拟器
             if_strat_app = True
             # 标识排查模式
-            for _ in all_index:
-                self.data[_][0] += "_排查模式"
+            for _ in user_list:
+                _[0] += "_排查模式"
 
             # 开始排查
-            for index in all_index:
+            for user in user_list:
 
-                if self.isInterruptionRequested():
+                if self.isInterruptionRequested:
                     break
 
-                if self.data[index][15] == "beta":
+                user[1] = "运行"
+                self.update_user_list.emit(user_list)
+
+                if self.data[user[2]][15] == "beta":
                     if_strat_app = True
 
                 run_book = [False for _ in range(2)]
 
                 # 启动重试循环
-                while not self.isInterruptionRequested():
+                while not self.isInterruptionRequested:
 
                     # 配置MAA
                     if if_strat_app:
-                        self.set_maa("人工排查_启动模拟器", index)
+                        self.set_maa("人工排查_启动模拟器", user[2])
                         if_strat_app = False
                     else:
-                        self.set_maa("人工排查_仅切换账号", index)
+                        self.set_maa("人工排查_仅切换账号", user[2])
 
                     # 记录当前时间
-                    start_time = datetime.datetime.now()
+                    start_time = datetime.now()
                     # 创建MAA任务
                     maa = subprocess.Popen(
-                        [self.maa_path],
+                        [self.maa_exe_path],
                         shell=True,
                         creationflags=subprocess.CREATE_NO_WINDOW,
                     )
-                    # 更新运行信息
-                    wait_index = [
-                        _
-                        for _ in all_index
-                        if (not _ in over_index + error_index + [index])
-                    ]
 
                     # 监测MAA运行状态
-                    while not self.isInterruptionRequested():
+                    while not self.isInterruptionRequested:
 
                         # 获取MAA日志
                         logs = self.get_maa_log(start_time)
@@ -345,45 +366,21 @@ class MaaManager(QtCore.QThread):
 
                         # 更新MAA日志
                         if len(logs) > 100:
-                            self.update_gui.emit(
-                                self.data[index][0],
-                                "\n".join([self.data[_][0] for _ in wait_index]),
-                                "\n".join([self.data[_][0] for _ in over_index]),
-                                "\n".join([self.data[_][0] for _ in error_index]),
-                                "".join(logs[-100:]),
-                            )
+                            self.update_log_text.emit("".join(logs[-100:]))
                         else:
-                            self.update_gui.emit(
-                                self.data[index][0],
-                                "\n".join([self.data[_][0] for _ in wait_index]),
-                                "\n".join([self.data[_][0] for _ in over_index]),
-                                "\n".join([self.data[_][0] for _ in error_index]),
-                                "".join(logs),
-                            )
+                            self.update_log_text.emit("".join(logs))
 
                         # 判断MAA程序运行状态
                         result = self.if_maa_success(log, "人工排查")
                         if result == "Success!":
                             run_book[0] = True
-                            self.update_gui.emit(
-                                self.data[index][0],
-                                "\n".join([self.data[_][0] for _ in wait_index]),
-                                "\n".join([self.data[_][0] for _ in over_index]),
-                                "\n".join([self.data[_][0] for _ in error_index]),
-                                "检测到MAA进程成功登录PRTS",
-                            )
+                            self.update_log_text.emit("检测到MAA进程成功登录PRTS")
                             break
                         elif result == "Wait":
                             # 检测时间间隔
                             time.sleep(1)
                         else:
-                            self.update_gui.emit(
-                                self.data[index][0],
-                                "\n".join([self.data[_][0] for _ in wait_index]),
-                                "\n".join([self.data[_][0] for _ in over_index]),
-                                "\n".join([self.data[_][0] for _ in error_index]),
-                                result,
-                            )
+                            self.update_log_text.emit(result)
                             # 无命令行中止MAA与其子程序
                             killprocess = subprocess.Popen(
                                 f"taskkill /F /T /PID {maa.pid}",
@@ -393,7 +390,7 @@ class MaaManager(QtCore.QThread):
                             killprocess.wait()
                             if_strat_app = True
                             for _ in range(10):
-                                if self.isInterruptionRequested():
+                                if self.isInterruptionRequested:
                                     break
                                 time.sleep(1)
                             break
@@ -402,38 +399,36 @@ class MaaManager(QtCore.QThread):
                     if run_book[0]:
                         break
                     # 登录失败，询问是否结束循环
-                    elif not self.isInterruptionRequested():
-                        self.question_title = "操作提示"
-                        self.question_info = "MAA未能正确登录到PRTS，是否重试？"
-                        self.question_choice = "wait"
-                        self.question.emit()
-                        while self.question_choice == "wait":
-                            time.sleep(1)
-                        if self.question_choice == "No":
+                    elif not self.isInterruptionRequested:
+
+                        if not self.push_question(
+                            "操作提示", "MAA未能正确登录到PRTS，是否重试？"
+                        ):
                             break
 
                 # 登录成功，录入人工排查情况
-                if run_book[0] and not self.isInterruptionRequested():
-                    self.question_title = "操作提示"
-                    self.question_info = "请检查用户代理情况，如无异常请按下确认键。"
-                    self.question_choice = "wait"
-                    self.question.emit()
-                    while self.question_choice == "wait":
-                        time.sleep(1)
-                    if self.question_choice == "Yes":
+                if run_book[0] and not self.isInterruptionRequested:
+
+                    if self.push_question(
+                        "操作提示", "请检查用户代理情况，该用户是否正确完成代理任务？"
+                    ):
                         run_book[1] = True
 
                 # 结果录入用户备注栏
                 if run_book[0] and run_book[1]:
-                    if "未通过人工排查" in self.data[index][13]:
-                        self.data[index][13] = self.data[index][13].replace(
+                    if "未通过人工排查" in self.data[user[2]][13]:
+                        self.data[user[2]][13] = self.data[user[2]][13].replace(
                             "未通过人工排查|", ""
                         )
-                    over_index.append(index)
+                    user[1] = "完成"
                 elif not (run_book[0] and run_book[1]):
-                    if not "未通过人工排查" in self.data[index][13]:
-                        self.data[index][13] = f"未通过人工排查|{self.data[index][13]}"
-                    error_index.append(index)
+                    if not "未通过人工排查" in self.data[user[2]][13]:
+                        self.data[user[2]][
+                            13
+                        ] = f"未通过人工排查|{self.data[user[2]][13]}"
+                    user[1] = "异常"
+
+                self.update_user_list.emit(user_list)
 
         # 设置MAA模式
         elif "设置MAA" in self.mode:
@@ -442,15 +437,15 @@ class MaaManager(QtCore.QThread):
             self.set_maa(self.mode, "")
             # 创建MAA任务
             maa = subprocess.Popen(
-                [self.maa_path],
+                [self.maa_exe_path],
                 shell=True,
                 creationflags=subprocess.CREATE_NO_WINDOW,
             )
             # 记录当前时间
-            start_time = datetime.datetime.now()
+            start_time = datetime.now()
 
             # 监测MAA运行状态
-            while not self.isInterruptionRequested():
+            while not self.isInterruptionRequested:
 
                 # 获取MAA日志
                 logs = self.get_maa_log(start_time)
@@ -465,19 +460,21 @@ class MaaManager(QtCore.QThread):
                     # 检测时间间隔
                     time.sleep(1)
 
-            # 保存MAA配置文件
             if "全局" in self.mode:
-                self.get_json.emit(["Default"])
-            elif "用户" in self.mode:
-                self.get_json.emit(self.get_json_path)
+                (self.config_path / "Default").mkdir(parents=True, exist_ok=True)
+                shutil.copy(self.maa_set_path, self.config_path / "Default")
 
-            self.accomplish.emit()
+            elif "用户" in self.mode:
+                self.user_config_path.mkdir(parents=True, exist_ok=True)
+                shutil.copy(self.maa_set_path, self.user_config_path)
+
+            end_log = ""
 
         # 导出结果
-        if self.mode in ["日常代理", "人工排查"]:
+        if self.mode in ["自动代理", "人工排查"]:
 
             # 关闭可能未正常退出的MAA进程
-            if self.isInterruptionRequested():
+            if self.isInterruptionRequested:
                 killprocess = subprocess.Popen(
                     f"taskkill /F /T /PID {maa.pid}",
                     shell=True,
@@ -486,16 +483,20 @@ class MaaManager(QtCore.QThread):
                 killprocess.wait()
 
             # 更新用户数据
-            modes = [self.data[_][15] for _ in all_index]
-            uids = [self.data[_][16] for _ in all_index]
-            days = [self.data[_][3] for _ in all_index]
-            lasts = [self.data[_][5] for _ in all_index]
-            notes = [self.data[_][13] for _ in all_index]
-            numbs = [self.data[_][14] for _ in all_index]
+            modes = [self.data[_[2]][15] for _ in user_list]
+            uids = [self.data[_[2]][16] for _ in user_list]
+            days = [self.data[_[2]][3] for _ in user_list]
+            lasts = [self.data[_[2]][5] for _ in user_list]
+            notes = [self.data[_[2]][13] for _ in user_list]
+            numbs = [self.data[_[2]][14] for _ in user_list]
             self.update_user_info.emit(modes, uids, days, lasts, notes, numbs)
 
+            error_index = [_[2] for _ in user_list if _[1] == "异常"]
+            over_index = [_[2] for _ in user_list if _[1] == "完成"]
+            wait_index = [_[2] for _ in user_list if _[1] == "等待"]
+
             # 保存运行日志
-            end_time = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+            end_time = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
             end_log = (
                 f"任务开始时间：{begin_time}，结束时间：{end_time}\n"
                 f"已完成数：{len(over_index)}，未完成数：{len(error_index) + len(wait_index)}\n\n"
@@ -506,52 +507,67 @@ class MaaManager(QtCore.QThread):
                     f"{self.mode[2:4]}未成功的用户：\n"
                     f"{"\n".join([self.data[_][0] for _ in error_index])}\n"
                 )
-            wait_index = [_ for _ in all_index if (not _ in over_index + error_index)]
             if len(wait_index) != 0:
                 end_log += (
                     f"\n未开始{self.mode[2:4]}的用户：\n"
                     f"{"\n".join([self.data[_][0] for _ in wait_index])}\n"
                 )
 
-            (self.config.app_path / "log.txt").write_text(
-                end_log,
-                encoding="utf-8",
-            )
-
-            # 恢复GUI运行面板
-            self.update_gui.emit("", "", "", "", end_log)
-
             # 推送代理结果通知
-            self.push_notification.emit(
+            Notify.push_notification(
                 f"{self.mode[2:4]}任务已完成！",
                 f"已完成用户数：{len(over_index)}，未完成用户数：{len(error_index) + len(wait_index)}",
                 f"已完成用户数：{len(over_index)}，未完成用户数：{len(error_index) + len(wait_index)}",
                 10,
             )
-            if self.if_send_mail and (
-                not self.if_send_error_only
-                or (self.if_send_error_only and len(error_index) + len(wait_index) != 0)
+            if not Config.global_config.get(
+                Config.global_config.notify_IfSendErrorOnly
+            ) or (
+                Config.global_config.get(Config.global_config.notify_IfSendErrorOnly)
+                and len(error_index) + len(wait_index) != 0
             ):
-                self.send_mail.emit(
+                Notify.send_mail(
                     f"{self.mode[:4]}任务报告",
                     f"{end_log}\n\nAUTO_MAA 敬上\n\n我们根据您在 AUTO_MAA 中的设置发送了这封电子邮件，本邮件无需回复\n",
                 )
+                Notify.ServerChanPush(
+                    f"{self.mode[:4]}任务报告",
+                    f"{end_log}\n\nAUTO_MAA 敬上",
+                )
+                Notify.CompanyWebHookBotPush(
+                    f"{self.mode[:4]}任务报告",
+                    f"{end_log}AUTO_MAA 敬上",
+                )
 
-            if not self.isInterruptionRequested():
-                self.accomplish.emit()
+        self.accomplish.emit({"Time": begin_time, "History": end_log})
+
+    def requestInterruption(self) -> None:
+
+        logger.info("申请中止本次任务")
+        self.isInterruptionRequested = True
+
+    def push_question(self, title: str, message: str) -> bool:
+
+        self.question.emit(title, message)
+        loop = QEventLoop()
+        self.question_response.connect(self._capture_response)
+        self.question_response.connect(loop.quit)
+        loop.exec()
+        return self.response
+
+    def _capture_response(self, response: bool) -> None:
+        self.response = response
 
     def get_maa_log(self, start_time):
         """获取MAA日志"""
 
         logs = []
         if_log_start = False
-        with self.log_path.open(mode="r", encoding="utf-8") as f:
+        with self.maa_log_path.open(mode="r", encoding="utf-8") as f:
             for entry in f:
                 if not if_log_start:
                     try:
-                        entry_time = datetime.datetime.strptime(
-                            entry[1:20], "%Y-%m-%d %H:%M:%S"
-                        )
+                        entry_time = datetime.strptime(entry[1:20], "%Y-%m-%d %H:%M:%S")
                         if entry_time > start_time:
                             if_log_start = True
                             logs.append(entry)
@@ -564,8 +580,8 @@ class MaaManager(QtCore.QThread):
     def if_maa_success(self, log, mode):
         """判断MAA程序运行状态"""
 
-        if "日常代理" in mode:
-            if mode == "日常代理_日常" and "任务出错: Fight" in log:
+        if "自动代理" in mode:
+            if mode == "自动代理_日常" and "任务出错: Fight" in log:
                 return "检测到MAA未能实际执行任务\n正在中止相关程序\n请等待10s"
             if "任务出错: StartUp" in log:
                 return "检测到MAA未能正确登录PRTS\n正在中止相关程序\n请等待10s"
@@ -579,7 +595,7 @@ class MaaManager(QtCore.QThread):
                 return "检测到MAA进程异常\n正在中止相关程序\n请等待10s"
             elif self.if_time_out:
                 return "检测到MAA进程超时\n正在中止相关程序\n请等待10s"
-            elif self.isInterruptionRequested():
+            elif self.isInterruptionRequested:
                 return "您中止了本次任务\n正在中止相关程序\n请等待"
             else:
                 return "Wait"
@@ -593,7 +609,7 @@ class MaaManager(QtCore.QThread):
                 or ("MaaAssistantArknights GUI exited" in log)
             ):
                 return "检测到MAA进程异常\n正在中止相关程序\n请等待10s"
-            elif self.isInterruptionRequested():
+            elif self.isInterruptionRequested:
                 return "您中止了本次任务\n正在中止相关程序\n请等待"
             else:
                 return "Wait"
@@ -609,51 +625,43 @@ class MaaManager(QtCore.QThread):
 
         # 预导入MAA配置文件
         if mode == "设置MAA_用户":
-            set_book = ["simple", "beta"]
-            if (
-                self.json_path
-                / f"{set_book[self.get_json_path[0]]}/{self.get_json_path[1]}/{self.get_json_path[2]}/gui.json"
-            ).exists():
-                shutil.copy(
-                    self.json_path
-                    / f"{set_book[self.get_json_path[0]]}/{self.get_json_path[1]}/{self.get_json_path[2]}/gui.json",
-                    self.set_path,
-                )
+            if self.user_config_path.exists():
+                shutil.copy(self.user_config_path / "gui.json", self.maa_set_path)
             else:
                 shutil.copy(
-                    self.json_path / "Default/gui.json",
-                    self.set_path,
+                    self.config_path / "Default/gui.json",
+                    self.maa_set_path,
                 )
         elif (mode == "设置MAA_全局") or (
-            ("日常代理" in mode or "人工排查" in mode)
+            ("自动代理" in mode or "人工排查" in mode)
             and self.data[index][15] == "simple"
         ):
             shutil.copy(
-                self.json_path / "Default/gui.json",
-                self.set_path,
+                self.config_path / "Default/gui.json",
+                self.maa_set_path,
             )
-        elif "日常代理" in mode and self.data[index][15] == "beta":
-            if mode == "日常代理_剿灭":
+        elif "自动代理" in mode and self.data[index][15] == "beta":
+            if mode == "自动代理_剿灭":
                 shutil.copy(
-                    self.json_path
+                    self.config_path
                     / f"beta/{self.data[index][16]}/annihilation/gui.json",
-                    self.set_path,
+                    self.maa_set_path,
                 )
-            elif mode == "日常代理_日常":
+            elif mode == "自动代理_日常":
                 shutil.copy(
-                    self.json_path / f"beta/{self.data[index][16]}/routine/gui.json",
-                    self.set_path,
+                    self.config_path / f"beta/{self.data[index][16]}/routine/gui.json",
+                    self.maa_set_path,
                 )
         elif "人工排查" in mode and self.data[index][15] == "beta":
             shutil.copy(
-                self.json_path / f"beta/{self.data[index][16]}/routine/gui.json",
-                self.set_path,
+                self.config_path / f"beta/{self.data[index][16]}/routine/gui.json",
+                self.maa_set_path,
             )
-        with self.set_path.open(mode="r", encoding="utf-8") as f:
+        with self.maa_set_path.open(mode="r", encoding="utf-8") as f:
             data = json.load(f)
 
-        # 日常代理配置
-        if "日常代理" in mode:
+        # 自动代理配置
+        if "自动代理" in mode:
 
             data["Current"] = "Default"  # 切换配置
             for i in range(1, 9):
@@ -661,12 +669,14 @@ class MaaManager(QtCore.QThread):
             data["Configurations"]["Default"][
                 "MainFunction.PostActions"
             ] = "12"  # 完成后退出MAA和模拟器
-            data["Global"]["Start.RunDirectly"] = "True"  # 启动MAA后直接运行
-            data["Global"][
+            data["Configurations"]["Default"][
+                "Start.RunDirectly"
+            ] = "True"  # 启动MAA后直接运行
+            data["Configurations"]["Default"][
                 "Start.OpenEmulatorAfterLaunch"
             ] = "True"  # 启动MAA后自动开启模拟器
 
-            if self.if_silence:
+            if Config.global_config.get(Config.global_config.function_IfSilence):
                 data["Global"]["Start.MinimizeDirectly"] = "True"  # 启动MAA后直接最小化
                 data["Global"]["GUI.UseTray"] = "True"  # 显示托盘图标
                 data["Global"]["GUI.MinimizeToTray"] = "True"  # 最小化时隐藏至托盘
@@ -689,9 +699,11 @@ class MaaManager(QtCore.QThread):
                 ]  # 客户端类型
                 # 账号切换
                 if self.data[index][2] == "Official":
-                    data["Configurations"]["Default"][
-                        "Start.AccountName"
-                    ] = f"{self.data[index][1][:3]}****{self.data[index][1][7:]}"
+                    data["Configurations"]["Default"]["Start.AccountName"] = (
+                        f"{self.data[index][1][:3]}****{self.data[index][1][7:]}"
+                        if len(self.data[index][1]) == 11
+                        else self.data[index][1]
+                    )
                 elif self.data[index][2] == "Bilibili":
                     data["Configurations"]["Default"]["Start.AccountName"] = self.data[
                         index
@@ -857,7 +869,10 @@ class MaaManager(QtCore.QThread):
                         ] = "False"  # 自定义基建配置文件只读
                         data["Configurations"]["Default"][
                             "Infrast.CustomInfrastFile"
-                        ] = f"{self.json_path}/simple/{self.data[index][16]}/infrastructure/infrastructure.json"  # 自定义基建配置文件地址
+                        ] = str(
+                            self.config_path
+                            / f"simple/{self.data[index][16]}/infrastructure/infrastructure.json"
+                        )  # 自定义基建配置文件地址
 
         # 人工排查配置
         elif "人工排查" in mode:
@@ -868,15 +883,27 @@ class MaaManager(QtCore.QThread):
             data["Configurations"]["Default"][
                 "MainFunction.PostActions"
             ] = "8"  # 完成后退出MAA
-            data["Global"]["Start.RunDirectly"] = "True"  # 启动MAA后直接运行
+            data["Configurations"]["Default"][
+                "Start.RunDirectly"
+            ] = "True"  # 启动MAA后直接运行
             data["Global"]["Start.MinimizeDirectly"] = "True"  # 启动MAA后直接最小化
+            # v5.1.12版本对以下字段处理
+            # 启动MAA后直接运行
+            data["Configurations"]["Default"]["Start.OpenEmulatorAfterLaunch"] = "True"
+            # 启动MAA后自动开启模拟器
+            data["Configurations"]["Default"]["Start.RunDirectly"] = "True"
+
             data["Global"]["GUI.UseTray"] = "True"  # 显示托盘图标
             data["Global"]["GUI.MinimizeToTray"] = "True"  # 最小化时隐藏至托盘
             # 启动MAA后自动开启模拟器
             if "启动模拟器" in mode:
-                data["Global"]["Start.OpenEmulatorAfterLaunch"] = "True"
+                data["Configurations"]["Default"][
+                    "Start.OpenEmulatorAfterLaunch"
+                ] = "True"
             elif "仅切换账号" in mode:
-                data["Global"]["Start.OpenEmulatorAfterLaunch"] = "False"
+                data["Configurations"]["Default"][
+                    "Start.OpenEmulatorAfterLaunch"
+                ] = "False"
 
             if self.data[index][15] == "simple":
 
@@ -896,9 +923,11 @@ class MaaManager(QtCore.QThread):
                 ]  # 客户端类型
                 # 账号切换
                 if self.data[index][2] == "Official":
-                    data["Configurations"]["Default"][
-                        "Start.AccountName"
-                    ] = f"{self.data[index][1][:3]}****{self.data[index][1][7:]}"
+                    data["Configurations"]["Default"]["Start.AccountName"] = (
+                        f"{self.data[index][1][:3]}****{self.data[index][1][7:]}"
+                        if len(self.data[index][1]) == 11
+                        else self.data[index][1]
+                    )
                 elif self.data[index][2] == "Bilibili":
                     data["Configurations"]["Default"]["Start.AccountName"] = self.data[
                         index
@@ -938,12 +967,14 @@ class MaaManager(QtCore.QThread):
             data["Configurations"]["Default"][
                 "MainFunction.PostActions"
             ] = "0"  # 完成后无动作
-            data["Global"]["Start.RunDirectly"] = "False"  # 启动MAA后直接运行
-            data["Global"][
+            data["Configurations"]["Default"][
+                "Start.RunDirectly"
+            ] = "False"  # 启动MAA后直接运行
+            data["Configurations"]["Default"][
                 "Start.OpenEmulatorAfterLaunch"
             ] = "False"  # 启动MAA后自动开启模拟器
 
-            if self.if_silence:
+            if Config.global_config.get(Config.global_config.function_IfSilence):
                 data["Global"][
                     "Start.MinimizeDirectly"
                 ] = "False"  # 启动MAA后直接最小化
@@ -985,8 +1016,8 @@ class MaaManager(QtCore.QThread):
                 ] = "False"  # 生息演算
 
         # 覆写配置文件
-        with self.set_path.open(mode="w", encoding="utf-8") as f:
-            json.dump(data, f, indent=4)
+        with self.maa_set_path.open(mode="w", encoding="utf-8") as f:
+            json.dump(data, f, ensure_ascii=False, indent=4)
 
         return True
 
@@ -994,7 +1025,7 @@ class MaaManager(QtCore.QThread):
         """获取模拟器路径"""
 
         # 读取配置文件
-        with self.set_path.open(mode="r", encoding="utf-8") as f:
+        with self.maa_set_path.open(mode="r", encoding="utf-8") as f:
             set = json.load(f)
         # 获取模拟器路径
         return Path(set["Configurations"]["Default"]["Start.EmulatorPath"])
@@ -1002,7 +1033,7 @@ class MaaManager(QtCore.QThread):
     def server_date(self):
         """获取当前的服务器日期"""
 
-        dt = datetime.datetime.now()
-        if dt.time() < datetime.datetime.min.time().replace(hour=4):
-            dt = dt - datetime.timedelta(days=1)
+        dt = datetime.now()
+        if dt.time() < datetime.min.time().replace(hour=4):
+            dt = dt - timedelta(days=1)
         return dt.strftime("%Y-%m-%d")

app/services/__init__.py

@@ -29,7 +29,8 @@ __version__ = "4.2.0"
 __author__ = "DLmaster361 <DLmaster_361@163.com>"
 __license__ = "GPL-3.0 license"
 
-from .notification import Notification
-from .security import CryptoHandler
+from .notification import Notify
+from .security import Crypto
+from .system import System
 
-__all__ = ["Notification", "CryptoHandler"]
+__all__ = ["Notify", "Crypto", "System"]

app/services/notification.py

@@ -24,35 +24,35 @@ AUTO_MAA通知服务
 v4.2
 作者：DLmaster_361
 """
-
+import requests
+from loguru import logger
 from plyer import notification
 import smtplib
 from email.mime.text import MIMEText
 from email.header import Header
 from email.utils import formataddr
-import os
 
-from app import AppConfig
+from serverchan_sdk import sc_send
+
+from app.core import Config
 
 
 class Notification:
 
-    def __init__(self, config: AppConfig):
-
-        self.config = config
-
     def push_notification(self, title, message, ticker, t):
         """推送系统通知"""
 
-        notification.notify(
-            title=title,
-            message=message,
-            app_name="AUTO_MAA",
-            app_icon=str(self.config.app_path / "resources/icons/AUTO_MAA.ico"),
-            timeout=t,
-            ticker=ticker,
-            toast=True,
-        )
+        if Config.global_config.get(Config.global_config.notify_IfPushPlyer):
+
+            notification.notify(
+                title=title,
+                message=message,
+                app_name="AUTO_MAA",
+                app_icon=str(Config.app_path / "resources/icons/AUTO_MAA.ico"),
+                timeout=t,
+                ticker=ticker,
+                toast=True,
+            )
 
         return True
 
@@ -62,34 +62,99 @@ class Notification:
         # 声明：此邮箱为AUTO_MAA项目组资产，未经授权不得私自使用
         # 注意：此声明注释只有使用者更换发信邮箱时才能删除，本条规则优先级高于GPLv3
 
-        # 第三方 SMTP 服务配置
-        mail_host = "smtp.163.com"  # 设置服务器
-        mail_sender = "AUTO_MAA_server@163.com"  # 用户名
-        mail_key = "SYrq87nDLD4RNB5T"  # 授权码 24/11/15
+        if Config.global_config.get(Config.global_config.notify_IfSendMail):
 
-        # 定义邮件正文
-        message = MIMEText(content, "plain", "utf-8")
-        message["From"] = formataddr(
-            (Header("AUTO_MAA通知服务", "utf-8").encode(), "AUTO_MAA_server@163.com")
-        )  # 发件人显示的名字
-        message["To"] = formataddr(
-            (
-                Header("AUTO_MAA用户", "utf-8").encode(),
-                self.config.content["Default"]["SelfSet.MailAddress"],
-            )
-        )  # 收件人显示的名字
-        message["Subject"] = Header(title, "utf-8")
+            # 第三方 SMTP 服务配置
+            mail_host = "smtp.163.com"  # 设置服务器
+            mail_sender = "AUTO_MAA_server@163.com"  # 用户名
+            mail_key = "SYrq87nDLD4RNB5T"  # 授权码 24/11/15
 
-        try:
-            smtpObj = smtplib.SMTP_SSL(mail_host, 465)  # 465为SMTP_SSL默认端口
-            smtpObj.login(mail_sender, mail_key)
-            smtpObj.sendmail(
-                mail_sender,
-                self.config.content["Default"]["SelfSet.MailAddress"],
-                message.as_string(),
+            # 定义邮件正文
+            message = MIMEText(content, "plain", "utf-8")
+            message["From"] = formataddr(
+                (
+                    Header("AUTO_MAA通知服务", "utf-8").encode(),
+                    "AUTO_MAA_server@163.com",
+                )
+            )  # 发件人显示的名字
+            message["To"] = formataddr(
+                (
+                    Header("AUTO_MAA用户", "utf-8").encode(),
+                    Config.global_config.get(Config.global_config.notify_MailAddress),
+                )
+            )  # 收件人显示的名字
+            message["Subject"] = Header(title, "utf-8")
+
+            try:
+                smtpObj = smtplib.SMTP_SSL(mail_host, 465)  # 465为SMTP_SSL默认端口
+                smtpObj.login(mail_sender, mail_key)
+                smtpObj.sendmail(
+                    mail_sender,
+                    Config.global_config.get(Config.global_config.notify_MailAddress),
+                    message.as_string(),
+                )
+                return True
+            except smtplib.SMTPException as e:
+                return f"发送邮件时出错：\n{e}"
+            finally:
+                smtpObj.quit()
+
+    def ServerChanPush(self, title, content):
+        """使用Server酱推送通知"""
+
+        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 is_valid(send_channel):
+                option['channel'] = send_channel
+            else:
+                option['channel'] = ''
+                logger.warning('请正确设置Auto_MAA中ServerChan的Channel。')
+
+            response = sc_send(send_key, title, content, option)
+            if response["code"] == 0:
+                logger.info("Server酱推送通知成功")
+                return True
+            else:
+                logger.info("Server酱推送通知失败")
+                logger.error(response)
+                return f'使用Server酱推送通知时出错：\n{response["data"]['error']}'
+
+    def CompanyWebHookBotPush(self, title, content):
+        """使用企业微信群机器人推送通知"""
+        if Config.global_config.get(Config.global_config.notify_IfCompanyWebHookBot):
+            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
             )
-            return True
-        except smtplib.SMTPException as e:
-            return f"发送邮件时出错：\n{e}"
-        finally:
-            smtpObj.quit()
+            if response.json()["errcode"] == 0:
+                logger.info("企业微信群机器人推送通知成功")
+                return True
+            else:
+                logger.info("企业微信群机器人推送通知失败")
+                logger.error(response.json())
+                return f'使用企业微信群机器人推送通知时出错：\n{response.json()["errmsg"]}'
+
+
+Notify = Notification()

app/services/security.py

@@ -20,51 +20,50 @@
 
 """
 AUTO_MAA
-AUTO_MAA主程序
+AUTO_MAA安全服务
 v4.2
 作者：DLmaster_361
 """
 
-import os
+from loguru import logger
+import sqlite3
 import hashlib
 import random
 import secrets
+from pathlib import Path
 from Crypto.Cipher import AES
 from Crypto.PublicKey import RSA
 from Crypto.Cipher import PKCS1_OAEP
 from Crypto.Util.Padding import pad, unpad
+from typing import List, Dict, Union
 
-from app import AppConfig
+from app.core import Config
 
 
 class CryptoHandler:
 
-    def __init__(self, config: AppConfig):
-
-        self.config = config
-
     def get_PASSWORD(self, PASSWORD: str) -> None:
         """配置管理密钥"""
 
         # 生成目录
-        self.config.key_path.mkdir(parents=True, exist_ok=True)
+        Config.key_path.mkdir(parents=True, exist_ok=True)
 
         # 生成RSA密钥对
         key = RSA.generate(2048)
         public_key_local = key.publickey()
         private_key = key
         # 保存RSA公钥
-        (self.config.app_path / "data/key/public_key.pem").write_bytes(
+        (Config.app_path / "data/key/public_key.pem").write_bytes(
             public_key_local.exportKey()
         )
         # 生成密钥转换与校验随机盐
         PASSWORD_salt = secrets.token_hex(random.randint(32, 1024))
-        (self.config.app_path / "data/key/PASSWORDsalt.txt").write_text(
+        (Config.app_path / "data/key/PASSWORDsalt.txt").write_text(
             PASSWORD_salt,
             encoding="utf-8",
         )
         verify_salt = secrets.token_hex(random.randint(32, 1024))
-        (self.config.app_path / "data/key/verifysalt.txt").write_text(
+        (Config.app_path / "data/key/verifysalt.txt").write_text(
             verify_salt,
             encoding="utf-8",
         )
@@ -76,22 +75,20 @@ class CryptoHandler:
         AES_password_verify = hashlib.sha256(
             AES_password + verify_salt.encode("utf-8")
         ).digest()
-        (self.config.app_path / "data/key/AES_password_verify.bin").write_bytes(
+        (Config.app_path / "data/key/AES_password_verify.bin").write_bytes(
             AES_password_verify
         )
         # AES-256加密RSA私钥并保存密文
         AES_key = AES.new(AES_password, AES.MODE_ECB)
         private_key_local = AES_key.encrypt(pad(private_key.exportKey(), 32))
-        (self.config.app_path / "data/key/private_key.bin").write_bytes(
-            private_key_local
-        )
+        (Config.app_path / "data/key/private_key.bin").write_bytes(private_key_local)
 
     def encryptx(self, note: str) -> bytes:
         """加密数据"""
 
         # 读取RSA公钥
         public_key_local = RSA.import_key(
-            (self.config.app_path / "data/key/public_key.pem").read_bytes()
+            (Config.app_path / "data/key/public_key.pem").read_bytes()
         )
         # 使用RSA公钥对数据进行加密
         cipher = PKCS1_OAEP.new(public_key_local)
@@ -103,22 +100,20 @@ class CryptoHandler:
 
         # 读入RSA私钥密文、盐与校验哈希值
         private_key_local = (
-            (self.config.app_path / "data/key/private_key.bin").read_bytes().strip()
+            (Config.app_path / "data/key/private_key.bin").read_bytes().strip()
         )
         PASSWORD_salt = (
-            (self.config.app_path / "data/key/PASSWORDsalt.txt")
+            (Config.app_path / "data/key/PASSWORDsalt.txt")
             .read_text(encoding="utf-8")
             .strip()
         )
         verify_salt = (
-            (self.config.app_path / "data/key/verifysalt.txt")
+            (Config.app_path / "data/key/verifysalt.txt")
             .read_text(encoding="utf-8")
             .strip()
         )
         AES_password_verify = (
-            (self.config.app_path / "data/key/AES_password_verify.bin")
-            .read_bytes()
-            .strip()
+            (Config.app_path / "data/key/AES_password_verify.bin").read_bytes().strip()
         )
         # 将管理密钥转化为AES-256密钥并验证
         AES_password = hashlib.sha256(
@@ -139,29 +134,70 @@ class CryptoHandler:
             note = decrypter.decrypt(note)
             return note.decode("utf-8")
 
-    def change_PASSWORD(self, data: list, PASSWORD_old: str, PASSWORD_new: str) -> None:
+    def change_PASSWORD(self, PASSWORD_old: str, PASSWORD_new: str) -> None:
         """修改管理密钥"""
 
-        # 使用旧管理密钥解密
-        new_data = []
-        for i in range(len(data)):
-            new_data.append(self.decryptx(data[i][12], PASSWORD_old))
-        # 使用新管理密钥重新加密
+        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()
+
+            # 使用旧管理密钥解密
+            user_data["Password"] = []
+            for i in range(len(data)):
+                user_data["Password"].append(self.decryptx(data[i][12], PASSWORD_old))
+            cur.close()
+            db.close()
+
         self.get_PASSWORD(PASSWORD_new)
-        for i in range(len(data)):
-            self.config.cur.execute(
-                "UPDATE adminx SET password = ? WHERE mode = ? AND uid = ?",
-                (
-                    self.encryptx(new_data[i]),
-                    data[i][15],
-                    data[i][16],
-                ),
-            )
-            self.config.db.commit(),
-            new_data[i] = None
-        del new_data
+
+        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 i in range(len(data)):
+                cur.execute(
+                    "UPDATE adminx SET password = ? WHERE mode = ? AND uid = ?",
+                    (
+                        self.encryptx(user_data["Password"][i]),
+                        data[i][15],
+                        data[i][16],
+                    ),
+                )
+                db.commit()
+                user_data["Password"][i] = None
+            del user_data["Password"]
+
+            cur.close()
+            db.close()
+
+    def search_member(self) -> List[Dict[str, Union[Path, list]]]:
+        """搜索所有脚本实例及其用户数据库路径"""
+
+        member_list = []
+
+        if (Config.app_path / "config/MaaConfig").exists():
+            for subdir in (Config.app_path / "config/MaaConfig").iterdir():
+                if subdir.is_dir():
+
+                    member_list.append({"Path": subdir / "user_data.db"})
+
+        return member_list
 
     def check_PASSWORD(self, PASSWORD: str) -> bool:
         """验证管理密钥"""
 
         return bool(self.decryptx(self.encryptx(""), PASSWORD) != "管理密钥错误")
+
+
+Crypto = CryptoHandler()

app/services/system.py

@@ -0,0 +1,120 @@
+#   <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系统服务
+v4.2
+作者：DLmaster_361
+"""
+
+import ctypes
+import win32gui
+import win32process
+import winreg
+import psutil
+
+from app.core import Config
+
+
+class SystemHandler:
+
+    ES_CONTINUOUS = 0x80000000
+    ES_SYSTEM_REQUIRED = 0x00000001
+
+    def __init__(self):
+
+        self.set_Sleep()
+        self.set_SelfStart()
+
+    def set_Sleep(self):
+        """同步系统休眠状态"""
+
+        if Config.global_config.get(Config.global_config.function_IfAllowSleep):
+            # 设置系统电源状态
+            ctypes.windll.kernel32.SetThreadExecutionState(
+                self.ES_CONTINUOUS | self.ES_SYSTEM_REQUIRED
+            )
+        else:
+            # 恢复系统电源状态
+            ctypes.windll.kernel32.SetThreadExecutionState(self.ES_CONTINUOUS)
+
+    def set_SelfStart(self):
+        """同步开机自启"""
+
+        if (
+            Config.global_config.get(Config.global_config.start_IfSelfStart)
+            and not self.is_startup()
+        ):
+            key = winreg.OpenKey(
+                winreg.HKEY_CURRENT_USER,
+                r"Software\Microsoft\Windows\CurrentVersion\Run",
+                winreg.KEY_SET_VALUE,
+                winreg.KEY_ALL_ACCESS | winreg.KEY_WRITE | winreg.KEY_CREATE_SUB_KEY,
+            )
+            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()
+        ):
+            key = winreg.OpenKey(
+                winreg.HKEY_CURRENT_USER,
+                r"Software\Microsoft\Windows\CurrentVersion\Run",
+                winreg.KEY_SET_VALUE,
+                winreg.KEY_ALL_ACCESS | winreg.KEY_WRITE | winreg.KEY_CREATE_SUB_KEY,
+            )
+            winreg.DeleteValue(key, "AUTO_MAA")
+            winreg.CloseKey(key)
+
+    def is_startup(self):
+        """判断程序是否已经开机自启"""
+
+        key = winreg.OpenKey(
+            winreg.HKEY_CURRENT_USER,
+            r"Software\Microsoft\Windows\CurrentVersion\Run",
+            0,
+            winreg.KEY_READ,
+        )
+
+        try:
+            value, _ = winreg.QueryValueEx(key, "AUTO_MAA")
+            winreg.CloseKey(key)
+            return True
+        except FileNotFoundError:
+            winreg.CloseKey(key)
+            return False
+
+    def get_window_info(self):
+        """获取当前窗口信息"""
+
+        def callback(hwnd, window_info):
+            if win32gui.IsWindowVisible(hwnd) and win32gui.GetWindowText(hwnd):
+                _, pid = win32process.GetWindowThreadProcessId(hwnd)
+                process = psutil.Process(pid)
+                window_info.append((win32gui.GetWindowText(hwnd), process.exe()))
+            return True
+
+        window_info = []
+        win32gui.EnumWindows(callback, window_info)
+        return window_info
+
+
+System = SystemHandler()

app/ui/Widget.py

@@ -0,0 +1,282 @@
+#   <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组件
+v4.2
+作者：DLmaster_361
+"""
+
+from PySide6.QtCore import Qt, QTime
+from PySide6.QtGui import QIcon
+from PySide6.QtWidgets import QWidget, QHBoxLayout
+from qfluentwidgets import (
+    LineEdit,
+    PasswordLineEdit,
+    MessageBoxBase,
+    SubtitleLabel,
+    SettingCard,
+    SpinBox,
+    FluentIconBase,
+    Signal,
+    ComboBox,
+    CheckBox,
+    qconfig,
+    ConfigItem,
+    TimeEdit,
+    OptionsConfigItem,
+)
+
+from typing import Union, List
+
+
+class InputMessageBox(MessageBoxBase):
+    """输入对话框"""
+
+    def __init__(self, parent, title: str, content: str, mode: str, list: list = None):
+        super().__init__(parent)
+        self.title = SubtitleLabel(title)
+
+        if mode == "明文":
+            self.input = LineEdit()
+            self.input.setClearButtonEnabled(True)
+        elif mode == "密码":
+            self.input = PasswordLineEdit()
+        elif mode == "选择":
+            self.input = ComboBox()
+            self.input.addItems(list)
+            self.input.setCurrentIndex(-1)
+
+        self.input.setPlaceholderText(content)
+
+        # 将组件添加到布局中
+        self.viewLayout.addWidget(self.title)
+        self.viewLayout.addWidget(self.input)
+
+
+class SetMessageBox(MessageBoxBase):
+    """输入对话框"""
+
+    def __init__(self, parent, title: str, content: List[str], list: List[List[str]]):
+        super().__init__(parent)
+        self.title = SubtitleLabel(title)
+
+        Widget = QWidget()
+        Layout = QHBoxLayout(Widget)
+
+        self.input: List[ComboBox] = []
+
+        for i in range(len(content)):
+
+            self.input.append(ComboBox())
+            self.input[i].addItems(list[i])
+            self.input[i].setCurrentIndex(-1)
+            self.input[i].setPlaceholderText(content[i])
+            Layout.addWidget(self.input[i])
+
+        # 将组件添加到布局中
+        self.viewLayout.addWidget(self.title)
+        self.viewLayout.addWidget(Widget)
+
+
+class LineEditSettingCard(SettingCard):
+    """Setting card with switch button"""
+
+    textChanged = Signal(str)
+
+    def __init__(
+        self,
+        text,
+        icon: Union[str, QIcon, FluentIconBase],
+        title,
+        content=None,
+        configItem: ConfigItem = None,
+        parent=None,
+    ):
+
+        super().__init__(icon, title, content, parent)
+        self.configItem = configItem
+        self.LineEdit = LineEdit(self)
+        self.LineEdit.setMinimumWidth(250)
+        self.LineEdit.setPlaceholderText(text)
+
+        if configItem:
+            self.setValue(qconfig.get(configItem))
+            configItem.valueChanged.connect(self.setValue)
+
+        self.hBoxLayout.addWidget(self.LineEdit, 0, Qt.AlignRight)
+        self.hBoxLayout.addSpacing(16)
+
+        self.LineEdit.textChanged.connect(self.__textChanged)
+
+    def __textChanged(self, content: str):
+        self.setValue(content)
+        self.textChanged.emit(content)
+
+    def setValue(self, content: str):
+        if self.configItem:
+            qconfig.set(self.configItem, content)
+
+        self.LineEdit.setText(content)
+
+
+class SpinBoxSettingCard(SettingCard):
+
+    textChanged = Signal(int)
+
+    def __init__(
+        self,
+        range: tuple[int, int],
+        icon: Union[str, QIcon, FluentIconBase],
+        title,
+        content=None,
+        configItem: ConfigItem = None,
+        parent=None,
+    ):
+
+        super().__init__(icon, title, content, parent)
+        self.configItem = configItem
+        self.SpinBox = SpinBox(self)
+        self.SpinBox.setRange(range[0], range[1])
+        self.SpinBox.setMinimumWidth(150)
+
+        if configItem:
+            self.setValue(qconfig.get(configItem))
+            configItem.valueChanged.connect(self.setValue)
+
+        self.hBoxLayout.addWidget(self.SpinBox, 0, Qt.AlignRight)
+        self.hBoxLayout.addSpacing(16)
+
+        self.SpinBox.valueChanged.connect(self.__valueChanged)
+
+    def __valueChanged(self, value: int):
+        self.setValue(value)
+        self.textChanged.emit(value)
+
+    def setValue(self, value: int):
+        if self.configItem:
+            qconfig.set(self.configItem, value)
+
+        self.SpinBox.setValue(value)
+
+
+class NoOptionComboBoxSettingCard(SettingCard):
+
+    def __init__(
+        self,
+        configItem: OptionsConfigItem,
+        icon: Union[str, QIcon, FluentIconBase],
+        title,
+        content=None,
+        value=None,
+        texts=None,
+        parent=None,
+    ):
+
+        super().__init__(icon, title, content, parent)
+        self.configItem = configItem
+        self.comboBox = ComboBox(self)
+        self.comboBox.setMinimumWidth(250)
+        self.hBoxLayout.addWidget(self.comboBox, 0, Qt.AlignRight)
+        self.hBoxLayout.addSpacing(16)
+
+        self.optionToText = {o: t for o, t in zip(value, texts)}
+        for text, option in zip(texts, value):
+            self.comboBox.addItem(text, userData=option)
+
+        self.comboBox.setCurrentText(self.optionToText[qconfig.get(configItem)])
+        self.comboBox.currentIndexChanged.connect(self._onCurrentIndexChanged)
+        configItem.valueChanged.connect(self.setValue)
+
+    def _onCurrentIndexChanged(self, index: int):
+
+        qconfig.set(self.configItem, self.comboBox.itemData(index))
+
+    def setValue(self, value):
+        if value not in self.optionToText:
+            return
+
+        self.comboBox.setCurrentText(self.optionToText[value])
+        qconfig.set(self.configItem, value)
+
+
+class TimeEditSettingCard(SettingCard):
+
+    enabledChanged = Signal(bool)
+    timeChanged = Signal(str)
+
+    def __init__(
+        self,
+        icon: Union[str, QIcon, FluentIconBase],
+        title,
+        content=None,
+        configItem_bool: ConfigItem = None,
+        configItem_time: ConfigItem = None,
+        parent=None,
+    ):
+
+        super().__init__(icon, title, content, parent)
+        self.configItem_bool = configItem_bool
+        self.configItem_time = configItem_time
+        self.CheckBox = CheckBox(self)
+        self.CheckBox.setTristate(False)
+        self.TimeEdit = TimeEdit(self)
+        self.TimeEdit.setDisplayFormat("HH:mm")
+        self.TimeEdit.setMinimumWidth(150)
+
+        if configItem_bool:
+            self.setValue_bool(qconfig.get(configItem_bool))
+            configItem_bool.valueChanged.connect(self.setValue_bool)
+
+        if configItem_time:
+            self.setValue_time(qconfig.get(configItem_time))
+            configItem_time.valueChanged.connect(self.setValue_time)
+
+        self.hBoxLayout.addWidget(self.CheckBox, 0, Qt.AlignRight)
+        self.hBoxLayout.addWidget(self.TimeEdit, 0, Qt.AlignRight)
+        self.hBoxLayout.addSpacing(16)
+
+        self.CheckBox.stateChanged.connect(self.__enableChanged)
+        self.TimeEdit.timeChanged.connect(self.__timeChanged)
+
+    def __timeChanged(self, value: QTime):
+        self.setValue_time(value.toString("HH:mm"))
+        self.timeChanged.emit(value.toString("HH:mm"))
+
+    def __enableChanged(self, value: int):
+        if value == 0:
+            self.setValue_bool(False)
+            self.enabledChanged.emit(False)
+        else:
+            self.setValue_bool(True)
+            self.enabledChanged.emit(True)
+
+    def setValue_bool(self, value: bool):
+        if self.configItem_bool:
+            qconfig.set(self.configItem_bool, value)
+
+        self.CheckBox.setChecked(value)
+
+    def setValue_time(self, value: str):
+        if self.configItem_time:
+            qconfig.set(self.configItem_time, value)
+
+        self.TimeEdit.setTime(QTime.fromString(value, "HH:mm"))

app/ui/__init__.py

@@ -29,6 +29,6 @@ __version__ = "4.2.0"
 __author__ = "DLmaster361 <DLmaster_361@163.com>"
 __license__ = "GPL-3.0 license"
 
-from .gui import AUTO_MAA
+from .main_window import AUTO_MAA
 
 __all__ = ["AUTO_MAA"]

app/ui/dispatch_center.py

@@ -0,0 +1,446 @@
+#   <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调度中枢界面
+v4.2
+作者：DLmaster_361
+"""
+
+from loguru import logger
+from PySide6.QtWidgets import (
+    QWidget,
+    QVBoxLayout,
+    QStackedWidget,
+    QHBoxLayout,
+)
+from qfluentwidgets import (
+    CardWidget,
+    IconWidget,
+    BodyLabel,
+    Pivot,
+    ScrollArea,
+    FluentIcon,
+    HeaderCardWidget,
+    FluentIcon,
+    TextBrowser,
+    ComboBox,
+    SubtitleLabel,
+    PushButton,
+)
+from PySide6.QtCore import Qt
+from PySide6.QtGui import QTextCursor
+from typing import List, Dict
+import json
+
+
+from app.core import Config, Task_manager, Task, MainInfoBar
+
+
+class DispatchCenter(QWidget):
+
+    def __init__(self, parent=None):
+        super().__init__(parent)
+
+        self.setObjectName("调度中枢")
+
+        self.pivot = Pivot(self)
+        self.stackedWidget = QStackedWidget(self)
+        self.Layout = QVBoxLayout(self)
+
+        self.script_list: Dict[str, DispatchBox] = {}
+
+        dispatch_box = DispatchBox("主调度台", self)
+        self.script_list["主调度台"] = dispatch_box
+        self.stackedWidget.addWidget(self.script_list["主调度台"])
+        self.pivot.addItem(
+            routeKey="主调度台",
+            text="主调度台",
+            onClick=self.update_top_bar,
+            icon=FluentIcon.CAFE,
+        )
+
+        self.Layout.addWidget(self.pivot, 0, Qt.AlignHCenter)
+        self.Layout.addWidget(self.stackedWidget)
+        self.Layout.setContentsMargins(0, 0, 0, 0)
+
+        self.pivot.currentItemChanged.connect(
+            lambda index: self.stackedWidget.setCurrentWidget(self.script_list[index])
+        )
+
+    def add_board(self, task: Task) -> None:
+        """添加一个调度台界面"""
+
+        dispatch_box = DispatchBox(task.name, self)
+
+        dispatch_box.top_bar.button.clicked.connect(
+            lambda: Task_manager.stop_task(task.name)
+        )
+
+        task.create_task_list.connect(dispatch_box.info.task.create_task)
+        task.create_user_list.connect(dispatch_box.info.user.create_user)
+        task.update_task_list.connect(dispatch_box.info.task.update_task)
+        task.update_user_list.connect(dispatch_box.info.user.update_user)
+        task.update_log_text.connect(dispatch_box.info.log_text.text.setText)
+        task.accomplish.connect(lambda: self.del_board(f"调度台_{task.name}"))
+
+        self.script_list[f"调度台_{task.name}"] = dispatch_box
+
+        self.stackedWidget.addWidget(self.script_list[f"调度台_{task.name}"])
+
+        self.pivot.addItem(routeKey=f"调度台_{task.name}", text=f"调度台 {task.name}")
+
+    def del_board(self, name: str) -> None:
+        """删除指定子界面"""
+
+        self.pivot.setCurrentItem("主调度台")
+        self.stackedWidget.removeWidget(self.script_list[name])
+        self.script_list[name].deleteLater()
+        self.pivot.removeWidget(name)
+
+    def connect_main_board(self, task: Task) -> None:
+        """连接主调度台"""
+
+        self.script_list["主调度台"].top_bar.Lable.setText(
+            f"{task.name} - {task.mode.replace("_主调度台","")}模式"
+        )
+        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(
+            lambda: Task_manager.stop_task(task.name)
+        )
+        task.create_task_list.connect(
+            self.script_list["主调度台"].info.task.create_task
+        )
+        task.create_user_list.connect(
+            self.script_list["主调度台"].info.user.create_user
+        )
+        task.update_task_list.connect(
+            self.script_list["主调度台"].info.task.update_task
+        )
+        task.update_user_list.connect(
+            self.script_list["主调度台"].info.user.update_user
+        )
+        task.update_log_text.connect(
+            self.script_list["主调度台"].info.log_text.text.setText
+        )
+        task.accomplish.connect(lambda: self.disconnect_main_board(task.name))
+
+    def disconnect_main_board(self, name: str) -> 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"]
+        )
+
+    def update_top_bar(self):
+        """更新顶栏"""
+
+        list = []
+
+        if (Config.app_path / "config/QueueConfig").exists():
+            for json_file in (Config.app_path / "config/QueueConfig").glob("*.json"):
+                list.append(f"队列 - {json_file.stem}")
+
+        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}")
+
+        self.script_list["主调度台"].top_bar.object.clear()
+        self.script_list["主调度台"].top_bar.object.addItems(list)
+        self.script_list["主调度台"].top_bar.object.setCurrentIndex(-1)
+        self.script_list["主调度台"].top_bar.mode.setCurrentIndex(-1)
+
+
+class DispatchBox(QWidget):
+
+    def __init__(self, name: str, parent=None):
+        super().__init__(parent)
+
+        self.setObjectName(name)
+
+        layout = QVBoxLayout()
+
+        scrollArea = ScrollArea()
+        scrollArea.setWidgetResizable(True)
+
+        content_widget = QWidget()
+        content_layout = QVBoxLayout(content_widget)
+
+        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.addItems(["自动代理", "人工排查"])
+                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]
+
+            if name in Config.running_list:
+                logger.warning(f"任务已存在：{name}")
+                MainInfoBar.push_info_bar("warning", "任务已存在", name, 5000)
+                return None
+
+            if self.object.currentText().split(" - ")[0] == "队列":
+
+                with (Config.app_path / f"config/QueueConfig/{name}.json").open(
+                    mode="r", encoding="utf-8"
+                ) as f:
+                    info = json.load(f)
+
+                logger.info(f"用户添加任务：{name}")
+                Task_manager.add_task(f"{self.mode.currentText()}_主调度台", name, info)
+
+            elif self.object.currentText().split(" - ")[0] == "实例":
+
+                if self.object.currentText().split(" - ")[1] == "Maa":
+
+                    info = {"Queue": {"Member_1": name}}
+
+                    logger.info(f"用户添加任务：{name}")
+                    Task_manager.add_task(
+                        f"{self.mode.currentText()}_主调度台", "用户自定义队列", info
+                    )
+
+    class DispatchInfoCard(HeaderCardWidget):
+
+        def __init__(self, parent=None):
+            super().__init__(parent)
+
+            self.setTitle("调度信息")
+
+            self.task = self.TaskInfoCard(self)
+            self.user = self.UserInfoCard(self)
+            self.log_text = self.LogCard(self)
+
+            self.viewLayout.addWidget(self.task)
+            self.viewLayout.addWidget(self.user)
+            self.viewLayout.addWidget(self.log_text)
+
+            self.viewLayout.setStretch(0, 1)
+            self.viewLayout.setStretch(1, 1)
+            self.viewLayout.setStretch(2, 5)
+
+        def update_board(self, task_list: list, user_list: list, log: str):
+            """更新调度信息"""
+
+            self.task.update_task(task_list)
+            self.user.update_user(user_list)
+            self.log_text.text.setText(log)
+
+        class TaskInfoCard(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.task_cards: List[ItemCard] = []
+
+            def create_task(self, task_list: list):
+                """创建任务队列"""
+
+                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.task_cards = []
+
+                for task in task_list:
+
+                    self.task_cards.append(ItemCard(task))
+                    self.Layout.addWidget(self.task_cards[-1])
+
+                self.Layout.addStretch(1)
+
+            def update_task(self, task_list: list):
+                """更新任务队列"""
+
+                for i in range(len(task_list)):
+
+                    self.task_cards[i].update_status(task_list[i][1])
+
+        class UserInfoCard(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.user_cards: List[ItemCard] = []
+
+            def create_user(self, user_list: list):
+                """创建用户队列"""
+
+                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.user_cards = []
+
+                for user in user_list:
+
+                    self.user_cards.append(ItemCard(user))
+                    self.Layout.addWidget(self.user_cards[-1])
+
+                self.Layout.addStretch(1)
+
+            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()
+
+
+class ItemCard(CardWidget):
+
+    def __init__(self, task_item: list, parent=None):
+        super().__init__(parent)
+
+        self.Layout = QHBoxLayout(self)
+
+        self.Label = BodyLabel(task_item[0], self)
+        self.icon = IconWidget(FluentIcon.MORE, self)
+        self.icon.setFixedSize(16, 16)
+        self.update_status(task_item[1])
+
+        self.Layout.addWidget(self.icon)
+        self.Layout.addWidget(self.Label)
+        self.Layout.addStretch(1)
+
+    def update_status(self, status: str):
+
+        if status == "完成":
+            self.icon.setIcon(FluentIcon.ACCEPT)
+            self.Label.setTextColor("#0eb840", "#0eb840")
+        elif status == "等待":
+            self.icon.setIcon(FluentIcon.MORE)
+            self.Label.setTextColor("#7397ab", "#7397ab")
+        elif status == "运行":
+            self.icon.setIcon(FluentIcon.PLAY)
+            self.Label.setTextColor("#2e4e7e", "#2e4e7e")
+        elif status == "跳过":
+            self.icon.setIcon(FluentIcon.REMOVE)
+            self.Label.setTextColor("#606060", "#d2d2d2")
+        elif status == "异常":
+            self.icon.setIcon(FluentIcon.CLOSE)
+            self.Label.setTextColor("#ff2121", "#ff2121")

app/ui/main_window.py

@@ -0,0 +1,347 @@
+#   <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主界面
+v4.2
+作者：DLmaster_361
+"""
+
+from loguru import logger
+from PySide6.QtWidgets import (
+    QApplication,
+    QSystemTrayIcon,
+)
+from qfluentwidgets import (
+    Action,
+    PushButton,
+    SystemTrayMenu,
+    SplashScreen,
+    FluentIcon,
+    InfoBar,
+    InfoBarPosition,
+    setTheme,
+    Theme,
+    MSFluentWindow,
+    NavigationItemPosition,
+    qconfig,
+)
+from PySide6.QtGui import QIcon, QCloseEvent
+from PySide6.QtCore import Qt
+
+from app.core import Config, Task_manager, Main_timer, MainInfoBar
+from app.services import Notify, Crypto, System
+from .setting import Setting
+from .member_manager import MemberManager
+from .queue_manager import QueueManager
+from .dispatch_center import DispatchCenter
+
+
+class AUTO_MAA(MSFluentWindow):
+
+    def __init__(self):
+        super().__init__()
+
+        self.setWindowIcon(QIcon(str(Config.app_path / "resources/icons/AUTO_MAA.ico")))
+        self.setWindowTitle("AUTO_MAA")
+
+        setTheme(Theme.AUTO)
+
+        self.splashScreen = SplashScreen(self.windowIcon(), self)
+        self.show_ui("显示主窗口", if_quick=True)
+
+        MainInfoBar.parent = self
+
+        # 创建主窗口
+        self.setting = Setting(self)
+        self.member_manager = MemberManager(self)
+        self.queue_manager = QueueManager(self)
+        self.dispatch_center = DispatchCenter(self)
+
+        self.addSubInterface(
+            self.setting,
+            FluentIcon.SETTING,
+            "设置",
+            FluentIcon.SETTING,
+            NavigationItemPosition.BOTTOM,
+        )
+        self.addSubInterface(
+            self.member_manager,
+            FluentIcon.ROBOT,
+            "脚本管理",
+            FluentIcon.ROBOT,
+            NavigationItemPosition.TOP,
+        )
+        self.addSubInterface(
+            self.queue_manager,
+            FluentIcon.BOOK_SHELF,
+            "调度队列",
+            FluentIcon.BOOK_SHELF,
+            NavigationItemPosition.TOP,
+        )
+        self.addSubInterface(
+            self.dispatch_center,
+            FluentIcon.IOT,
+            "调度中心",
+            FluentIcon.IOT,
+            NavigationItemPosition.TOP,
+        )
+        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
+        )
+        self.stackedWidget.currentChanged.connect(
+            lambda index: (
+                self.dispatch_center.pivot.setCurrentItem("主调度台")
+                if index == 3
+                else None
+            )
+        )
+        self.stackedWidget.currentChanged.connect(
+            lambda index: (
+                self.dispatch_center.update_top_bar() if index == 3 else None
+            )
+        )
+
+        # 创建系统托盘及其菜单
+        self.tray = QSystemTrayIcon(
+            QIcon(str(Config.app_path / "resources/icons/AUTO_MAA.ico")),
+            self,
+        )
+        self.tray.setToolTip("AUTO_MAA")
+        self.tray_menu = SystemTrayMenu("AUTO_MAA", self)
+
+        # 显示主界面菜单项
+        self.tray_menu.addAction(
+            Action(
+                FluentIcon.CAFE,
+                "显示主界面",
+                triggered=lambda: self.show_ui("显示主窗口"),
+            )
+        )
+        self.tray_menu.addSeparator()
+
+        # 开始任务菜单项
+        # self.tray_menu.addActions(
+        #     [
+        #         Action(
+        #             FluentIcon.PLAY,
+        #             "运行自动代理",
+        #             triggered=lambda: self.start_task("自动代理"),
+        #         ),
+        #         Action(
+        #             FluentIcon.PLAY,
+        #             "运行人工排查",
+        #             triggered=lambda: self.start_task("人工排查"),
+        #         ),
+        #         Action(FluentIcon.PAUSE, "中止当前任务", triggered=self.stop_task),
+        #     ]
+        # )
+        # self.tray_menu.addSeparator()
+
+        # 退出主程序菜单项
+        self.tray_menu.addAction(
+            Action(FluentIcon.POWER_BUTTON, "退出主程序", triggered=self.kill_main)
+        )
+
+        # 设置托盘菜单
+        self.tray.setContextMenu(self.tray_menu)
+        self.tray.activated.connect(self.on_tray_activated)
+
+        Task_manager.create_gui.connect(self.dispatch_center.add_board)
+        Task_manager.connect_gui.connect(self.dispatch_center.connect_main_board)
+        self.setting.ui.card_IfShowTray.checkedChanged.connect(
+            lambda: self.show_ui("配置托盘")
+        )
+        self.setting.ui.card_IfToTray.checkedChanged.connect(self.set_min_method)
+
+        self.splashScreen.finish()
+
+    def start_up_task(self) -> None:
+        """启动时任务"""
+
+        # 加载配置
+        qconfig.load(Config.config_path, Config.global_config)
+        Config.global_config.save()
+
+        # 检查密码
+        self.setting.check_PASSWORD()
+
+        # 获取公告
+        self.setting.show_notice(if_show=False)
+
+        # 检查更新
+        if Config.global_config.get(Config.global_config.update_IfAutoUpdate):
+            result = self.setting.get_update_info()
+            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()
+
+    def set_min_method(self) -> None:
+        """设置最小化方法"""
+
+        if Config.global_config.get(Config.global_config.ui_IfToTray):
+
+            self.titleBar.minBtn.clicked.disconnect()
+            self.titleBar.minBtn.clicked.connect(lambda: self.show_ui("隐藏到托盘"))
+
+        else:
+
+            self.titleBar.minBtn.clicked.disconnect()
+            self.titleBar.minBtn.clicked.connect(self.showMinimized)
+
+    def on_tray_activated(self, reason):
+        """双击返回主界面"""
+        if reason == QSystemTrayIcon.DoubleClick:
+            self.show_ui("显示主窗口")
+
+    # def start_task(self, mode):
+    #     """调起对应任务"""
+    #     if self.main.MaaManager.isRunning():
+    #         Notify.push_notification(
+    #             f"无法运行{mode}！",
+    #             "当前已有任务正在运行，请在该任务结束后重试",
+    #             "当前已有任务正在运行，请在该任务结束后重试",
+    #             3,
+    #         )
+    #     else:
+    #         self.main.maa_starter(mode)
+
+    # def stop_task(self):
+    #     """中止当前任务"""
+    #     if self.main.MaaManager.isRunning():
+    #         if (
+    #             self.main.MaaManager.mode == "自动代理"
+    #             or self.main.MaaManager.mode == "人工排查"
+    #         ):
+    #             self.main.maa_ender(f"{self.main.MaaManager.mode}_结束")
+    #         elif "设置MAA" in self.main.MaaManager.mode:
+    #             Notify.push_notification(
+    #                 "正在设置MAA！",
+    #                 "正在运行设置MAA任务，无法中止",
+    #                 "正在运行设置MAA任务，无法中止",
+    #                 3,
+    #             )
+    #     else:
+    #         Notify.push_notification(
+    #             "无任务运行！",
+    #             "当前无任务正在运行，无需中止",
+    #             "当前无任务正在运行，无需中止",
+    #             3,
+    #         )
+
+    def kill_main(self) -> None:
+        """退出主程序"""
+        self.close()
+        QApplication.quit()
+
+    def show_ui(self, mode: str, if_quick: bool = False) -> None:
+        """配置窗口状态"""
+
+        if mode == "显示主窗口":
+
+            # 配置主窗口
+            size = list(
+                map(
+                    int,
+                    Config.global_config.get(Config.global_config.ui_size).split("x"),
+                )
+            )
+            location = list(
+                map(
+                    int,
+                    Config.global_config.get(Config.global_config.ui_location).split(
+                        "x"
+                    ),
+                )
+            )
+            self.setGeometry(location[0], location[1], size[0], size[1])
+            self.show()
+            if not if_quick:
+                if Config.global_config.get(Config.global_config.ui_maximized):
+                    self.showMaximized()
+                self.set_min_method()
+                self.show_ui("配置托盘")
+
+        elif mode == "配置托盘":
+
+            if Config.global_config.get(Config.global_config.ui_IfShowTray):
+                self.tray.show()
+            else:
+                self.tray.hide()
+
+        elif mode == "隐藏到托盘":
+
+            # 保存窗口相关属性
+            if not self.isMaximized():
+
+                Config.global_config.set(
+                    Config.global_config.ui_size,
+                    f"{self.geometry().width()}x{self.geometry().height()}",
+                )
+                Config.global_config.set(
+                    Config.global_config.ui_location,
+                    f"{self.geometry().x()}x{self.geometry().y()}",
+                )
+            Config.global_config.set(
+                Config.global_config.ui_maximized, self.isMaximized()
+            )
+            Config.global_config.save()
+
+            # 隐藏主窗口
+            if not if_quick:
+
+                self.hide()
+                self.tray.show()
+
+    def closeEvent(self, event: QCloseEvent):
+        """清理残余进程"""
+
+        self.show_ui("隐藏到托盘", if_quick=True)
+
+        # 清理各功能线程
+        Main_timer.Timer.stop()
+        Main_timer.Timer.deleteLater()
+        Task_manager.stop_task("ALL")
+
+        # 关闭数据库连接
+        Config.close_database()
+
+        logger.info("AUTO_MAA主程序关闭")
+        logger.info("===================================")
+
+        event.accept()

app/ui/queue_manager.py

@@ -0,0 +1,657 @@
+#   <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调度队列界面
+v4.2
+作者：DLmaster_361
+"""
+
+from loguru import logger
+from PySide6.QtWidgets import (
+    QWidget,
+    QVBoxLayout,
+    QStackedWidget,
+    QHBoxLayout,
+)
+from qfluentwidgets import (
+    Action,
+    qconfig,
+    Pivot,
+    ScrollArea,
+    FluentIcon,
+    MessageBox,
+    HeaderCardWidget,
+    TextBrowser,
+    CommandBar,
+    SwitchSettingCard,
+)
+from PySide6.QtCore import Qt
+from typing import List
+import json
+import shutil
+
+from app.core import Config, MainInfoBar
+from .Widget import (
+    LineEditSettingCard,
+    TimeEditSettingCard,
+    NoOptionComboBoxSettingCard,
+)
+
+
+class QueueManager(QWidget):
+
+    def __init__(
+        self,
+        parent=None,
+    ):
+        super().__init__(parent)
+
+        self.setObjectName("调度队列")
+
+        layout = QVBoxLayout(self)
+
+        self.tools = CommandBar()
+
+        self.queue_manager = QueueSettingBox(self)
+
+        # 逐个添加动作
+        self.tools.addActions(
+            [
+                Action(
+                    FluentIcon.ADD_TO, "新建调度队列", triggered=self.add_setting_box
+                ),
+                Action(
+                    FluentIcon.REMOVE_FROM,
+                    "删除调度队列",
+                    triggered=self.del_setting_box,
+                ),
+            ]
+        )
+        self.tools.addSeparator()
+        self.tools.addActions(
+            [
+                Action(
+                    FluentIcon.LEFT_ARROW, "向左移动", triggered=self.left_setting_box
+                ),
+                Action(
+                    FluentIcon.RIGHT_ARROW, "向右移动", triggered=self.right_setting_box
+                ),
+            ]
+        )
+
+        layout.addWidget(self.tools)
+        layout.addWidget(self.queue_manager)
+
+    def add_setting_box(self):
+        """添加一个调度队列"""
+
+        index = len(self.queue_manager.search_queue()) + 1
+
+        qconfig.load(
+            Config.app_path / f"config/QueueConfig/调度队列_{index}.json",
+            Config.queue_config,
+        )
+        Config.clear_queue_config()
+        Config.queue_config.save()
+
+        self.queue_manager.add_QueueSettingBox(index)
+        self.queue_manager.switch_SettingBox(index)
+
+    def del_setting_box(self):
+        """删除一个调度队列实例"""
+
+        name = self.queue_manager.pivot.currentRouteKey()
+
+        if name == None:
+            logger.warning("未选择调度队列")
+            MainInfoBar.push_info_bar(
+                "warning", "未选择调度队列", "请先选择一个调度队列", 5000
+            )
+            return None
+
+        if name in Config.running_list:
+            logger.warning("调度队列正在运行")
+            MainInfoBar.push_info_bar(
+                "warning", "调度队列正在运行", "请先停止调度队列", 5000
+            )
+            return None
+
+        choice = MessageBox(
+            "确认",
+            f"确定要删除 {name} 吗？",
+            self,
+        )
+        if choice.exec():
+
+            queue_list = self.queue_manager.search_queue()
+            move_list = [_ for _ in queue_list if int(_[0][5:]) > int(name[5:])]
+
+            index = max(int(name[5:]) - 1, 1)
+
+            self.queue_manager.clear_SettingBox()
+
+            (Config.app_path / f"config/QueueConfig/{name}.json").unlink()
+            for queue in move_list:
+                if (Config.app_path / f"config/QueueConfig/{queue[0]}.json").exists():
+                    (Config.app_path / f"config/QueueConfig/{queue[0]}.json").rename(
+                        Config.app_path
+                        / f"config/QueueConfig/调度队列_{int(queue[0][5:])-1}.json",
+                    )
+
+            self.queue_manager.show_SettingBox(index)
+
+    def left_setting_box(self):
+        """向左移动调度队列实例"""
+
+        name = self.queue_manager.pivot.currentRouteKey()
+
+        if name == None:
+            logger.warning("未选择调度队列")
+            MainInfoBar.push_info_bar(
+                "warning", "未选择调度队列", "请先选择一个调度队列", 5000
+            )
+            return None
+
+        index = int(name[5:])
+
+        if index == 1:
+            logger.warning("向左移动调度队列时已到达最左端")
+            MainInfoBar.push_info_bar(
+                "warning", "已经是第一个调度队列", "无法向左移动", 5000
+            )
+            return None
+
+        if name in Config.running_list or f"调度队列_{index-1}" in Config.running_list:
+            logger.warning("相关调度队列正在运行")
+            MainInfoBar.push_info_bar(
+                "warning", "相关调度队列正在运行", "请先停止调度队列", 5000
+            )
+            return None
+
+        self.queue_manager.clear_SettingBox()
+
+        (Config.app_path / f"config/QueueConfig/调度队列_{index}.json").rename(
+            Config.app_path / f"config/QueueConfig/调度队列_0.json",
+        )
+        shutil.move(
+            str(Config.app_path / f"config/QueueConfig/调度队列_{index-1}.json"),
+            str(Config.app_path / f"config/QueueConfig/调度队列_{index}.json"),
+        )
+        (Config.app_path / f"config/QueueConfig/调度队列_0.json").rename(
+            Config.app_path / f"config/QueueConfig/调度队列_{index-1}.json",
+        )
+
+        self.queue_manager.show_SettingBox(index - 1)
+
+    def right_setting_box(self):
+        """向右移动调度队列实例"""
+
+        name = self.queue_manager.pivot.currentRouteKey()
+
+        if name == None:
+            logger.warning("未选择调度队列")
+            MainInfoBar.push_info_bar(
+                "warning", "未选择调度队列", "请先选择一个调度队列", 5000
+            )
+            return None
+
+        queue_list = self.queue_manager.search_queue()
+        index = int(name[5:])
+
+        if index == len(queue_list):
+            logger.warning("向右移动调度队列时已到达最右端")
+            MainInfoBar.push_info_bar(
+                "warning", "已经是最后一个调度队列", "无法向右移动", 5000
+            )
+            return None
+
+        if name in Config.running_list or f"调度队列_{index+1}" in Config.running_list:
+            logger.warning("相关调度队列正在运行")
+            MainInfoBar.push_info_bar(
+                "warning", "相关调度队列正在运行", "请先停止调度队列", 5000
+            )
+            return None
+
+        self.queue_manager.clear_SettingBox()
+
+        (Config.app_path / f"config/QueueConfig/调度队列_{index}.json").rename(
+            Config.app_path / f"config/QueueConfig/调度队列_0.json",
+        )
+        (Config.app_path / f"config/QueueConfig/调度队列_{index+1}.json").rename(
+            Config.app_path / f"config/QueueConfig/调度队列_{index}.json",
+        )
+        (Config.app_path / f"config/QueueConfig/调度队列_0.json").rename(
+            Config.app_path / f"config/QueueConfig/调度队列_{index+1}.json",
+        )
+
+        self.queue_manager.show_SettingBox(index + 1)
+
+    def refresh(self):
+        """刷新调度队列界面"""
+
+        if len(self.queue_manager.search_queue()) == 0:
+            index = 0
+        else:
+            index = int(self.queue_manager.pivot.currentRouteKey()[5:])
+        self.queue_manager.clear_SettingBox()
+        self.queue_manager.show_SettingBox(index)
+
+
+class QueueSettingBox(QWidget):
+
+    def __init__(self, parent=None):
+        super().__init__(parent)
+
+        self.setObjectName("调度队列管理")
+
+        self.pivot = Pivot(self)
+        self.stackedWidget = QStackedWidget(self)
+        self.Layout = QVBoxLayout(self)
+
+        self.script_list: List[QueueMemberSettingBox] = []
+
+        self.Layout.addWidget(self.pivot, 0, Qt.AlignHCenter)
+        self.Layout.addWidget(self.stackedWidget)
+        self.Layout.setContentsMargins(0, 0, 0, 0)
+
+        self.pivot.currentItemChanged.connect(
+            lambda index: self.switch_SettingBox(int(index[5:]), if_change_pivot=False)
+        )
+
+        self.show_SettingBox(1)
+
+    def show_SettingBox(self, index) -> None:
+        """加载所有子界面"""
+
+        queue_list = self.search_queue()
+
+        qconfig.load(
+            Config.app_path / "config/临时.json",
+            Config.queue_config,
+        )
+        Config.clear_queue_config()
+        for queue in queue_list:
+            self.add_QueueSettingBox(int(queue[0][5:]))
+        if (Config.app_path / "config/临时.json").exists():
+            (Config.app_path / "config/临时.json").unlink()
+
+        self.switch_SettingBox(index)
+
+    def switch_SettingBox(self, index: int, if_change_pivot: bool = True) -> None:
+        """切换到指定的子界面"""
+
+        queue_list = self.search_queue()
+
+        if len(queue_list) == 0:
+            return None
+
+        if index > len(queue_list):
+            return None
+
+        qconfig.load(
+            Config.app_path
+            / f"config/QueueConfig/{self.script_list[index-1].objectName()}.json",
+            Config.queue_config,
+        )
+
+        if if_change_pivot:
+            self.pivot.setCurrentItem(self.script_list[index - 1].objectName())
+        self.stackedWidget.setCurrentWidget(self.script_list[index - 1])
+
+    def clear_SettingBox(self) -> None:
+        """清空所有子界面"""
+
+        for sub_interface in self.script_list:
+            self.stackedWidget.removeWidget(sub_interface)
+            sub_interface.deleteLater()
+        self.script_list.clear()
+        self.pivot.clear()
+        qconfig.load(
+            Config.app_path / "config/临时.json",
+            Config.queue_config,
+        )
+        Config.clear_queue_config()
+        if (Config.app_path / "config/临时.json").exists():
+            (Config.app_path / "config/临时.json").unlink()
+
+    def add_QueueSettingBox(self, uid: int) -> None:
+        """添加一个调度队列设置界面"""
+
+        maa_setting_box = QueueMemberSettingBox(uid, self)
+
+        self.script_list.append(maa_setting_box)
+
+        self.stackedWidget.addWidget(self.script_list[-1])
+
+        self.pivot.addItem(routeKey=f"调度队列_{uid}", text=f"调度队列 {uid}")
+
+    def search_queue(self) -> list:
+        """搜索所有调度队列实例"""
+
+        queue_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["QueueSet"]["Name"]])
+
+        return queue_list
+
+
+class QueueMemberSettingBox(QWidget):
+
+    def __init__(self, uid: int, parent=None):
+        super().__init__(parent)
+
+        self.setObjectName(f"调度队列_{uid}")
+
+        layout = QVBoxLayout()
+
+        scrollArea = ScrollArea()
+        scrollArea.setWidgetResizable(True)
+
+        content_widget = QWidget()
+        content_layout = QVBoxLayout(content_widget)
+
+        self.queue_set = self.QueueSetSettingCard(self)
+        self.time = self.TimeSettingCard(self)
+        self.task = self.TaskSettingCard(self)
+        self.history = self.HistoryCard(self, f"调度队列_{uid}")
+
+        content_layout.addWidget(self.queue_set)
+        content_layout.addWidget(self.time)
+        content_layout.addWidget(self.task)
+        content_layout.addWidget(self.history)
+        content_layout.addStretch(1)
+
+        scrollArea.setWidget(content_widget)
+
+        layout.addWidget(scrollArea)
+
+        self.setLayout(layout)
+
+    class QueueSetSettingCard(HeaderCardWidget):
+
+        def __init__(self, parent=None):
+            super().__init__(parent)
+
+            self.setTitle("队列设置")
+
+            Layout = QVBoxLayout()
+
+            self.card_Name = LineEditSettingCard(
+                "请输入调度队列名称",
+                FluentIcon.EDIT,
+                "调度队列名称",
+                "用于标识调度队列的名称",
+                Config.queue_config.queueSet_Name,
+            )
+            self.card_Enable = SwitchSettingCard(
+                FluentIcon.HOME,
+                "状态",
+                "调度队列状态",
+                Config.queue_config.queueSet_Enabled,
+            )
+
+            Layout.addWidget(self.card_Name)
+            Layout.addWidget(self.card_Enable)
+
+            self.viewLayout.addLayout(Layout)
+
+    class TimeSettingCard(HeaderCardWidget):
+
+        def __init__(self, parent=None):
+            super().__init__(parent)
+
+            self.setTitle("定时设置")
+
+            widget_1 = QWidget()
+            Layout_1 = QVBoxLayout(widget_1)
+            widget_2 = QWidget()
+            Layout_2 = QVBoxLayout(widget_2)
+            Layout = QHBoxLayout()
+
+            self.card_Time_0 = TimeEditSettingCard(
+                FluentIcon.STOP_WATCH,
+                "定时 1",
+                "",
+                Config.queue_config.time_TimeEnabled_0,
+                Config.queue_config.time_TimeSet_0,
+            )
+            self.card_Time_1 = TimeEditSettingCard(
+                FluentIcon.STOP_WATCH,
+                "定时 2",
+                "",
+                Config.queue_config.time_TimeEnabled_1,
+                Config.queue_config.time_TimeSet_1,
+            )
+            self.card_Time_2 = TimeEditSettingCard(
+                FluentIcon.STOP_WATCH,
+                "定时 3",
+                "",
+                Config.queue_config.time_TimeEnabled_2,
+                Config.queue_config.time_TimeSet_2,
+            )
+            self.card_Time_3 = TimeEditSettingCard(
+                FluentIcon.STOP_WATCH,
+                "定时 4",
+                "",
+                Config.queue_config.time_TimeEnabled_3,
+                Config.queue_config.time_TimeSet_3,
+            )
+            self.card_Time_4 = TimeEditSettingCard(
+                FluentIcon.STOP_WATCH,
+                "定时 5",
+                "",
+                Config.queue_config.time_TimeEnabled_4,
+                Config.queue_config.time_TimeSet_4,
+            )
+            self.card_Time_5 = TimeEditSettingCard(
+                FluentIcon.STOP_WATCH,
+                "定时 6",
+                "",
+                Config.queue_config.time_TimeEnabled_5,
+                Config.queue_config.time_TimeSet_5,
+            )
+            self.card_Time_6 = TimeEditSettingCard(
+                FluentIcon.STOP_WATCH,
+                "定时 7",
+                "",
+                Config.queue_config.time_TimeEnabled_6,
+                Config.queue_config.time_TimeSet_6,
+            )
+            self.card_Time_7 = TimeEditSettingCard(
+                FluentIcon.STOP_WATCH,
+                "定时 8",
+                "",
+                Config.queue_config.time_TimeEnabled_7,
+                Config.queue_config.time_TimeSet_7,
+            )
+            self.card_Time_8 = TimeEditSettingCard(
+                FluentIcon.STOP_WATCH,
+                "定时 9",
+                "",
+                Config.queue_config.time_TimeEnabled_8,
+                Config.queue_config.time_TimeSet_8,
+            )
+            self.card_Time_9 = TimeEditSettingCard(
+                FluentIcon.STOP_WATCH,
+                "定时 10",
+                "",
+                Config.queue_config.time_TimeEnabled_9,
+                Config.queue_config.time_TimeSet_9,
+            )
+
+            Layout_1.addWidget(self.card_Time_0)
+            Layout_1.addWidget(self.card_Time_1)
+            Layout_1.addWidget(self.card_Time_2)
+            Layout_1.addWidget(self.card_Time_3)
+            Layout_1.addWidget(self.card_Time_4)
+            Layout_2.addWidget(self.card_Time_5)
+            Layout_2.addWidget(self.card_Time_6)
+            Layout_2.addWidget(self.card_Time_7)
+            Layout_2.addWidget(self.card_Time_8)
+            Layout_2.addWidget(self.card_Time_9)
+            Layout.addWidget(widget_1)
+            Layout.addWidget(widget_2)
+
+            self.viewLayout.addLayout(Layout)
+
+    class TaskSettingCard(HeaderCardWidget):
+
+        def __init__(self, parent=None):
+            super().__init__(parent)
+
+            self.setTitle("任务队列")
+
+            Layout = QVBoxLayout()
+
+            member_list = self.search_member()
+
+            self.card_Member_1 = NoOptionComboBoxSettingCard(
+                Config.queue_config.queue_Member_1,
+                FluentIcon.APPLICATION,
+                "任务实例 1",
+                "第一个调起的脚本任务实例",
+                member_list[0],
+                member_list[1],
+            )
+            self.card_Member_2 = NoOptionComboBoxSettingCard(
+                Config.queue_config.queue_Member_2,
+                FluentIcon.APPLICATION,
+                "任务实例 2",
+                "第二个调起的脚本任务实例",
+                member_list[0],
+                member_list[1],
+            )
+            self.card_Member_3 = NoOptionComboBoxSettingCard(
+                Config.queue_config.queue_Member_3,
+                FluentIcon.APPLICATION,
+                "任务实例 3",
+                "第三个调起的脚本任务实例",
+                member_list[0],
+                member_list[1],
+            )
+            self.card_Member_4 = NoOptionComboBoxSettingCard(
+                Config.queue_config.queue_Member_4,
+                FluentIcon.APPLICATION,
+                "任务实例 4",
+                "第四个调起的脚本任务实例",
+                member_list[0],
+                member_list[1],
+            )
+            self.card_Member_5 = NoOptionComboBoxSettingCard(
+                Config.queue_config.queue_Member_5,
+                FluentIcon.APPLICATION,
+                "任务实例 5",
+                "第五个调起的脚本任务实例",
+                member_list[0],
+                member_list[1],
+            )
+            self.card_Member_6 = NoOptionComboBoxSettingCard(
+                Config.queue_config.queue_Member_6,
+                FluentIcon.APPLICATION,
+                "任务实例 6",
+                "第六个调起的脚本任务实例",
+                member_list[0],
+                member_list[1],
+            )
+            self.card_Member_7 = NoOptionComboBoxSettingCard(
+                Config.queue_config.queue_Member_7,
+                FluentIcon.APPLICATION,
+                "任务实例 7",
+                "第七个调起的脚本任务实例",
+                member_list[0],
+                member_list[1],
+            )
+            self.card_Member_8 = NoOptionComboBoxSettingCard(
+                Config.queue_config.queue_Member_8,
+                FluentIcon.APPLICATION,
+                "任务实例 8",
+                "第八个调起的脚本任务实例",
+                member_list[0],
+                member_list[1],
+            )
+            self.card_Member_9 = NoOptionComboBoxSettingCard(
+                Config.queue_config.queue_Member_9,
+                FluentIcon.APPLICATION,
+                "任务实例 9",
+                "第九个调起的脚本任务实例",
+                member_list[0],
+                member_list[1],
+            )
+            self.card_Member_10 = NoOptionComboBoxSettingCard(
+                Config.queue_config.queue_Member_10,
+                FluentIcon.APPLICATION,
+                "任务实例 10",
+                "第十个调起的脚本任务实例",
+                member_list[0],
+                member_list[1],
+            )
+
+            Layout.addWidget(self.card_Member_1)
+            Layout.addWidget(self.card_Member_2)
+            Layout.addWidget(self.card_Member_3)
+            Layout.addWidget(self.card_Member_4)
+            Layout.addWidget(self.card_Member_5)
+            Layout.addWidget(self.card_Member_6)
+            Layout.addWidget(self.card_Member_7)
+            Layout.addWidget(self.card_Member_8)
+            Layout.addWidget(self.card_Member_9)
+            Layout.addWidget(self.card_Member_10)
+
+            self.viewLayout.addLayout(Layout)
+
+        def search_member(self) -> list:
+            """搜索所有脚本实例"""
+
+            member_list_name = ["禁用"]
+            member_list_text = ["未启用"]
+
+            if (Config.app_path / "config/MaaConfig").exists():
+                for subdir in (Config.app_path / "config/MaaConfig").iterdir():
+                    if subdir.is_dir():
+                        member_list_name.append(subdir.name)
+                        with (subdir / "config.json").open("r", encoding="utf-8") as f:
+                            info = json.load(f)
+                        if info["MaaSet"]["Name"] != "":
+                            member_list_text.append(
+                                f"{subdir.name} - {info["MaaSet"]["Name"]}"
+                            )
+                        else:
+                            member_list_text.append(subdir.name)
+
+            return [member_list_name, member_list_text]
+
+    class HistoryCard(HeaderCardWidget):
+
+        def __init__(self, parent=None, name: str = None):
+            super().__init__(parent)
+            self.setTitle("历史运行记录")
+
+            self.text = TextBrowser()
+            self.text.setMinimumHeight(300)
+            history = Config.get_history(name)
+            self.text.setPlainText(history["History"])
+
+            self.viewLayout.addWidget(self.text)

app/ui/setting.py

@@ -0,0 +1,755 @@
+#   <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设置界面
+v4.2
+作者：DLmaster_361
+"""
+
+from loguru import logger
+from PySide6.QtWidgets import (
+    QWidget,
+    QApplication,
+    QVBoxLayout,
+    QVBoxLayout,
+)
+from qfluentwidgets import (
+    ScrollArea,
+    FluentIcon,
+    MessageBox,
+    Dialog,
+    HyperlinkCard,
+    HeaderCardWidget,
+    SwitchSettingCard,
+    ExpandGroupSettingCard,
+    PushSettingCard,
+    ComboBoxSettingCard,
+)
+from datetime import datetime
+import json
+import subprocess
+import time
+import requests
+
+from app.core import Config, MainInfoBar
+from app.services import Crypto, System
+from app.utils import Updater
+from .Widget import InputMessageBox, LineEditSettingCard
+
+
+class Setting(QWidget):
+
+    def __init__(
+        self,
+        parent=None,
+    ):
+        super().__init__(parent)
+
+        self.setObjectName("设置")
+
+        layout = QVBoxLayout()
+
+        scrollArea = ScrollArea()
+        scrollArea.setWidgetResizable(True)
+
+        content_widget = QWidget()
+        content_layout = QVBoxLayout(content_widget)
+
+        self.function = FunctionSettingCard(self)
+        self.start = StartSettingCard(self)
+        self.ui = UiSettingCard(self)
+        self.notification = NotifySettingCard(self)
+        self.security = SecuritySettingCard(self)
+        self.updater = UpdaterSettingCard(self)
+        self.other = OtherSettingCard(self)
+
+        self.function.card_IfAllowSleep.checkedChanged.connect(System.set_Sleep)
+        self.start.card_IfSelfStart.checkedChanged.connect(System.set_SelfStart)
+        self.security.card_changePASSWORD.clicked.connect(self.change_PASSWORD)
+        self.updater.card_CheckUpdate.clicked.connect(self.get_update)
+        self.other.card_Notice.clicked.connect(self.show_notice)
+
+        content_layout.addWidget(self.function)
+        content_layout.addWidget(self.start)
+        content_layout.addWidget(self.ui)
+        content_layout.addWidget(self.notification)
+        content_layout.addWidget(self.security)
+        content_layout.addWidget(self.updater)
+        content_layout.addWidget(self.other)
+
+        scrollArea.setWidget(content_widget)
+
+        layout.addWidget(scrollArea)
+
+        self.setLayout(layout)
+
+    def check_PASSWORD(self) -> None:
+        """检查并配置管理密钥"""
+
+        if Config.key_path.exists():
+            return None
+
+        while True:
+
+            choice = InputMessageBox(
+                self.parent().parent().parent(),
+                "未检测到管理密钥，请设置您的管理密钥",
+                "管理密钥",
+                "密码",
+            )
+            if choice.exec() and choice.input.text() != "":
+                Crypto.get_PASSWORD(choice.input.text())
+                break
+            else:
+                choice = MessageBox(
+                    "警告",
+                    "您没有设置管理密钥，无法使用本软件，请先设置管理密钥",
+                    self.parent().parent().parent(),
+                )
+                choice.cancelButton.hide()
+                choice.buttonLayout.insertStretch(1)
+                if choice.exec():
+                    pass
+
+    def change_PASSWORD(self) -> None:
+        """修改管理密钥"""
+
+        if_change = True
+
+        while if_change:
+
+            choice = InputMessageBox(
+                self,
+                "请输入旧的管理密钥",
+                "旧管理密钥",
+                "密码",
+            )
+            if choice.exec() and choice.input.text() != "":
+
+                # 验证旧管理密钥
+                if Crypto.check_PASSWORD(choice.input.text()):
+
+                    PASSWORD_old = choice.input.text()
+                    # 获取新的管理密钥
+                    while True:
+
+                        choice = InputMessageBox(
+                            self,
+                            "请输入新的管理密钥",
+                            "新管理密钥",
+                            "密码",
+                        )
+                        if choice.exec() and choice.input.text() != "":
+
+                            # 修改管理密钥
+                            Crypto.change_PASSWORD(PASSWORD_old, choice.input.text())
+                            MainInfoBar.push_info_bar(
+                                "success", "操作成功", "管理密钥修改成功", 3000
+                            )
+                            if_change = False
+                            break
+
+                        else:
+
+                            choice = MessageBox(
+                                "确认",
+                                "您没有输入新的管理密钥，是否取消修改管理密钥？",
+                                self,
+                            )
+                            if choice.exec():
+                                if_change = False
+                                break
+
+                else:
+                    choice = MessageBox("错误", "管理密钥错误", self)
+                    choice.cancelButton.hide()
+                    choice.buttonLayout.insertStretch(1)
+                    if choice.exec():
+                        pass
+            else:
+                choice = MessageBox(
+                    "确认",
+                    "您没有输入管理密钥，是否取消修改管理密钥？",
+                    self,
+                )
+                if choice.exec():
+                    break
+
+    def get_update_info(self) -> str:
+        """检查主程序版本更新，返回更新信息"""
+
+        # 从本地版本信息文件获取当前版本信息
+        with Config.version_path.open(mode="r", encoding="utf-8") as f:
+            version_current = json.load(f)
+        main_version_current = list(
+            map(int, version_current["main_version"].split("."))
+        )
+
+        # 从远程服务器获取最新版本信息
+        for _ in range(3):
+            try:
+                response = requests.get(
+                    f"https://gitee.com/DLmaster_361/AUTO_MAA/raw/{Config.global_config.get(Config.global_config.update_UpdateType)}/resources/version.json"
+                )
+                version_remote = response.json()
+                break
+            except Exception as e:
+                err = e
+                time.sleep(0.1)
+        else:
+            return f"获取版本信息时出错：\n{err}"
+
+        main_version_remote = list(map(int, version_remote["main_version"].split(".")))
+
+        # 有版本更新
+        if main_version_remote > main_version_current:
+
+            main_version_info = f"    主程序：{version_text(main_version_current)} --> {version_text(main_version_remote)}\n"
+
+            return f"发现新版本：\n{main_version_info}    更新说明：\n{version_remote['announcement'].replace("\n# ","\n   ！").replace("\n## ","\n        - ").replace("\n- ","\n            · ")}\n\n是否开始更新？\n\n    注意：主程序更新时AUTO_MAA将自动关闭"
+
+        else:
+            return "已是最新版本~"
+
+    def get_update(self, if_question: bool = True) -> None:
+        """检查版本更新，调起文件下载进程"""
+
+        # 从本地版本信息文件获取当前版本信息
+        with Config.version_path.open(mode="r", encoding="utf-8") as f:
+            version_current = json.load(f)
+        main_version_current = list(
+            map(int, version_current["main_version"].split("."))
+        )
+        updater_version_current = list(
+            map(int, version_current["updater_version"].split("."))
+        )
+        # 检查更新器是否存在
+        if not (Config.app_path / "Updater.exe").exists():
+            updater_version_current = [0, 0, 0, 0]
+
+        # 从远程服务器获取最新版本信息
+        for _ in range(3):
+            try:
+                response = requests.get(
+                    f"https://gitee.com/DLmaster_361/AUTO_MAA/raw/{Config.global_config.get(Config.global_config.update_UpdateType)}/resources/version.json"
+                )
+                version_remote = response.json()
+                break
+            except Exception as e:
+                err = e
+                time.sleep(0.1)
+        else:
+            choice = MessageBox(
+                "错误",
+                f"获取版本信息时出错：\n{err}",
+                self,
+            )
+            choice.cancelButton.hide()
+            choice.buttonLayout.insertStretch(1)
+            if choice.exec():
+                return None
+
+        main_version_remote = list(map(int, version_remote["main_version"].split(".")))
+        updater_version_remote = list(
+            map(int, version_remote["updater_version"].split("."))
+        )
+
+        # 有版本更新
+        if (main_version_remote > main_version_current) or (
+            updater_version_remote > updater_version_current
+        ):
+
+            # 生成版本更新信息
+            if main_version_remote > main_version_current:
+                main_version_info = f"    主程序：{version_text(main_version_current)} --> {version_text(main_version_remote)}\n"
+            else:
+                main_version_info = (
+                    f"    主程序：{version_text(main_version_current)}\n"
+                )
+            if updater_version_remote > updater_version_current:
+                updater_version_info = f"    更新器：{version_text(updater_version_current)} --> {version_text(updater_version_remote)}\n"
+            else:
+                updater_version_info = (
+                    f"    更新器：{version_text(updater_version_current)}\n"
+                )
+
+            # 询问是否开始版本更新
+            if if_question:
+                choice = MessageBox(
+                    "版本更新",
+                    f"发现新版本：\n{main_version_info}{updater_version_info}    更新说明：\n{version_remote['announcement'].replace("\n# ","\n   ！").replace("\n## ","\n        - ").replace("\n- ","\n            · ")}\n\n是否开始更新？\n\n    注意：主程序更新时AUTO_MAA将自动关闭",
+                    self,
+                )
+                if not choice.exec():
+                    return None
+
+            # 更新更新器
+            if updater_version_remote > updater_version_current:
+                # 创建更新进程
+                self.updater = Updater(
+                    Config.app_path,
+                    "AUTO_MAA更新器",
+                    main_version_remote,
+                    updater_version_remote,
+                )
+                # 完成更新器的更新后更新主程序
+                if main_version_remote > main_version_current:
+                    self.updater.update_process.accomplish.connect(self.update_main)
+                # 显示更新页面
+                self.updater.ui.show()
+
+            # 更新主程序
+            elif main_version_remote > main_version_current:
+                self.update_main()
+
+        # 无版本更新
+        else:
+            MainInfoBar.push_info_bar("success", "更新检查", "已是最新版本~", 3000)
+
+    def update_main(self) -> None:
+        """更新主程序"""
+
+        subprocess.Popen(
+            str(Config.app_path / "Updater.exe"),
+            shell=True,
+            creationflags=subprocess.CREATE_NO_WINDOW,
+        )
+        self.close()
+        QApplication.quit()
+
+    def show_notice(self, if_show: bool = True):
+        """显示公告"""
+
+        # 从远程服务器获取最新版本信息
+        for _ in range(3):
+            try:
+                response = requests.get(
+                    "https://gitee.com/DLmaster_361/AUTO_MAA/raw/server/notice.json"
+                )
+                notice = response.json()
+                break
+            except Exception as e:
+                err = e
+                time.sleep(0.1)
+        else:
+            logger.warning(f"获取最新公告时出错：\n{err}")
+            if if_show:
+                choice = Dialog(
+                    "网络错误",
+                    f"获取最新公告时出错：\n{err}",
+                    self,
+                )
+                choice.cancelButton.hide()
+                choice.buttonLayout.insertStretch(1)
+                choice.exec()
+            return None
+
+        if (Config.app_path / "resources/notice.json").exists():
+            with (Config.app_path / "resources/notice.json").open(
+                mode="r", encoding="utf-8"
+            ) as f:
+                notice_local = json.load(f)
+            time_local = datetime.strptime(notice_local["time"], "%Y-%m-%d %H:%M")
+        else:
+            time_local = datetime.strptime("2000-01-01 00:00", "%Y-%m-%d %H:%M")
+
+        if if_show or (
+            datetime.now() > datetime.strptime(notice["time"], "%Y-%m-%d %H:%M")
+            and datetime.strptime(notice["time"], "%Y-%m-%d %H:%M") > time_local
+        ):
+
+            choice = Dialog("公告", notice["content"], self)
+            choice.cancelButton.hide()
+            choice.buttonLayout.insertStretch(1)
+            if choice.exec():
+                with (Config.app_path / "resources/notice.json").open(
+                    mode="w", encoding="utf-8"
+                ) as f:
+                    json.dump(notice, f, ensure_ascii=False, indent=4)
+
+
+class FunctionSettingCard(HeaderCardWidget):
+
+    def __init__(self, parent=None):
+        super().__init__(parent)
+        self.setTitle("功能")
+
+        self.card_IfAllowSleep = SwitchSettingCard(
+            icon=FluentIcon.PAGE_RIGHT,
+            title="启动时阻止系统休眠",
+            content="仅阻止电脑自动休眠，不会影响屏幕是否熄灭",
+            configItem=Config.global_config.function_IfAllowSleep,
+        )
+        self.card_IfSilence = self.SilenceSettingCard(self)
+
+        Layout = QVBoxLayout()
+        Layout.addWidget(self.card_IfAllowSleep)
+        Layout.addWidget(self.card_IfSilence)
+        self.viewLayout.addLayout(Layout)
+
+    class SilenceSettingCard(ExpandGroupSettingCard):
+
+        def __init__(self, parent=None):
+            super().__init__(
+                FluentIcon.SETTING,
+                "静默模式",
+                "将各代理窗口置于后台运行，减少对前台的干扰",
+                parent,
+            )
+
+            self.card_IfSilence = SwitchSettingCard(
+                icon=FluentIcon.PAGE_RIGHT,
+                title="静默模式",
+                content="是否启用静默模式",
+                configItem=Config.global_config.function_IfSilence,
+            )
+            self.card_BossKey = LineEditSettingCard(
+                text="请输入安卓模拟器老版键",
+                icon=FluentIcon.PAGE_RIGHT,
+                title="模拟器老版键",
+                content="输入模拟器老版快捷键，以“+”分隔",
+                configItem=Config.global_config.function_BossKey,
+            )
+
+            widget = QWidget()
+            Layout = QVBoxLayout(widget)
+            Layout.addWidget(self.card_IfSilence)
+            Layout.addWidget(self.card_BossKey)
+            self.viewLayout.setContentsMargins(0, 0, 0, 0)
+            self.viewLayout.setSpacing(0)
+            self.addGroupWidget(widget)
+
+
+class StartSettingCard(HeaderCardWidget):
+
+    def __init__(self, parent=None):
+        super().__init__(parent)
+        self.setTitle("启动")
+
+        self.card_IfSelfStart = SwitchSettingCard(
+            icon=FluentIcon.PAGE_RIGHT,
+            title="开机时自动启动",
+            content="将AUTO_MAA添加到开机启动项",
+            configItem=Config.global_config.start_IfSelfStart,
+        )
+        self.card_IfRunDirectly = SwitchSettingCard(
+            icon=FluentIcon.PAGE_RIGHT,
+            title="启动后直接运行",
+            content="启动AUTO_MAA后自动运行任务(暂不可用)",
+            configItem=Config.global_config.start_IfRunDirectly,
+        )
+
+        Layout = QVBoxLayout()
+        Layout.addWidget(self.card_IfSelfStart)
+        Layout.addWidget(self.card_IfRunDirectly)
+        self.viewLayout.addLayout(Layout)
+
+
+class UiSettingCard(HeaderCardWidget):
+
+    def __init__(self, parent=None):
+        super().__init__(parent)
+        self.setTitle("界面")
+
+        self.card_IfShowTray = SwitchSettingCard(
+            icon=FluentIcon.PAGE_RIGHT,
+            title="显示托盘图标",
+            content="常态显示托盘图标",
+            configItem=Config.global_config.ui_IfShowTray,
+        )
+        self.card_IfToTray = SwitchSettingCard(
+            icon=FluentIcon.PAGE_RIGHT,
+            title="最小化到托盘",
+            content="最小化时隐藏到托盘",
+            configItem=Config.global_config.ui_IfToTray,
+        )
+
+        Layout = QVBoxLayout()
+        Layout.addWidget(self.card_IfShowTray)
+        Layout.addWidget(self.card_IfToTray)
+        self.viewLayout.addLayout(Layout)
+
+
+class NotifySettingCard(HeaderCardWidget):
+
+    def __init__(self, parent=None):
+        super().__init__(parent)
+
+        self.setTitle("通知")
+
+        self.card_IfSendErrorOnly = SwitchSettingCard(
+            icon=FluentIcon.PAGE_RIGHT,
+            title="仅推送异常信息",
+            content="仅在任务出现异常时推送通知",
+            configItem=Config.global_config.notify_IfSendErrorOnly,
+        )
+        self.card_IfPushPlyer = SwitchSettingCard(
+            icon=FluentIcon.PAGE_RIGHT,
+            title="推送系统通知",
+            content="推送系统级通知，不会在通知中心停留",
+            configItem=Config.global_config.notify_IfPushPlyer,
+        )
+        self.card_SendMail = self.SendMailSettingCard(self)
+        self.card_ServerChan = self.ServerChanSettingCard(self)
+        self.card_CompanyWebhookBot = self.CompanyWechatPushSettingCard(self)
+
+        Layout = QVBoxLayout()
+        Layout.addWidget(self.card_IfSendErrorOnly)
+        Layout.addWidget(self.card_IfPushPlyer)
+        Layout.addWidget(self.card_SendMail)
+        Layout.addWidget(self.card_ServerChan)
+        Layout.addWidget(self.card_CompanyWebhookBot)
+        self.viewLayout.addLayout(Layout)
+
+    class SendMailSettingCard(ExpandGroupSettingCard):
+
+        def __init__(self, parent=None):
+            super().__init__(
+                FluentIcon.SETTING,
+                "推送邮件通知",
+                "通过AUTO_MAA官方通知服务邮箱推送任务结果",
+                parent,
+            )
+
+            self.card_IfSendMail = SwitchSettingCard(
+                icon=FluentIcon.PAGE_RIGHT,
+                title="推送邮件通知",
+                content="是否启用邮件通知功能",
+                configItem=Config.global_config.notify_IfSendMail,
+            )
+            self.card_MailAddress = LineEditSettingCard(
+                text="请输入邮箱地址",
+                icon=FluentIcon.PAGE_RIGHT,
+                title="邮箱地址",
+                content="接收通知的邮箱地址",
+                configItem=Config.global_config.notify_MailAddress,
+            )
+
+            widget = QWidget()
+            Layout = QVBoxLayout(widget)
+            Layout.addWidget(self.card_IfSendMail)
+            Layout.addWidget(self.card_MailAddress)
+            self.viewLayout.setContentsMargins(0, 0, 0, 0)
+            self.viewLayout.setSpacing(0)
+            self.addGroupWidget(widget)
+
+    class ServerChanSettingCard(ExpandGroupSettingCard):
+        def __init__(self, parent=None):
+            super().__init__(
+                FluentIcon.SETTING,
+                "推送ServerChan通知",
+                "通过ServerChan通知推送任务结果",
+                parent,
+            )
+
+            self.card_IfServerChan = SwitchSettingCard(
+                icon=FluentIcon.PAGE_RIGHT,
+                title="推送SeverChan通知",
+                content="是否启用SeverChan通知功能",
+                configItem=Config.global_config.notify_IfServerChan,
+            )
+            self.card_ServerChanKey = LineEditSettingCard(
+                text="请输入SendKey",
+                icon=FluentIcon.PAGE_RIGHT,
+                title="SendKey",
+                content="Server酱的SendKey（SC3与SCT都可以）",
+                configItem=Config.global_config.notify_ServerChanKey,
+            )
+            self.card_ServerChanChannel = LineEditSettingCard(
+                text="请输入需要推送的Channel代码（SCT生效）",
+                icon=FluentIcon.PAGE_RIGHT,
+                title="ServerChanChannel代码",
+                content="可以留空，留空则默认。可以多个，请使用“|”隔开",
+                configItem=Config.global_config.notify_ServerChanChannel,
+            )
+            self.card_ServerChanTag = LineEditSettingCard(
+                text="请输入加入推送的Tag（SC3生效）",
+                icon=FluentIcon.PAGE_RIGHT,
+                title="Tag内容",
+                content="可以留空，留空则默认。可以多个，请使用“|”隔开",
+                configItem=Config.global_config.notify_ServerChanTag,
+            )
+
+            widget = QWidget()
+            Layout = QVBoxLayout(widget)
+            Layout.addWidget(self.card_IfServerChan)
+            Layout.addWidget(self.card_ServerChanKey)
+            Layout.addWidget(self.card_ServerChanChannel)
+            Layout.addWidget(self.card_ServerChanTag)
+            self.viewLayout.setContentsMargins(0, 0, 0, 0)
+            self.viewLayout.setSpacing(0)
+            self.addGroupWidget(widget)
+
+    class CompanyWechatPushSettingCard(ExpandGroupSettingCard):
+        def __init__(self, parent=None):
+            super().__init__(
+                FluentIcon.SETTING,
+                "推送企业微信机器人通知",
+                "通过企业微信机器人Webhook通知推送任务结果",
+                parent,
+            )
+
+            self.card_IfCompanyWechat = SwitchSettingCard(
+                icon=FluentIcon.PAGE_RIGHT,
+                title="推送企业微信机器人通知",
+                content="是否启用企业微信机器人通知功能",
+                configItem=Config.global_config.notify_IfCompanyWebHookBot,
+            )
+            self.card_CompanyWebHookBotUrl = LineEditSettingCard(
+                text="请输入Webhook的Url",
+                icon=FluentIcon.PAGE_RIGHT,
+                title="WebhookUrl",
+                content="企业微信群机器人的Webhook地址",
+                configItem=Config.global_config.notify_CompanyWebHookBotUrl,
+            )
+
+            widget = QWidget()
+            Layout = QVBoxLayout(widget)
+            Layout.addWidget(self.card_IfCompanyWechat)
+            Layout.addWidget(self.card_CompanyWebHookBotUrl)
+            self.viewLayout.setContentsMargins(0, 0, 0, 0)
+            self.viewLayout.setSpacing(0)
+            self.addGroupWidget(widget)
+
+
+class SecuritySettingCard(HeaderCardWidget):
+
+    def __init__(self, parent=None):
+        super().__init__(parent)
+        self.setTitle("安全")
+
+        self.card_changePASSWORD = PushSettingCard(
+            text="修改",
+            icon=FluentIcon.VPN,
+            title="修改管理密钥",
+            content="修改用于解密用户密码的管理密钥",
+        )
+
+        Layout = QVBoxLayout()
+        Layout.addWidget(self.card_changePASSWORD)
+        self.viewLayout.addLayout(Layout)
+
+
+class UpdaterSettingCard(HeaderCardWidget):
+
+    def __init__(self, parent=None):
+        super().__init__(parent)
+        self.setTitle("更新")
+
+        self.card_IfAutoUpdate = SwitchSettingCard(
+            icon=FluentIcon.PAGE_RIGHT,
+            title="自动检查更新",
+            content="将在启动时自动检查AUTO_MAA是否有新版本",
+            configItem=Config.global_config.update_IfAutoUpdate,
+        )
+        self.card_UpdateType = ComboBoxSettingCard(
+            configItem=Config.global_config.update_UpdateType,
+            icon=FluentIcon.PAGE_RIGHT,
+            title="版本更新类别",
+            content="选择AUTO_MAA的更新类别",
+            texts=["稳定版", "公测版"],
+        )
+        self.card_CheckUpdate = PushSettingCard(
+            text="检查更新",
+            icon=FluentIcon.UPDATE,
+            title="获取最新版本",
+            content="检查AUTO_MAA是否有新版本",
+        )
+
+        Layout = QVBoxLayout()
+        Layout.addWidget(self.card_IfAutoUpdate)
+        Layout.addWidget(self.card_UpdateType)
+        Layout.addWidget(self.card_CheckUpdate)
+        self.viewLayout.addLayout(Layout)
+
+
+class OtherSettingCard(HeaderCardWidget):
+
+    def __init__(self, parent=None):
+        super().__init__(parent)
+        self.setTitle("其他")
+
+        self.card_Notice = PushSettingCard(
+            text="查看",
+            icon=FluentIcon.PAGE_RIGHT,
+            title="公告",
+            content="查看AUTO_MAA的最新公告",
+        )
+        self.card_UserDocs = HyperlinkCard(
+            url="https://docs.qq.com/aio/DQ2NwUHRiWGtMWHBy",
+            text="查看使用指南",
+            icon=FluentIcon.PAGE_RIGHT,
+            title="使用指南",
+            content="查看AUTO_MAA的使用教程和文档",
+        )
+        self.card_Association = self.AssociationSettingCard()
+
+        Layout = QVBoxLayout()
+        Layout.addWidget(self.card_Notice)
+        Layout.addWidget(self.card_UserDocs)
+        Layout.addWidget(self.card_Association)
+        self.viewLayout.addLayout(Layout)
+
+    class AssociationSettingCard(ExpandGroupSettingCard):
+
+        def __init__(self, parent=None):
+            super().__init__(
+                FluentIcon.SETTING,
+                "AUTO_MAA官方社群",
+                "加入AUTO_MAA官方社群，获取更多帮助",
+                parent,
+            )
+
+            self.card_GitHubRepository = HyperlinkCard(
+                url="https://github.com/DLmaster361/AUTO_MAA",
+                text="访问GitHub仓库",
+                icon=FluentIcon.GITHUB,
+                title="GitHub",
+                content="查看AUTO_MAA的源代码，提交问题和建议，欢迎参与开发",
+            )
+            self.card_QQGroup = HyperlinkCard(
+                url="https://qm.qq.com/q/bd9fISNoME",
+                text="加入官方QQ交流群",
+                icon=FluentIcon.CHAT,
+                title="QQ群",
+                content="与AUTO_MAA开发者和用户交流",
+            )
+
+            widget = QWidget()
+            Layout = QVBoxLayout(widget)
+            Layout.addWidget(self.card_GitHubRepository)
+            Layout.addWidget(self.card_QQGroup)
+            self.viewLayout.setContentsMargins(0, 0, 0, 0)
+            self.viewLayout.setSpacing(0)
+            self.addGroupWidget(widget)
+
+
+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

app/utils/Updater.py

@@ -25,7 +25,6 @@ v1.1
 作者：DLmaster_361
 """
 
-import os
 import sys
 import json
 import zipfile
@@ -39,11 +38,21 @@ from PySide6.QtWidgets import (
     QDialog,
     QVBoxLayout,
 )
-from qfluentwidgets import ProgressBar, BodyLabel
+from qfluentwidgets import ProgressBar, IndeterminateProgressBar, BodyLabel
 from PySide6.QtGui import QIcon
 from PySide6.QtCore import QObject, QThread, Signal
 
-from .version import version_text
+
+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):
@@ -67,10 +76,8 @@ class UpdateProcess(QThread):
     def run(self) -> None:
 
         # 清理可能存在的临时文件
-        try:
-            os.remove(self.download_path)
-        except FileNotFoundError:
-            pass
+        if self.download_path.exists():
+            self.download_path.unlink()
 
         self.info.emit("正在获取下载链接")
         url_list = self.get_download_url()
@@ -158,7 +165,7 @@ class UpdateProcess(QThread):
 
             self.info.emit("正在删除临时文件")
             self.progress.emit(0, 0, 0)
-            os.remove(self.download_path)
+            self.download_path.unlink()
 
             self.info.emit(f"{self.name}更新成功！")
             self.progress.emit(0, 100, 100)
@@ -178,7 +185,7 @@ class UpdateProcess(QThread):
         elif self.name == "AUTO_MAA主程序":
             version_info["main_version"] = ".".join(map(str, self.main_version))
         with open(self.version_path, "w", encoding="utf-8") as f:
-            json.dump(version_info, f, indent=4)
+            json.dump(version_info, f, ensure_ascii=False, indent=4)
 
         # 主程序更新完成后打开AUTO_MAA
         if self.name == "AUTO_MAA主程序":
@@ -223,7 +230,7 @@ class UpdateProcess(QThread):
                 "https://gh.llkk.cc/",
                 "https://github.akams.cn/",
                 "https://www.ghproxy.cn/",
-                "https://ghp.ci/",
+                "https://ghfast.top/",
             ]
             time.sleep(1)
 
@@ -262,14 +269,19 @@ class Updater(QObject):
         )
 
         # 创建垂直布局
-        self.Layout_v = QVBoxLayout(self.ui)
+        self.Layout = QVBoxLayout(self.ui)
 
         self.info = BodyLabel("正在初始化", self.ui)
-        self.Layout_v.addWidget(self.info)
+        self.progress_1 = IndeterminateProgressBar(self.ui)
+        self.progress_2 = ProgressBar(self.ui)
 
-        self.progress = ProgressBar(self.ui)
-        self.progress.setRange(0, 0)
-        self.Layout_v.addWidget(self.progress)
+        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)
 
         self.update_process = UpdateProcess(
             app_path, name, main_version, updater_version
@@ -284,8 +296,14 @@ class Updater(QObject):
         self.info.setText(text)
 
     def update_progress(self, begin: int, end: int, current: int) -> None:
-        self.progress.setRange(begin, end)
-        self.progress.setValue(current)
+        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)
 
 
 class AUTO_MAA_Updater(QApplication):
@@ -301,7 +319,7 @@ class AUTO_MAA_Updater(QApplication):
 if __name__ == "__main__":
 
     # 获取软件自身的路径
-    app_path = Path.cwd()
+    app_path = Path(sys.argv[0]).resolve().parent
 
     # 从本地版本信息文件获取当前版本信息
     if (app_path / "resources/version.json").exists():
@@ -315,11 +333,22 @@ if __name__ == "__main__":
     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(
-                "https://gitee.com/DLmaster_361/AUTO_MAA/raw/main/resources/version.json"
+                f"https://gitee.com/DLmaster_361/AUTO_MAA/raw/{update_type}/resources/version.json"
             )
             version_remote = response.json()
             main_version_remote = list(

app/utils/__init__.py

@@ -30,6 +30,5 @@ __author__ = "DLmaster361 <DLmaster_361@163.com>"
 __license__ = "GPL-3.0 license"
 
 from .Updater import Updater
-from .version import version_text
 
-__all__ = ["Updater", "version_text"]
+__all__ = ["Updater"]

app/utils/package.py

@@ -26,17 +26,27 @@ v4.2
 """
 
 import os
+import sys
 import json
 import shutil
-import subprocess
 from pathlib import Path
 
-from app import version_text
+
+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
 
 
 if __name__ == "__main__":
 
-    root_path = Path.cwd()
+    root_path = Path(sys.argv[0]).resolve().parent
 
     with (root_path / "resources/version.json").open(mode="r", encoding="utf-8") as f:
         version = json.load(f)
@@ -46,24 +56,20 @@ if __name__ == "__main__":
 
     print("Packaging AUTO_MAA main program ...")
 
-    result = subprocess.run(
-        f"powershell -Command nuitka --standalone --onefile --mingw64"
-        f" --enable-plugins=pyside6 --windows-console-mode=disable"
-        f" --windows-icon-from-ico=resources\\icons\\AUTO_MAA.ico"
-        f" --company-name='AUTO_MAA Team' --product-name=AUTO_MAA"
+    os.system(
+        "powershell -Command python -m nuitka --standalone --onefile --mingw64"
+        " --enable-plugins=pyside6 --windows-console-mode=disable"
+        " --onefile-tempdir-spec='{TEMP}\\AUTO_MAA'"
+        " --windows-icon-from-ico=resources\\icons\\AUTO_MAA.ico"
+        " --company-name='AUTO_MAA Team' --product-name=AUTO_MAA"
         f" --file-version={version["main_version"]}"
         f" --product-version={version["main_version"]}"
-        f" --file-description='AUTO_MAA Component'"
-        f" --copyright='Copyright © 2024 DLmaster361'"
-        f" --assume-yes-for-downloads --output-filename=AUTO_MAA"
-        f" --remove-output main.py",
-        shell=True,
-        capture_output=True,
-        text=True,
+        " --file-description='AUTO_MAA Component'"
+        " --copyright='Copyright © 2024 DLmaster361'"
+        " --assume-yes-for-downloads --output-filename=AUTO_MAA"
+        " --remove-output main.py"
     )
 
-    print(result.stdout)
-    print(result.stderr)
     print("AUTO_MAA main program packaging completed !")
 
     shutil.copy(root_path / "app/utils/Updater.py", root_path)
@@ -79,27 +85,23 @@ if __name__ == "__main__":
 
     print("Packaging AUTO_MAA update program ...")
 
-    result = subprocess.run(
-        f"powershell -Command nuitka --standalone --onefile --mingw64"
-        f" --enable-plugins=pyside6 --windows-console-mode=disable"
-        f" --windows-icon-from-ico=resources\\icons\\AUTO_MAA_Updater.ico"
-        f" --company-name='AUTO_MAA Team' --product-name=AUTO_MAA"
+    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"]}"
-        f" --file-description='AUTO_MAA Component'"
-        f" --copyright='Copyright © 2024 DLmaster361'"
-        f" --assume-yes-for-downloads --output-filename=Updater"
-        f" --remove-output Updater.py",
-        shell=True,
-        capture_output=True,
-        text=True,
+        " --file-description='AUTO_MAA Component'"
+        " --copyright='Copyright © 2024 DLmaster361'"
+        " --assume-yes-for-downloads --output-filename=Updater"
+        " --remove-output Updater.py"
     )
 
-    print(result.stdout)
-    print(result.stderr)
     print("AUTO_MAA update program packaging completed !")
 
-    os.remove(root_path / "Updater.py")
+    (root_path / "Updater.py").unlink()
 
     (root_path / "version_info.txt").write_text(
         f"{version_text(main_version_numb)}\n{version_text(updater_version_numb)}{version["announcement"]}",

main.py

@@ -25,18 +25,30 @@ v4.2
 作者：DLmaster_361
 """
 
+from loguru import logger
 from PySide6.QtWidgets import QApplication
+from PySide6.QtCore import Qt
+from qfluentwidgets import FluentTranslator
 import sys
 
-from app import AppConfig, Notification, CryptoHandler, AUTO_MAA
+
+@logger.catch
+def main():
+
+    application = QApplication(sys.argv)
+    QApplication.setAttribute(Qt.AA_DontCreateNativeWidgetSiblings)
+
+    translator = FluentTranslator()
+    application.installTranslator(translator)
+
+    from app.ui.main_window import AUTO_MAA
+
+    window = AUTO_MAA()
+    window.show_ui("显示主窗口")
+    window.start_up_task()
+    sys.exit(application.exec())
+
 
 if __name__ == "__main__":
 
-    config = AppConfig()
-    notify = Notification(config)
-    crypto = CryptoHandler(config)
-
-    application = QApplication(sys.argv)
-    window = AUTO_MAA(config=config, notify=notify, crypto=crypto)
-    window.main.check_PASSWORD()
-    sys.exit(application.exec())
+    main()

requirements.txt

@@ -1,9 +1,12 @@
+loguru
 plyer
 PySide6
 PySide6-Fluent-Widgets[full]
 psutil
+opencv-python
 pywin32
 pyautogui
 pycryptodome
 requests
-nuitka
+serverchan_sdk
+nuitka==2.6

res/version.json

@@ -9,6 +9,6 @@
         "https://gh.llkk.cc/",
         "https://github.akams.cn/",
         "https://www.ghproxy.cn/",
-        "https://ghp.ci/"
+        "https://ghfast.top/"
     ]
 }

resources/docs/MAA_config_info.txt

@@ -37,9 +37,9 @@ G"Timer.Timer1": "False"        #时间设置1
 G"VersionUpdate.ScheduledUpdateCheck": "True"        #定时检查更新
 G"VersionUpdate.AutoDownloadUpdatePackage": "True"        #自动下载更新包
 G"VersionUpdate.AutoInstallUpdatePackage": "True"        #自动安装更新包
-G"Start.RunDirectly": "True"        #启动MAA后直接运行
 G"Start.MinimizeDirectly": "True"        #启动MAA后直接最小化
-G"Start.OpenEmulatorAfterLaunch": "True"        #启动MAA后自动开启模拟器
+"Start.RunDirectly": "True"        #启动MAA后直接运行
+"Start.OpenEmulatorAfterLaunch": "True"        #启动MAA后自动开启模拟器
 G"GUI.UseTray": "True"        #显示托盘图标
 G"GUI.MinimizeToTray": "False"        #最小化时隐藏至托盘
 "Start.EmulatorPath"        #模拟器路径

resources/version.json

@@ -1,14 +1,14 @@
 {
-    "main_version": "4.2.0.1",
-    "updater_version": "1.1.0.1",
-    "announcement": "\n## 新增功能\n- 初步引入`qfluentwidgets`，UI界面美化",
-    "proxy_list":[
+    "main_version": "4.2.2.2",
+    "updater_version": "1.1.1.3",
+    "announcement": "\n## 新增功能\n- 添加用户每日代理次数上限功能 #15\n- 新增代理成功消息推送渠道Server酱与企业微信群机器人推送\n- 添加更新类别可选项\n## 修复BUG\n- 修复自定义基建无法正常使用的问题\n- 修正人工排查文案\n- 修复高级MAA配置序号错位\n- 修复高级用户列表无法配置问题\n- 修复主调度台选项乱动问题\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://ghp.ci/"
+        "https://ghfast.top/"
     ]
 }