Release v4.2.1

对于MAAv5.12.1版本后两个字段`Start.RunDirectly`与`Start.OpenEmulatorAfterLaunch`的适配

.github/workflows/python-app.yml

@@ -41,6 +41,7 @@ jobs:
     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."
@@ -68,22 +69,35 @@ jobs:
           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: Built with pyinstaller
+      - name: Package
+        id: package
         run: |
-          pyinstaller -F --version-file res/info.txt -w --icon=res/AUTO_MAA.ico AUTO_MAA.py --hidden-import plyer.platforms.win.notification
+          copy app\utils\package.py .\
+          python package.py
       - name: Read version
         id: read_version
         run: |
-          $VERSION=(Get-Content -Path "更新说明.txt" -TotalCount 1).Trim()
+          $MAIN_VERSION=(Get-Content -Path "version_info.txt" -TotalCount 1).Trim()
-          "version=$VERSION" | Out-File -FilePath $env:GITHUB_ENV -Append
+          "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 gui,res,AUTO_MAA.py,dist/AUTO_MAA.exe,requirements.txt,README.md,LICENSE,更新说明.txt -DestinationPath AUTO_MAA_${{ env.version }}.zip
+          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.version }}
+          name: AUTO_MAA_${{ env.AUTO_MAA_version }}
-          path: AUTO_MAA_${{ env.version }}.zip
+          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_release:
     name: Publish release
     needs: build_AUTO_MAA
@@ -97,10 +111,15 @@ jobs:
           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 $(head -n 1 更新说明.txt) --json id --jq .id || true)
+          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
@@ -114,22 +133,23 @@ jobs:
         run: |
           set -xe
           shopt -s nullglob
