From ff3b7cc0811732b659fc5df2910f8bece258f8bb Mon Sep 17 00:00:00 2001 From: uye <2396806385@qq.com> Date: Sun, 23 Apr 2023 19:39:46 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=89=A7=E8=A1=8C=E8=AF=86=E5=88=AB?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=97=B6=E5=B1=8F=E8=94=BD=E8=AF=86=E5=88=AB?= =?UTF-8?q?=E6=8C=89=E9=92=AE=EF=BC=8C=E9=81=BF=E5=85=8D=E4=BA=8C=E6=AC=A1?= =?UTF-8?q?=E5=BC=80=E5=A7=8B=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ViewModels/UI/RecognizerViewModel.cs | 15 ++++++++++++++- src/MaaWpfGui/Views/UI/RecognizerView.xaml | 9 ++++++--- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/src/MaaWpfGui/ViewModels/UI/RecognizerViewModel.cs b/src/MaaWpfGui/ViewModels/UI/RecognizerViewModel.cs index 3b60ec92cf..f57632527a 100644 --- a/src/MaaWpfGui/ViewModels/UI/RecognizerViewModel.cs +++ b/src/MaaWpfGui/ViewModels/UI/RecognizerViewModel.cs @@ -298,7 +298,7 @@ namespace MaaWpfGui.ViewModels.UI return true; } - private bool _depotDone = false; + private bool _depotDone = true; /// /// Gets or sets a value indicating whether depot info is parsed. @@ -393,6 +393,17 @@ namespace MaaWpfGui.ViewModels.UI set => SetAndNotify(ref _operBoxResult, value); } + private bool _operBoxDone = true; + + /// + /// Gets or sets a value indicating whether operBox info is parsed. + /// + public bool OperBoxDone + { + get => _operBoxDone; + set => SetAndNotify(ref _operBoxDone, value); + } + private string _operBoxExportData = string.Empty; public bool OperBoxParse(JObject details) @@ -450,6 +461,7 @@ namespace MaaWpfGui.ViewModels.UI OperBoxInfo = LocalizationHelper.GetString("IdentificationCompleted") + "\n" + LocalizationHelper.GetString("OperBoxRecognitionTip"); OperBoxResult = string.Format(LocalizationHelper.GetString("OperBoxRecognitionResult"), operNotHave.Count, operNotHaveNames, operHave.Count, operHaveNames); _operBoxExportData = details["own_opers"].ToString(); + OperBoxDone = true; } else { @@ -462,6 +474,7 @@ namespace MaaWpfGui.ViewModels.UI public async void StartOperBox() { _operBoxExportData = string.Empty; + OperBoxDone = false; string errMsg = string.Empty; OperBoxInfo = LocalizationHelper.GetString("ConnectingToEmulator"); diff --git a/src/MaaWpfGui/Views/UI/RecognizerView.xaml b/src/MaaWpfGui/Views/UI/RecognizerView.xaml index 4823e8a752..639fb29963 100644 --- a/src/MaaWpfGui/Views/UI/RecognizerView.xaml +++ b/src/MaaWpfGui/Views/UI/RecognizerView.xaml @@ -170,7 +170,8 @@ HorizontalAlignment="Center" VerticalAlignment="Center" Command="{s:Action StartDepot}" - Content="{DynamicResource StartToDepotRecognition}" /> + Content="{DynamicResource StartToDepotRecognition}" + IsEnabled="{Binding DepotDone}" /> @@ -215,13 +216,15 @@ Height="70" Margin="30" Command="{s:Action ExportOperBox}" - Content="{DynamicResource OperBoxCopyToClipboard}" /> + Content="{DynamicResource OperBoxCopyToClipboard}" + IsEnabled="{Binding OperBoxDone}" />