automas_admin/AUTO-MAS-test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(models): 适配MAAv5.16.3的ADB报错信息更改

Browse Source
This commit is contained in:
DLmaster361
2025-05-11 23:26:42 +08:00
parent d1f4cffe8f
commit 2177c1b40e
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
.github/workflows/build-app.yml vendored
View File

@@ -73,8 +73,6 @@ jobs:
run: | run: |
$MAIN_VERSION=(Get-Content -Path "version_info.txt" -TotalCount 1).Trim() $MAIN_VERSION=(Get-Content -Path "version_info.txt" -TotalCount 1).Trim()
"AUTO_MAA_version=$MAIN_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: Upload Artifact - name: Upload Artifact
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
@@ -111,8 +109,11 @@ jobs:
NAME="$(sed 's/\r$//g' <(head -n 1 version_info.txt))" NAME="$(sed 's/\r$//g' <(head -n 1 version_info.txt))"
TAGNAME="$(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_MAIN="$(sed 's/\r$//g' <(tail -n +3 version_info.txt))"
NOTES_TAIL="\`\`\`本release通过GitHub Actions自动构建\`\`\`" NOTES="$NOTES_MAIN
NOTES="$NOTES_MAIN<br><br>$NOTES_TAIL"
[已有 Mirror酱 CDK ？前往 Mirror酱 高速下载](https://mirrorchyan.com/zh/projects?rid=AUTO_MAA)
\`\`\`本release通过GitHub Actions自动构建\`\`\`"
if [ "${{ github.ref_name }}" == "main" ]; then if [ "${{ github.ref_name }}" == "main" ]; then
PRERELEASE_FLAG="" PRERELEASE_FLAG=""
else else

4
app/models/MAA.py
View File

@@ -965,7 +965,7 @@ class MaaManager(QObject):
else: else:
self.maa_result = "MAA部分任务执行失败" self.maa_result = "MAA部分任务执行失败"
elif "请「检查连接设置」或「尝试重启模拟器与 ADB」或「重启电脑」" in log: elif "请 ｢检查连接设置｣ → ｢尝试重启模拟器与 ADB｣ → ｢重启电脑｣" in log:
self.maa_result = "MAA的ADB连接异常" self.maa_result = "MAA的ADB连接异常"
elif "未检测到任何模拟器" in log: elif "未检测到任何模拟器" in log:
@@ -991,7 +991,7 @@ class MaaManager(QObject):
elif mode == "人工排查": elif mode == "人工排查":
if "完成任务: StartUp" in log: if "完成任务: StartUp" in log:
self.maa_result = "Success!" self.maa_result = "Success!"
elif "请「检查连接设置」或「尝试重启模拟器与 ADB」或「重启电脑」" in log: elif "请 ｢检查连接设置｣ → ｢尝试重启模拟器与 ADB｣ → ｢重启电脑｣" in log:
self.maa_result = "MAA的ADB连接异常" self.maa_result = "MAA的ADB连接异常"
elif "未检测到任何模拟器" in log: elif "未检测到任何模拟器" in log:
self.maa_result = "MAA未检测到任何模拟器" self.maa_result = "MAA未检测到任何模拟器"

4
resources/version.json
View File

@@ -1,6 +1,5 @@
{ {
"main_version": "4.3.8.1", "main_version": "4.3.8.1",
"updater_version": "1.0.0.0",
"version_info": { "version_info": {
"4.3.8.1": { "4.3.8.1": {
"新增功能": [ "新增功能": [
@@ -8,7 +7,8 @@
"主调度台添加仅一次电源任务" "主调度台添加仅一次电源任务"
], ],
"修复bug": [ "修复bug": [
"电源相关选项改为所有任务完成后生效" "电源相关选项改为所有任务完成后生效",
"适配MAAv5.16.3的ADB报错信息更改"
], ],
"程序优化": [ "程序优化": [
"UI样式优化，进一步适配win10主题" "UI样式优化，进一步适配win10主题"