-          NAME="$(head -n 1 更新说明.txt)"
+          NAME="$(sed 's/\r$//g' <(head -n 1 version_info.txt))"
-          TAGNAME="$(head -n 1 更新说明.txt)"
+          TAGNAME="$(sed 's/\r$//g' <(head -n 1 version_info.txt))"
-          NOTES_MAIN="$(tail -n +2 更新说明.txt)"
+          NOTES_MAIN="$(sed 's/\r$//g' <(tail -n +3 version_info.txt))"
           NOTES_TAIL="\`\`\`本release通过GitHub Actions自动构建\`\`\`"
           NOTES="$NOTES_MAIN<br><br>$NOTES_TAIL"
           gh release create "$TAGNAME" --target "main" --title "$NAME" --notes "$NOTES" artifacts/*
         env:
           GITHUB_TOKEN: ${{ secrets.WORKFLOW_TOKEN }}
       - name: Update release
+        id: update_release
         if: steps.check_if_release_exists.outputs.release_exists == 'true'
         run: |
           set -xe
           shopt -s nullglob
-          NAME="$(head -n 1 更新说明.txt)"
+          NAME="$(sed 's/\r$//g' <(head -n 1 version_info.txt))"
-          TAGNAME="$(head -n 1 更新说明.txt)"
+          TAGNAME="$(sed 's/\r$//g' <(head -n 1 version_info.txt))"
-          NOTES_MAIN="$(tail -n +2 更新说明.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

README.md

@@ -2,7 +2,7 @@
 
 MAA多账号管理与自动化软件
 
-!["软件图标"](https://github.com/DLmaster361/AUTO_MAA/blob/main/res/AUTO_MAA.png "软件图标")
+!["软件图标"](https://github.com/DLmaster361/AUTO_MAA/blob/main/resources/images/AUTO_MAA.png "软件图标")
 
 ---
 
@@ -15,16 +15,35 @@ MAA多账号管理与自动化软件
 [![GitHub License](https://img.shields.io/github/license/DLmaster361/AUTO_MAA?style=flat-square)](https://github.com/DLmaster361/AUTO_MAA/blob/main/LICENSE)
 </div>
 
+## 软件介绍
+
+### 性质
+
+本软件是明日方舟第三方软件`MAA`的第三方工具，即第3<sup>3</sup>方软件。旨在优化MAA多账号功能体验，并通过一些方法解决MAA项目未能解决的部分问题，提高代理的稳定性。
+
+### 原理
+
+本软件可以存储多个明日方舟账号数据，并通过以下流程实现代理功能：
+
+1. **配置：** 根据对应用户的配置信息，生成配置文件并将其导入MAA。
+2. **监测：** 在MAA开始代理后，持续读取MAA的日志以判断其运行状态。当软件认定MAA出现异常时，通过重启MAA使之仍能继续完成任务。
+3. **循环：** 重复上述步骤，使MAA依次完成各个用户的日常代理任务。
+
+### 优势
+
+- **节省运行开销：** 只需要一份MAA软件与一个模拟器，无需多开就能完成多账号代理，羸弱的电脑也能代理日常。
+- **自定义空间大：** 依靠高级用户配置模式，支持MAA几乎所有设置选项自定义，同时保留对模拟器多开的支持。
+- **一键代理无忧：** 无须中途手动修改MAA配置，将繁琐交给AUTO_MAA，把游戏留给自己。
+- **代理结果复核：** 通过人工排查功能核实各用户代理情况，堵住日常代理的最后一丝风险。
+
 ## 重要声明
 
-本软件是一个外部工具，旨在优化MAA多账号功能体验，并通过一些方法解决MAA项目未能解决的部分问题，改善代理的稳定性。该软件包可以存储明日方舟多账号数据，并通过修改MAA配置文件、读取MAA日志等行为自动完成多账号代理。本开发团队承诺，不会修改明日方舟游戏本体与相关配置文件。
+本开发团队承诺，不会修改明日方舟游戏本体与相关配置文件。本项目使用GPL开源，相关细则如下：
-
-本项目使用GPL开源，相关细则如下：
 
 - **作者：** AUTO_MAA软件作者为DLmaster、DLmaster361或DLmaster_361，以上均指代同一人。
 - **使用：** AUTO_MAA使用者可以按自己的意愿自由使用本软件。依据GPL，对于由此可能产生的损失，AUTO_MAA项目组不负任何责任。
-- **分发：** AUTO_MAA允许任何人自由分发本软件，包括进行商业活动牟利。但所有分发者必须遵循GPL向接收者提供本软件项目地址、完整的软件源码与GPL协议原文（件），违反者可能会被追究法律责任。
+- **分发：** AUTO_MAA允许任何人自由分发本软件，包括进行商业活动牟利。若为直接分发本软件，必须遵循GPL向接收者提供本软件项目地址、完整的软件源码与GPL协议原文（件）；若为修改软件后进行分发，必须遵循GPL向接收者提供本软件项目地址、修改前的完整软件源码副本与GPL协议原文（件），违反者可能会被追究法律责任。
-- **传播：** AUTO_MAA原则上允许传播者自由传播本软件。但由于软件性质，项目组不希望发现任何人在明日方舟官方媒体（包括官方媒体账号与森空岛社区等）或明日方舟游戏相关内容（包括同好群、线下活动与游戏内容讨论等）下提及AUTO_MAA或MAA，希望各位理解。
+- **传播：** AUTO_MAA原则上允许传播者自由传播本软件，但无论在何种传播过程中，不得删除项目作者与开发者所留版权声明，不得隐瞒项目作者与相关开发者的存在。由于软件性质，项目组不希望发现任何人在明日方舟官方媒体（包括官方媒体账号与森空岛社区等）或明日方舟游戏相关内容（包括同好群、线下活动与游戏内容讨论等）下提及AUTO_MAA或MAA，希望各位理解。
 - **衍生：** AUTO_MAA允许任何人对软件本体或软件部分代码进行二次开发或利用。但依据GPL，相关成果也必须使用GPL开源。
 - **授权：** 如果希望在使用AUTO_MAA的相关成果后仍保持自己的项目闭源，请在Issues中说明来意。得到项目组认可后，我们可以提供另一份使用不同协议的代码，此协议主要内容如下：被授权者可以自由使用该代码并维持闭源；被授权者必须定期为AUTO_MAA作出贡献。
 - **贡献：** 不论是直接参与软件的维护编写，或是撰写文档、测试、反馈BUG、给出建议、参与讨论，都为AUTO_MAA项目的发展完善做出了不可忽视的贡献。项目组提倡各位贡献者遵照GitHub开源社区惯例，发布Issues参与项目。避免私信或私发邮件（安全性漏洞或敏感问题除外），以帮助更多用户。
@@ -47,7 +66,7 @@ MAA多账号管理与自动化软件
 
 ### 下载MAA
 
-- 什么是MAA？    [官网](https://maa.plus/)/[GitHub](https://github.com/CHNZYX/Auto_Simulated_Universe/archive/refs/heads/main.zip)
+- 什么是MAA？    [官网](https://maa.plus/)/[GitHub](https://github.com/MaaAssistantArknights/MaaAssistantArknights)
 
 - MAA下载地址    [GitHub下载](https://github.com/MaaAssistantArknights/MaaAssistantArknights/releases)
 
@@ -100,7 +119,7 @@ MAA多账号管理与自动化软件
   - 配置自己模拟器所在的位置并根据实际情况填写`等待模拟器启动时间`（建议预留10s以防意外）。
   - 如果是模拟器多开用户，还需要填写`附加命令`，具体填写值参见多开模拟器对应快捷方式路径（如`-v 1`）。
 
-![MAA配置](https://github.com/DLmaster361/AUTO_MAA/blob/main/res/README/MAA配置.png "MAA配置")
+![MAA配置](https://github.com/DLmaster361/AUTO_MAA/blob/main/resources/images/README/MAA配置.png "MAA配置")
 
 #### 设置AUTO_MAA
 
@@ -113,6 +132,9 @@ MAA多账号管理与自动化软件
 - `运行失败重试次数上限`：对于每一用户，若超过该次数限制仍未完成代理，视为代理失败。
 - `开机自动启动AUTO_MAA`：实现AUTO_MAA的自启动。
 - `AUTO_MAA启动时禁止电脑休眠`：仅阻止电脑自动休眠，不会影响屏幕是否熄灭。
+- `启动AUTO_MAA后直接代理`：在AUTO_MAA启动后立即执行代理任务。
+- `通过邮件通知结果`：在AUTO_MAA完成任务后将结果发送至用户指定邮箱。
+- `检查版本更新`：从GitHub镜像源获取版本更新信息，并调起更新器完成程序更新，更新器已支持多个代理地址。
 - `修改管理密钥`：修改管理密钥，当用户列表中无用户时，将跳过验证旧管理密钥。
 
 #### 设置用户配置
@@ -120,9 +142,6 @@ MAA多账号管理与自动化软件
 本项目已基本完成GUI开发，您可以直接在用户管理页配置用户相关信息，页面简介如下：
 - `新建`、`删除`：新建一个用户到当前用户配置列表、删除当前所选第一行所对应的用户。
 - `转为高级/简洁`：将当前所选第一行所对应的用户转为高级/简洁配置模式。
-- `修改配置`：修改更深层的用户配置信息，当前支持该项的有`简洁用户配置列表的自定义基建栏目`、`高级用户配置列表的日常、剿灭栏目`，详解如下：
-  - `简洁用户配置列表的自定义基建栏目`：获取自定义基建的JSON文件。
-  - `高级用户配置列表的日常、剿灭栏目`：打开MAA进行具体的任务配置，配置方法参见上文。注意，此时你还需要确保所要执行的任务被勾选。
 - `显示密码`：输入管理密钥以显示用户密码，仅当管理密钥正确时能够修改`密码栏目`。
 - `刷新`：清除临时保存的管理密钥。
 - `简洁用户配置列表`：仅支持核心代理选项的设置，其它设置选项沿用MAA的全局设置，部分代理核心功能选项由程序托管。
@@ -131,13 +150,13 @@ MAA多账号管理与自动化软件
   - `用户名`：展示在执行界面的用户名，用于区分不同用户。
   - `账号ID`：MAA进行账号切换所需的凭据，官服用户请输入手机号码、B服请输入B站ID。
   - `服务器`：当前支持官服、B服。
-  - `代理天数`：剩余需要进行代理的天数，当剩余天数为0时不再代理或排查。
+  - `代理天数`：剩余需要进行代理的天数，输入`任意负数`可设置为无限代理天数，当剩余天数为0时不再代理或排查。
   - `状态`：用户的状态，禁用时将不再对其进行代理或排查。
   - `执行情况`：当日执行情况，不可编辑。
   - `关卡`、`备选关卡-1`、`备选关卡-2`：关卡号。
   - `日常`：单独设定是否进行日常代理的日常部分，可进一步配置MAA的具体代理任务，该配置与全局MAA配置相互独立。
   - `剿灭`：单独设定是否进行日常代理的剿灭部分，高级配置模式下可进一步配置MAA的具体代理任务，该配置与全局MAA配置相互独立。
-  - `自定义基建`：是否启用自定义基建功能，可进一步配置自定义基建文件，该配置与其他用户相互独立。
+  - `自定义基建`：是否启用自定义基建功能，需要进一步配置自定义基建文件，该配置与其他用户相互独立。
   - `密码`：仅用于登记用户的密码，可留空。
   - `备注`：用于备注用户信息。
 
@@ -146,7 +165,7 @@ MAA多账号管理与自动化软件
   - 程序会读取`data/gameid.txt`中的数据，依据此进行关卡号的替换，便于常用关卡的使用。
   - `gameid.txt`会在程序首次运行时生成，其中将预置一些常用资源本的替换方案。
 
-![gameid](https://github.com/DLmaster361/AUTO_MAA/blob/main/res/README/gameid.png "gameid")
+![gameid](https://github.com/DLmaster361/AUTO_MAA/blob/main/resources/images/README/gameid.png "gameid")
 
 ## 运行代理任务
 
@@ -180,11 +199,9 @@ MAA多账号管理与自动化软件
 
 ## 未来开发方向
 
-- [x] 支持B服
+- [ ] 尝试接入更多开源社区成果
-- [x] 支持完全自定义MAA配置
 - [ ] 支持对MAA运行状况的进一步识别
-- [ ] 支持宽幅ADB连接适配
+- [x] 添加更多通知手段
-- [ ] 添加更多通知手段
 - [ ] GUI界面美化
 
 ## 贡献者
@@ -207,10 +224,10 @@ MAA多账号管理与自动化软件
 
 欢迎加入AUTO_MAA项目组，欢迎反馈bug
 
-- QQ群：957750551
+- QQ群：[957750551](https://qm.qq.com/cgi-bin/qm/qr?k=EET-OL_o52KPlDLEmbzaNkKUXuyQ4WZY&jump_from=webapi&authKey=6NxGwEu9JAOLHqfdEmNfrZy4tUvC/3ar2j5+Go7Hgf3j+ntAK1VS6SUOLOjYVKTt)
 
 ---
 
 如果喜欢这个项目的话，给作者来杯咖啡吧！
 
-![payid](https://github.com/DLmaster361/AUTO_MAA/blob/main/res/README/payid.png "payid")
+![payid](https://github.com/DLmaster361/AUTO_MAA/blob/main/resources/README/payid.png "payid")

app/__init__.py

@@ -0,0 +1,46 @@
+#   <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
+"""
+
+__version__ = "4.2.0"
+__author__ = "DLmaster361 <DLmaster_361@163.com>"
+__license__ = "GPL-3.0 license"
+
+from .config import AppConfig
+from .models import MaaManager
+from .services import Notification, CryptoHandler
+from .ui import AUTO_MAA
+from .utils import Updater, version_text
+
+__all__ = [
+    "AppConfig",
+    "MaaManager",
+    "Notification",
+    "CryptoHandler",
+    "AUTO_MAA",
+    "Updater",
+    "version_text",
+]

app/config.py

@@ -0,0 +1,240 @@
+#   <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/models/__init__.py

@@ -18,8 +18,17 @@
 
 #   DLmaster_361@163.com
 
-import os
+"""
+AUTO_MAA
+AUTO_MAA模组包
+v4.2
+作者：DLmaster_361
+"""
 
-os.system(
+__version__ = "4.2.0"
-    "pyinstaller -F --version-file res/info.txt -w --icon=res/AUTO_MAA.ico AUTO_MAA.py --hidden-import plyer.platforms.win.notification"
+__author__ = "DLmaster361 <DLmaster_361@163.com>"
-)
+__license__ = "GPL-3.0 license"
+
+from .MAA import MaaManager
+
+__all__ = ["MaaManager"]

app/services/__init__.py

@@ -0,0 +1,35 @@
+#   <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
+"""
+
+__version__ = "4.2.0"
+__author__ = "DLmaster361 <DLmaster_361@163.com>"
+__license__ = "GPL-3.0 license"
+
+from .notification import Notification
+from .security import CryptoHandler
+
+__all__ = ["Notification", "CryptoHandler"]

app/services/notification.py

@@ -0,0 +1,95 @@
+#   <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 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
+
+
+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,
+        )
+
+        return True
+
+    def send_mail(self, title, content):
+        """使用官方专用邮箱推送邮件通知"""
+
+        # 声明：此邮箱为AUTO_MAA项目组资产，未经授权不得私自使用
+        # 注意：此声明注释只有使用者更换发信邮箱时才能删除，本条规则优先级高于GPLv3
+
+        # 第三方 SMTP 服务配置
+        mail_host = "smtp.163.com"  # 设置服务器
+        mail_sender = "AUTO_MAA_server@163.com"  # 用户名
+        mail_key = "SYrq87nDLD4RNB5T"  # 授权码 24/11/15
+
+        # 定义邮件正文
+        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")
+
+        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(),
+            )
+            return True
+        except smtplib.SMTPException as e:
+            return f"发送邮件时出错：\n{e}"
+        finally:
+            smtpObj.quit()

app/services/security.py

@@ -0,0 +1,167 @@
+#   <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 os
+import hashlib
+import random
+import secrets
+from Crypto.Cipher import AES
+from Crypto.PublicKey import RSA
+from Crypto.Cipher import PKCS1_OAEP
+from Crypto.Util.Padding import pad, unpad
+
+from app import AppConfig
+
+
+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)
+
+        # 生成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(
+            public_key_local.exportKey()
+        )
+        # 生成密钥转换与校验随机盐
+        PASSWORD_salt = secrets.token_hex(random.randint(32, 1024))
+        (self.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(
+            verify_salt,
+            encoding="utf-8",
+        )
+        # 将管理密钥转化为AES-256密钥
+        AES_password = hashlib.sha256(
+            (PASSWORD + PASSWORD_salt).encode("utf-8")
+        ).digest()
+        # 生成AES-256密钥校验哈希值并保存
+        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(
+            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
+        )
+
+    def encryptx(self, note: str) -> bytes:
+        """加密数据"""
+
+        # 读取RSA公钥
+        public_key_local = RSA.import_key(
+            (self.config.app_path / "data/key/public_key.pem").read_bytes()
+        )
+        # 使用RSA公钥对数据进行加密
+        cipher = PKCS1_OAEP.new(public_key_local)
+        encrypted = cipher.encrypt(note.encode("utf-8"))
+        return encrypted
+
+    def decryptx(self, note: bytes, PASSWORD: str) -> str:
+        """解密数据"""
+
+        # 读入RSA私钥密文、盐与校验哈希值
+        private_key_local = (
+            (self.config.app_path / "data/key/private_key.bin").read_bytes().strip()
+        )
+        PASSWORD_salt = (
+            (self.config.app_path / "data/key/PASSWORDsalt.txt")
+            .read_text(encoding="utf-8")
+            .strip()
+        )
+        verify_salt = (
+            (self.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()
+        )
+        # 将管理密钥转化为AES-256密钥并验证
+        AES_password = hashlib.sha256(
+            (PASSWORD + PASSWORD_salt).encode("utf-8")
+        ).digest()
+        AES_password_SHA = hashlib.sha256(
+            AES_password + verify_salt.encode("utf-8")
+        ).digest()
+        if AES_password_SHA != AES_password_verify:
+            return "管理密钥错误"
+        else:
+            # AES解密RSA私钥
+            AES_key = AES.new(AES_password, AES.MODE_ECB)
+            private_key_pem = unpad(AES_key.decrypt(private_key_local), 32)
+            private_key = RSA.import_key(private_key_pem)
+            # 使用RSA私钥解密数据
+            decrypter = PKCS1_OAEP.new(private_key)
+            note = decrypter.decrypt(note)
+            return note.decode("utf-8")
+
+    def change_PASSWORD(self, data: list, 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))
+        # 使用新管理密钥重新加密
+        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
+
+    def check_PASSWORD(self, PASSWORD: str) -> bool:
+        """验证管理密钥"""
+
+        return bool(self.decryptx(self.encryptx(""), PASSWORD) != "管理密钥错误")

app/ui/__init__.py

@@ -0,0 +1,34 @@
+#   <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
+"""
+
+__version__ = "4.2.0"
+__author__ = "DLmaster361 <DLmaster_361@163.com>"
+__license__ = "GPL-3.0 license"
+
+from .gui import AUTO_MAA
+
+__all__ = ["AUTO_MAA"]

app/utils/Updater.py

@@ -0,0 +1,343 @@
+#   <AUTO_MAA:A MAA Multi Account Management and Automation Tool>
+#   Copyright © <2024> <DLmaster361>
+
+#   This file is part of AUTO_MAA.
+
+#   AUTO_MAA is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published
+#   by the Free Software Foundation, either version 3 of the License,
+#   or (at your option) any later version.
+
+#   AUTO_MAA is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty
+#   of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
+#   the GNU General Public License for more details.
+
+#   You should have received a copy of the GNU General Public License
+#   along with AUTO_MAA. If not, see <https://www.gnu.org/licenses/>.
+
+#   DLmaster_361@163.com
+
+"""
+AUTO_MAA
+AUTO_MAA更新器
+v1.1
+作者：DLmaster_361
+"""
+
+import os
+import sys
+import json
+import zipfile
+import requests
+import subprocess
+import time
+from pathlib import Path
+
+from PySide6.QtWidgets import (
+    QApplication,
+    QDialog,
+    QVBoxLayout,
+)
+from qfluentwidgets import ProgressBar, BodyLabel
+from PySide6.QtGui import QIcon
+from PySide6.QtCore import QObject, QThread, Signal
+
+from .version import version_text
+
+
+class UpdateProcess(QThread):
+
+    info = Signal(str)
+    progress = Signal(int, int, int)
+    accomplish = Signal()
+
+    def __init__(
+        self, app_path: Path, name: str, main_version: list, updater_version: list
+    ) -> None:
+        super(UpdateProcess, self).__init__()
+
+        self.app_path = app_path
+        self.name = name
+        self.main_version = main_version
+        self.updater_version = updater_version
+        self.download_path = app_path / "AUTO_MAA_Update.zip"  #  临时下载文件的路径
+        self.version_path = app_path / "resources/version.json"
+
+    def run(self) -> None:
+
+        # 清理可能存在的临时文件
+        try:
+            os.remove(self.download_path)
+        except FileNotFoundError:
+            pass
+
+        self.info.emit("正在获取下载链接")
+        url_list = self.get_download_url()
+
+        # 验证下载地址并获取文件大小
+        for i in range(len(url_list)):
+            try:
+                self.info.emit(f"正在验证下载地址：{url_list[i]}")
+                response = requests.get(url_list[i], stream=True)
+                if response.status_code != 200:
+                    self.info.emit(
+                        f"连接失败，错误代码 {response.status_code} ，正在切换代理（{i+1}/{len(url_list)}）"
+                    )
+                    time.sleep(1)
+                    continue
+                file_size = response.headers.get("Content-Length")
+                break
+            except requests.RequestException:
+                self.info.emit(f"请求超时，正在切换代理（{i+1}/{len(url_list)}）")
+                time.sleep(1)
+        else:
+            self.info.emit(f"连接失败，已尝试所有{len(url_list)}个代理")
+            return None
+
+        if file_size is None:
+            file_size = 1
+        else:
+            file_size = int(file_size)
+
+        try:
+            # 下载文件
+            with open(self.download_path, "wb") as f:
+
+                downloaded_size = 0
+                last_download_size = 0
+                speed = 0
+                last_time = time.time()
+
+                for chunk in response.iter_content(chunk_size=8192):
+
+                    # 写入已下载数据
+                    f.write(chunk)
+                    downloaded_size += len(chunk)
+
+                    # 计算下载速度
+                    if time.time() - last_time >= 1.0:
+                        speed = (
+                            (downloaded_size - last_download_size)
+                            / (time.time() - last_time)
+                            / 1024
+                        )
+                        last_download_size = downloaded_size
+                        last_time = time.time()
+
+                    # 更新下载进度
+                    if speed >= 1024:
+                        self.info.emit(
+                            f"正在下载：{self.name} 已下载：{downloaded_size / 1048576:.2f}/{file_size / 1048576:.2f} MB （{downloaded_size / file_size * 100:.2f}%） 下载速度：{speed / 1024:.2f} MB/s",
+                        )
+                    else:
+                        self.info.emit(
+                            f"正在下载：{self.name} 已下载：{downloaded_size / 1048576:.2f}/{file_size / 1048576:.2f} MB （{downloaded_size / file_size * 100:.2f}%） 下载速度：{speed:.2f} KB/s",
+                        )
+                    self.progress.emit(0, 100, int(downloaded_size / file_size * 100))
+
+        except Exception as e:
+            e = str(e)
+            e = "\n".join([e[_ : _ + 75] for _ in range(0, len(e), 75)])
+            self.info.emit(f"下载{self.name}时出错：\n{e}")
+            return None
+
+        # 解压
+        try:
+
+            while True:
+                try:
+                    self.info.emit("正在解压更新文件")
+                    self.progress.emit(0, 0, 0)
+                    with zipfile.ZipFile(self.download_path, "r") as zip_ref:
+                        zip_ref.extractall(self.app_path)
+                    break
+                except PermissionError:
+                    self.info.emit("解压出错：AUTO_MAA正在运行，正在等待其关闭")
+                    time.sleep(1)
+
+            self.info.emit("正在删除临时文件")
+            self.progress.emit(0, 0, 0)
+            os.remove(self.download_path)
+
+            self.info.emit(f"{self.name}更新成功！")
+            self.progress.emit(0, 100, 100)
+
+        except Exception as e:
+
+            e = str(e)
+            e = "\n".join([e[_ : _ + 75] for _ in range(0, len(e), 75)])
+            self.info.emit(f"解压更新时出错：\n{e}")
+            return None
+
+        # 更新version文件
+        with open(self.version_path, "r", encoding="utf-8") as f:
+            version_info = json.load(f)
+        if self.name == "AUTO_MAA更新器":
+            version_info["updater_version"] = ".".join(map(str, self.updater_version))
+        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)
+
+        # 主程序更新完成后打开AUTO_MAA
+        if self.name == "AUTO_MAA主程序":
+            subprocess.Popen(
+                str(self.app_path / "AUTO_MAA.exe"),
+                shell=True,
+                creationflags=subprocess.CREATE_NO_WINDOW,
+            )
+
+        self.accomplish.emit()
+
+    def get_download_url(self) -> list:
+        """获取下载链接"""
+
+        try_num = 3
+        for i in range(try_num):
+            try:
+                response = requests.get(
+                    "https://gitee.com/DLmaster_361/AUTO_MAA/raw/main/resources/version.json"
+                )
+                if response.status_code != 200:
+                    self.info.emit(
+                        f"连接失败，错误代码 {response.status_code} ，正在重试（{i+1}/{try_num}）"
+                    )
+                    time.sleep(0.1)
+                    continue
+                version_remote = response.json()
+                PROXY_list = version_remote["proxy_list"]
+                break
+            except requests.RequestException:
+                self.info.emit(f"请求超时，正在重试（{i+1}/{try_num}）")
+                time.sleep(0.1)
+            except KeyError:
+                self.info.emit(f"未找到远端代理网址项，正在重试（{i+1}/{try_num}）")
+                time.sleep(0.1)
+        else:
+            self.info.emit("获取远端代理信息失败，将使用默认代理地址")
+            PROXY_list = [
+                "",
+                "https://gitproxy.click/",
+                "https://cdn.moran233.xyz/",
+                "https://gh.llkk.cc/",
+                "https://github.akams.cn/",
+                "https://www.ghproxy.cn/",
+                "https://ghp.ci/",
+            ]
+            time.sleep(1)
+
+        url_list = []
+        if self.name == "AUTO_MAA主程序":
+            url_list.append(
+                f"https://gitee.com/DLmaster_361/AUTO_MAA/releases/download/{version_text(self.main_version)}/AUTO_MAA_{version_text(self.main_version)}.zip"
+            )
+            for i in range(len(PROXY_list)):
+                url_list.append(
+                    f"{PROXY_list[i]}https://github.com/DLmaster361/AUTO_MAA/releases/download/{version_text(self.main_version)}/AUTO_MAA_{version_text(self.main_version)}.zip"
+                )
+        elif self.name == "AUTO_MAA更新器":
+            url_list.append(
+                f"https://gitee.com/DLmaster_361/AUTO_MAA/releases/download/{version_text(self.main_version)}/Updater_{version_text(self.updater_version)}.zip"
+            )
+            for i in range(len(PROXY_list)):
+                url_list.append(
+                    f"{PROXY_list[i]}https://github.com/DLmaster361/AUTO_MAA/releases/download/{version_text(self.main_version)}/Updater_{version_text(self.updater_version)}.zip"
+                )
+        return url_list
+
+
+class Updater(QObject):
+
+    def __init__(
+        self, app_path: Path, name: str, main_version: list, updater_version: list
+    ) -> None:
+        super().__init__()
+
+        self.ui = QDialog()
+        self.ui.setWindowTitle("AUTO_MAA更新器")
+        self.ui.resize(700, 70)
+        self.ui.setWindowIcon(
+            QIcon(str(app_path / "resources/icons/AUTO_MAA_Updater.ico"))
+        )
+
+        # 创建垂直布局
+        self.Layout_v = QVBoxLayout(self.ui)
+
+        self.info = BodyLabel("正在初始化", self.ui)
+        self.Layout_v.addWidget(self.info)
+
+        self.progress = ProgressBar(self.ui)
+        self.progress.setRange(0, 0)
+        self.Layout_v.addWidget(self.progress)
+
+        self.update_process = UpdateProcess(
+            app_path, name, main_version, updater_version
+        )
+
+        self.update_process.info.connect(self.update_info)
+        self.update_process.progress.connect(self.update_progress)
+
+        self.update_process.start()
+
+    def update_info(self, text: str) -> None:
+        self.info.setText(text)
+
+    def update_progress(self, begin: int, end: int, current: int) -> None:
+        self.progress.setRange(begin, end)
+        self.progress.setValue(current)
+
+
+class AUTO_MAA_Updater(QApplication):
+    def __init__(
+        self, app_path: Path, name: str, main_version: list, updater_version: list
+    ) -> None:
+        super().__init__()
+
+        self.main = Updater(app_path, name, main_version, updater_version)
+        self.main.ui.show()
+
+
+if __name__ == "__main__":
+
+    # 获取软件自身的路径
+    app_path = Path.cwd()
+
+    # 从本地版本信息文件获取当前版本信息
+    if (app_path / "resources/version.json").exists():
+        with (app_path / "resources/version.json").open(
+            mode="r", encoding="utf-8"
+        ) as f:
+            version_current = json.load(f)
+        main_version_current = list(
+            map(int, version_current["main_version"].split("."))
+        )
+    else:
+        main_version_current = [0, 0, 0, 0]
+
+    # 从远程服务器获取最新版本信息
+    for _ in range(3):
+        try:
+            response = requests.get(
+                "https://gitee.com/DLmaster_361/AUTO_MAA/raw/main/resources/version.json"
+            )
+            version_remote = response.json()
+            main_version_remote = list(
+                map(int, version_remote["main_version"].split("."))
+            )
+            break
+        except Exception as e:
+            err = e
+            time.sleep(0.1)
+    else:
+        sys.exit(f"获取版本信息时出错：\n{err}")
+
+    # 启动更新线程
+    if main_version_remote > main_version_current:
+        app = AUTO_MAA_Updater(
+            app_path,
+            "AUTO_MAA主程序",
+            main_version_remote,
+            [],
+        )
+        sys.exit(app.exec())

app/utils/__init__.py

@@ -0,0 +1,35 @@
+#   <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
+"""
+
+__version__ = "4.2.0"
+__author__ = "DLmaster361 <DLmaster_361@163.com>"
+__license__ = "GPL-3.0 license"
+
+from .Updater import Updater
+from .version import version_text
+
+__all__ = ["Updater", "version_text"]

app/utils/package.py

@@ -0,0 +1,107 @@
+#   <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 os
+import json
+import shutil
+import subprocess
+from pathlib import Path
+
+from app import version_text
+
+
+if __name__ == "__main__":
+
+    root_path = Path.cwd()
+
+    with (root_path / "resources/version.json").open(mode="r", encoding="utf-8") as f:
+        version = json.load(f)
+
+    main_version_numb = list(map(int, version["main_version"].split(".")))
+    updater_version_numb = list(map(int, version["updater_version"].split(".")))
+
+    print("Packaging AUTO_MAA main program ...")
+
+    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"
+        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,
+    )
+
+    print(result.stdout)
+    print(result.stderr)
+    print("AUTO_MAA main program packaging completed !")
+
+    shutil.copy(root_path / "app/utils/Updater.py", root_path)
+
+    file_content = (root_path / "Updater.py").read_text(encoding="utf-8")
+
+    (root_path / "Updater.py").write_text(
+        file_content.replace(
+            "from .version import version_text", "from app import version_text"
+        ),
+        encoding="utf-8",
+    )
+
+    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"
+        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,
+    )
+
+    print(result.stdout)
+    print(result.stderr)
+    print("AUTO_MAA update program packaging completed !")
+
+    os.remove(root_path / "Updater.py")
+
+    (root_path / "version_info.txt").write_text(
+        f"{version_text(main_version_numb)}\n{version_text(updater_version_numb)}{version["announcement"]}",
+        encoding="utf-8",
+    )

app/utils/version.py

@@ -0,0 +1,38 @@
+#   <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
+"""
+
+
+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

main.py

@@ -0,0 +1,42 @@
+#   <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.QtWidgets import QApplication
+import sys
+
+from app import AppConfig, Notification, CryptoHandler, AUTO_MAA
+
+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())

requirements.txt

@@ -1,4 +1,9 @@
 plyer
 PySide6
+PySide6-Fluent-Widgets[full]
+psutil
+pywin32
+pyautogui
 pycryptodome
-pyinstaller
+requests
+nuitka

res/info.txt

@@ -1,43 +0,0 @@
-# UTF-8
-#
-VSVersionInfo(
-  ffi=FixedFileInfo(
-    # filevers and prodvers should be always a tuple with four items: (1, 2, 3, 4)
-    # Set not needed items to zero 0.
-    filevers=(4, 0, 0, 1),
-    prodvers=(0, 0, 0, 0),
-    # Contains a bitmask that specifies the valid bits 'flags'r
-    mask=0x3f,
-    # Contains a bitmask that specifies the Boolean attributes of the file.
-    flags=0x0,
-    # The operating system for which this file was designed.
-    # 0x4 - NT and there is no need to change it.
-    OS=0x4,
-    # The general type of file.
-    # 0x1 - the file is an application.
-    fileType=0x1,
-    # The function of the file.
-    # 0x0 - the function is not defined for this fileType
-    subtype=0x0,
-    # Creation date and time stamp.
-    date=(0, 0)
-    ),
-  kids=[
-    VarFileInfo([VarStruct('Translation', [0, 1200])]), 
-    StringFileInfo(
-      [
-      StringTable(
-        '000004b0',
-        [StringStruct('Comments', 'https://github.com/DLmaster361/AUTO_MAA/'),
-        StringStruct('CompanyName', 'AUTO_MAA Team'),
-        StringStruct('FileDescription', 'AUTO_MAA Component'),
-        StringStruct('FileVersion', '4.0.0.1'),
-        StringStruct('InternalName', 'AUTO_MAA'),
-        StringStruct('LegalCopyright', 'Copyright © 2024 DLmaster361'),
-        StringStruct('OriginalFilename', 'AUTO_MAA.py'),
-        StringStruct('ProductName', 'AUTO_MAA'),
-        StringStruct('ProductVersion', 'v4.0.0.1'),
-        StringStruct('Assembly Version', 'v4.0.0.1')])
-      ])
-  ]
-)

res/version.json

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

resources/docs/MAA_config_info.txt

@@ -1,6 +1,5 @@
 #主界面
-"MainFunction.ActionAfterCompleted": "ExitEmulatorAndSelf"        #完成后（旧）
+"MainFunction.PostActions": "12"        #完成后
-"MainFunction.PostActions": "12"        #完成后（新）
 "TaskQueue.WakeUp.IsChecked": "True"        #开始唤醒
 "TaskQueue.Recruiting.IsChecked": "True"        #自动公招
 "TaskQueue.Base.IsChecked": "True"      #基建换班
@@ -9,6 +8,8 @@
 "TaskQueue.Mall.IsChecked": "True"       #获取信用及购物
 "TaskQueue.AutoRoguelike.IsChecked": "False"        #自动肉鸽
 "TaskQueue.Reclamation.IsChecked": "False"      #生息演算
+"Start.RunDirectly": "True"        #启动MAA后直接运行
+"Start.OpenEmulatorAfterLaunch": "True"        #启动MAA后自动开启模拟器
 #刷理智
 "MainFunction.Stage1": ""        #主关卡
 "MainFunction.Stage2": ""        #备选关卡1
@@ -19,23 +20,26 @@
 "GUI.CustomStageCode": "False"        #手动输入关卡名
 "GUI.UseAlternateStage": "False"        #使用备选关卡
 "Fight.UseRemainingSanityStage": "True"        #使用剩余理智
+"GUI.AllowUseStoneSave": "False"        #允许吃源石保持状态
 "Fight.UseExpiringMedicine": "False"        #无限吃48小时内过期的理智药
 "GUI.HideUnavailableStage": "False"        #隐藏当日不开放关卡
+"GUI.HideSeries": "False"        #隐藏连战次数
 "Infrast.CustomInfrastPlanShowInFightSettings": "False"        #显示基建计划
 "Penguin.EnablePenguin": "True"        #上报企鹅物流
 "Yituliu.EnableYituliu": "True"        #上报一图流
 #基建换班
 "Infrast.CustomInfrastEnabled": "True"        #启用自定义基建配置
+"Infrast.CustomInfrastPlanIndex": "1"        #自定义基建配置索引
 "Infrast.DefaultInfrast": "user_defined"        #内置配置
 "Infrast.IsCustomInfrastFileReadOnly": "False"        #自定义基建配置文件只读
 "Infrast.CustomInfrastFile": ""        #自定义基建配置文件地址
 #设置
 "Start.ClientType": "Bilibili"、 "Official"        #服务器
-"Timer.Timer1": "False"        #时间设置1
+G"Timer.Timer1": "False"        #时间设置1
-"VersionUpdate.ScheduledUpdateCheck": "True"        #定时检查更新
+G"VersionUpdate.ScheduledUpdateCheck": "True"        #定时检查更新
-"VersionUpdate.AutoDownloadUpdatePackage": "True"        #自动下载更新包
+G"VersionUpdate.AutoDownloadUpdatePackage": "True"        #自动下载更新包
-"VersionUpdate.AutoInstallUpdatePackage": "True"        #自动安装更新包
+G"VersionUpdate.AutoInstallUpdatePackage": "True"        #自动安装更新包
-"Start.RunDirectly": "True"        #启动MAA后直接运行
+G"Start.MinimizeDirectly": "True"        #启动MAA后直接最小化
-"Start.MinimizeDirectly": "True"        #启动MAA后直接最小化
+G"GUI.UseTray": "True"        #显示托盘图标
-"Start.StartEmulator": "True"        #启动MAA后自动开启模拟器
+G"GUI.MinimizeToTray": "False"        #最小化时隐藏至托盘
-"Start.MinimizingStartup": "True"        #最小化启动模拟器
+"Start.EmulatorPath"        #模拟器路径

resources/version.json

@@ -0,0 +1,14 @@
+{
+    "main_version": "4.2.1.0",
+    "updater_version": "1.1.0.0",
+    "announcement": "\n## 新增功能\n- 无\n## 修复BUG\n- 同步MAA`v5.11.1-beta.1`的字段修改\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/"
+    ]
+}

更新说明.txt

@@ -1,20 +0,0 @@
-v4.0_beta
-## 新增功能
-- 服务器切换功能上线，支持B服 #7
-- 用户高级配置功能上线，支持用户修改几乎所有MAA配置
-## 修复BUG
-- 修复无用户进行代理时的逻辑错误
-## 程序优化
-- 进一步优化MAA配置流程
-- 优化自定义基建配置方法 #7
-- 无命令行窗口中止MAA进程
-- `gameid.txt`改由主程序进行初始化
-- log获取部分集成为1个函数
-- 消除部分if嵌套
-## 更新说明
-- 项目初始阶段，不会提供专门的版本更新程序，您需要手动更新程序。
-- v2.1.5及以前的用户，由于新版本采用全新的架构，您需要手动输入之前的信息。
-- v3.0_Beta版用户，直接用`AUTO_MAA.exe`替代`gui.exe`后，将原文件夹下的`gui文件夹`用新版本对应文件替换，重新设置每个用户的`自定义基建`选项（输入`-`以关闭该功能，输入自定义基建配置文件地址以开启该功能）。
-- v3.1~v3.1.3_beta版用户，直接用新版本文件替换旧版本即可。
-- 老用户请务必备份原有数据，在更新前确保所填MAA路径有效且已存在MAA配置文件，此次更新的代码改动较大，可能有数据遗失的风险。
-- 新用户请忽略本说明。