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

feat: 新增一些触控相关的界面提示

Browse Source
This commit is contained in:
MistEO
2022-11-23 22:37:22 +08:00
parent 0f8140753c
commit a8a03d7e73
4 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/MeoAsstGui/Resources/Localizations/en-us.xaml
View File

@@ -297,6 +297,7 @@
<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 all stuck, plz go to Settings - Connection Settings - Forced Replace ADB File, or turn on Compatibility Touch Mode</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>

1
src/MeoAsstGui/Resources/Localizations/zh-cn.xaml
View File

@@ -298,6 +298,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="Stopping">正在停止……</system:String>
<system:String x:Key="Stopped">已停止</system:String>
<system:String x:Key="UnknownErrorOccurs">出现未知错误</system:String>

3
src/MeoAsstGui/ViewModels/SettingsViewModel.cs
View File

@@ -1917,6 +1917,7 @@ namespace MeoAsstGui
});
await procTask;
ViewStatusStorage.Set("Connect.AdbReplaced", true.ToString());
Execute.OnUIThread(() =>
{
using (var toast = new ToastNotification(Localization.GetString("SuccessfullyReplacedADB")))
@@ -1926,6 +1927,8 @@ namespace MeoAsstGui
});
}
public bool AdbReplaced { get; set; } = Convert.ToBoolean(ViewStatusStorage.Get("Connect.AdbReplaced", false.ToString()));
/* 界面设置 */
/// <summary>

5
src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs
View File

@@ -742,6 +742,11 @@ namespace MeoAsstGui
if (ret)
{
AddLog(Localization.GetString("Running"));
var settingsModel = _container.Get<SettingsViewModel>();
if (!settingsModel.AdbReplaced && !settingsModel.UseAdbTouchMode)
{
AddLog(Localization.GetString("AdbReplacementTips"), UILogColor.Info);
}
}
else
{