diff --git a/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs b/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs
index 24b1343b0f..2d1892b1e6 100644
--- a/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs
+++ b/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs
@@ -1254,7 +1254,7 @@ public class TaskQueueViewModel : Screen
///
/// Clears log.
///
- private void ClearLog()
+ public void ClearLog()
{
Execute.OnUIThread(() => {
LogItemViewModels.Clear();
diff --git a/src/MaaWpfGui/ViewModels/UI/ToolboxViewModel.cs b/src/MaaWpfGui/ViewModels/UI/ToolboxViewModel.cs
index 5e0852ebd0..4d1f3adc9d 100644
--- a/src/MaaWpfGui/ViewModels/UI/ToolboxViewModel.cs
+++ b/src/MaaWpfGui/ViewModels/UI/ToolboxViewModel.cs
@@ -20,7 +20,6 @@ using System.Collections.Specialized;
using System.Globalization;
using System.IO;
using System.Linq;
-using System.Text;
using System.Threading;
using System.Threading.Tasks;
using System.Windows;
@@ -2104,7 +2103,6 @@ public class ToolboxViewModel : Screen
}
MiniGameTaskName = value.Value;
- ClearMiniGameLogs();
}
}
@@ -2263,35 +2261,6 @@ public class ToolboxViewModel : Screen
}
}
- public class MiniGameLogItem : PropertyChangedBase
- {
- public string Time { get; set; } = string.Empty;
-
- public string Content { get; set; } = string.Empty;
-
- public string Color { get; set; } = UiLogColor.Info;
- }
-
- public ObservableCollection MiniGameLogs { get; } = [];
-
- public void AddMiniGameLog(string content, string color = UiLogColor.Info)
- {
- Execute.OnUIThread(() =>
- {
- MiniGameLogs.Add(new MiniGameLogItem
- {
- Time = DateTime.Now.ToString("HH:mm:ss"),
- Content = content,
- Color = color,
- });
- });
- }
-
- public void ClearMiniGameLogs()
- {
- Execute.OnUIThread(() => MiniGameLogs.Clear());
- }
-
public void StartMiniGame()
{
_ = StartMiniGameAsync();
@@ -2305,15 +2274,14 @@ public class ToolboxViewModel : Screen
return;
}
+ Instances.TaskQueueViewModel.ClearLog();
+
_runningState.SetIdle(false);
- ClearMiniGameLogs();
- AddMiniGameLog(LocalizationHelper.GetString("ConnectingToEmulator"), UiLogColor.Message);
string errMsg = string.Empty;
bool caught = await Task.Run(() => Instances.AsstProxy.AsstConnect(ref errMsg));
if (!caught)
{
- AddMiniGameLog(errMsg, UiLogColor.Error);
_runningState.SetIdle(true);
return;
}
diff --git a/src/MaaWpfGui/Views/UI/ToolboxView.xaml b/src/MaaWpfGui/Views/UI/ToolboxView.xaml
index a01ba72752..d9bf7f21da 100644
--- a/src/MaaWpfGui/Views/UI/ToolboxView.xaml
+++ b/src/MaaWpfGui/Views/UI/ToolboxView.xaml
@@ -831,8 +831,8 @@
-
-
+
+
@@ -849,6 +849,8 @@
@@ -875,7 +876,7 @@
@@ -889,18 +890,17 @@
-
+
-
@@ -924,8 +924,9 @@
SelectedValuePath="Value" />
@@ -950,7 +951,7 @@
+ ItemsSource="{Binding LogItemViewModels, Source={x:Static helper:Instances.TaskQueueViewModel}}">