From a8a03d7e735a7001735c27e43cdeb1536c9d8a1c Mon Sep 17 00:00:00 2001 From: MistEO Date: Wed, 23 Nov 2022 22:37:22 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E8=A7=A6=E6=8E=A7=E7=9B=B8=E5=85=B3=E7=9A=84=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MeoAsstGui/Resources/Localizations/en-us.xaml | 1 + src/MeoAsstGui/Resources/Localizations/zh-cn.xaml | 1 + src/MeoAsstGui/ViewModels/SettingsViewModel.cs | 3 +++ src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs | 5 +++++ 4 files changed, 10 insertions(+) diff --git a/src/MeoAsstGui/Resources/Localizations/en-us.xaml b/src/MeoAsstGui/Resources/Localizations/en-us.xaml index 609b6ab0c2..99800e578e 100644 --- a/src/MeoAsstGui/Resources/Localizations/en-us.xaml +++ b/src/MeoAsstGui/Resources/Localizations/en-us.xaml @@ -297,6 +297,7 @@ Connecting to emulator... Unselected task Running... + If all stuck, plz go to Settings - Connection Settings - Forced Replace ADB File, or turn on Compatibility Touch Mode Stopping... Has stopped Unknown error occurred diff --git a/src/MeoAsstGui/Resources/Localizations/zh-cn.xaml b/src/MeoAsstGui/Resources/Localizations/zh-cn.xaml index 68a323b8cb..26d59fc0f7 100644 --- a/src/MeoAsstGui/Resources/Localizations/zh-cn.xaml +++ b/src/MeoAsstGui/Resources/Localizations/zh-cn.xaml @@ -298,6 +298,7 @@ 正在连接模拟器…… 未选择任务 正在运行中…… + 如果任务完全没有反应,请使用 设置 - 连接设置 - 强制替换 ADB,或打开 兼容性触控模式 正在停止…… 已停止 出现未知错误 diff --git a/src/MeoAsstGui/ViewModels/SettingsViewModel.cs b/src/MeoAsstGui/ViewModels/SettingsViewModel.cs index 8423cbef31..8317eb2c09 100644 --- a/src/MeoAsstGui/ViewModels/SettingsViewModel.cs +++ b/src/MeoAsstGui/ViewModels/SettingsViewModel.cs @@ -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())); + /* 界面设置 */ /// diff --git a/src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs b/src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs index 76827ebcb7..715fb494ca 100644 --- a/src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs +++ b/src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs @@ -742,6 +742,11 @@ namespace MeoAsstGui if (ret) { AddLog(Localization.GetString("Running")); + var settingsModel = _container.Get(); + if (!settingsModel.AdbReplaced && !settingsModel.UseAdbTouchMode) + { + AddLog(Localization.GetString("AdbReplacementTips"), UILogColor.Info); + } } else {