fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-19 02:23:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: 在连接前提示替换adb

Browse Source
This commit is contained in:
uye
2023-06-22 13:47:57 +08:00
parent ceef0dd70d
commit ad9e9e505d
5 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/MaaWpfGui/Res/Localizations/en-us.xaml
View File

@@ -330,7 +330,7 @@ At the end of the level, enter "Normal/Hard" to switch between Standard and Adve
<system:String x:Key="ConnectingToEmulator">Connecting to emulator...</system:String>
<system:String x:Key="UnselectedTask">Unselected task</system:String>
<system:String x:Key="Running">Running...</system:String>
<system:String x:Key="AdbReplacementTips">If nothing happens or it gets stuck, please go to Settings → Connection → ADB path and change the ADB.exe, or turn on Compatibility Touch Mode (not recommended).</system:String>
<system:String x:Key="AdbReplacementTips">If nothing happens or it gets stuck, please go to Settings → Connection → ADB path and change the ADB.exe, or turn on ADB Input (Deprecated).</system:String>
<system:String x:Key="Stopping">Stopping...</system:String>
<system:String x:Key="Stopped">Has stopped</system:String>
<system:String x:Key="UnknownErrorOccurs">Unknown error occurred</system:String>
@@ -579,4 +579,4 @@ The video aspect ratio needs to be 16:9 without interference factors such as bla
<system:String x:Key="ConfirmExitTitle">MAA is running tasks</system:String>
<system:String x:Key="ConfirmExitText">Are you sure want to exit?</system:String>
<!-- RootViewModel -->
</ResourceDictionary>
</ResourceDictionary>

4
src/MaaWpfGui/Res/Localizations/zh-cn.xaml
View File

@@ -330,7 +330,7 @@
<system:String x:Key="ConnectingToEmulator">正在连接模拟器……</system:String>
<system:String x:Key="UnselectedTask">未选择任务</system:String>
<system:String x:Key="Running">正在运行中……</system:String>
<system:String x:Key="AdbReplacementTips">如果任务完全没有反应，请使用 设置 - 连接设置 - 强制替换 ADB，或打开 兼容性触控模式（不推荐）。</system:String>
<system:String x:Key="AdbReplacementTips">如果任务完全没有反应，请使用 设置 - 连接设置 - 强制替换 ADB，或触控模式选择 ADB Input（不推荐）。</system:String>
<system:String x:Key="Stopping">正在停止……</system:String>
<system:String x:Key="Stopped">已停止</system:String>
<system:String x:Key="UnknownErrorOccurs">出现未知错误</system:String>
@@ -579,4 +579,4 @@
<system:String x:Key="ConfirmExitTitle">MAA 正在运行任务</system:String>
<system:String x:Key="ConfirmExitText">确定要退出吗？</system:String>
<!-- RootViewModel -->
</ResourceDictionary>
</ResourceDictionary>

2
src/MaaWpfGui/Res/Localizations/zh-tw.xaml
View File

@@ -325,7 +325,7 @@
<system:String x:Key="ConnectingToEmulator">正在連接模擬器……</system:String>
<system:String x:Key="UnselectedTask">未選擇任務</system:String>
<system:String x:Key="Running">正在運行中……</system:String>
<system:String x:Key="AdbReplacementTips">如果任務完全沒有反應，請使用 設定 - 連接設定 - 強制替換 ADB，或打開 兼容性觸控模式（不推薦）。</system:String>
<system:String x:Key="AdbReplacementTips">如果任務完全沒有反應，請使用 設定 - 連接設定 - 強制替換 ADB，或觸控模式選擇 ADB Input（不推薦）。</system:String>
<system:String x:Key="Stopping">正在停止……</system:String>
<system:String x:Key="Stopped">已停止</system:String>
<system:String x:Key="UnknownErrorOccurs">出現未知錯誤</system:String>

8
src/MaaWpfGui/ViewModels/UI/CopilotViewModel.cs
View File

@@ -463,6 +463,10 @@ namespace MaaWpfGui.ViewModels.UI
}
AddLog(LocalizationHelper.GetString("ConnectingToEmulator"));
if (!Instances.SettingsViewModel.AdbReplaced && !Instances.SettingsViewModel.IsAdbTouchMode())
{
AddLog(LocalizationHelper.GetString("AdbReplacementTips"), UiLogColor.Info);
}
string errMsg = string.Empty;
_caught = await Task.Run(() => Instances.AsstProxy.AsstConnect(ref errMsg));
@@ -482,10 +486,6 @@ namespace MaaWpfGui.ViewModels.UI
if (ret)
{
AddLog(LocalizationHelper.GetString("Running"));
if (!Instances.SettingsViewModel.AdbReplaced && !Instances.SettingsViewModel.IsAdbTouchMode())
{
AddLog(LocalizationHelper.GetString("AdbReplacementTips"), UiLogColor.Info);
}
}
else
{

10
src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs
View File

@@ -681,6 +681,10 @@ namespace MaaWpfGui.ViewModels.UI
await Task.Run(() => Instances.SettingsViewModel.RunScript("StartsWithScript"));
AddLog(LocalizationHelper.GetString("ConnectingToEmulator"));
if (!Instances.SettingsViewModel.AdbReplaced && !Instances.SettingsViewModel.IsAdbTouchMode())
{
AddLog(LocalizationHelper.GetString("AdbReplacementTips"), UiLogColor.Info);
}
string errMsg = string.Empty;
bool connected = await Task.Run(() => Instances.AsstProxy.AsstConnect(ref errMsg));
@@ -692,6 +696,7 @@ namespace MaaWpfGui.ViewModels.UI
return;
}
// 尝试启动模拟器
if (!connected)
{
AddLog(LocalizationHelper.GetString("ConnectFailed") + "\n" + LocalizationHelper.GetString("TryToStartEmulator"));
@@ -706,6 +711,7 @@ namespace MaaWpfGui.ViewModels.UI
connected = await Task.Run(() => Instances.AsstProxy.AsstConnect(ref errMsg));
}
// 尝试重启adb
if (!connected)
{
AddLog(LocalizationHelper.GetString("ConnectFailed") + "\n" + LocalizationHelper.GetString("RestartADB"));
@@ -807,10 +813,6 @@ namespace MaaWpfGui.ViewModels.UI
if (taskRet)
{
AddLog(LocalizationHelper.GetString("Running"));
if (!Instances.SettingsViewModel.AdbReplaced && !Instances.SettingsViewModel.IsAdbTouchMode())
{
AddLog(LocalizationHelper.GetString("AdbReplacementTips"), UiLogColor.Info);
}
}
else
{