fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-15 17:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

perf: 调整 小工具-便捷任务 布局，调整日志输出

Browse Source
This commit is contained in:
uye
2026-05-13 23:56:58 +08:00
parent 3432050ff4
commit 2aa92b0c1d
3 changed files with 15 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1254,7 +1254,7 @@ public class TaskQueueViewModel : Screen
/// <summary>
/// Clears log.
/// </summary>
private void ClearLog()
public void ClearLog()
{
Execute.OnUIThread(() => {
LogItemViewModels.Clear();

36
src/MaaWpfGui/ViewModels/UI/ToolboxViewModel.cs
View File

@@ -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<MiniGameLogItem> 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;
}

23
src/MaaWpfGui/Views/UI/ToolboxView.xaml
View File

@@ -831,8 +831,8 @@
<TabItem Header="{DynamicResource MiniGame}">
<Grid Margin="20,0,20,20">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="200" />
<ColumnDefinition Width="300" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Grid Grid.Column="0" Margin="10">
@@ -849,6 +849,8 @@
</Grid.Resources>
<Border
Grid.Row="0"
Width="210"
MaxWidth="210"
Background="{DynamicResource RegionBrushOpacity25}"
BorderBrush="{DynamicResource BorderBrush}"
BorderThickness="1"
@@ -865,7 +867,6 @@
<ListBox.ItemTemplate>
<DataTemplate>
<TextBlock
Margin="5,0"
Text="{Binding Display}"
TextTrimming="CharacterEllipsis" />
</DataTemplate>
@@ -875,7 +876,7 @@
<GroupStyle.HeaderTemplate>
<DataTemplate>
<Border
Padding="8,4"
Padding="0,4"
Background="{DynamicResource RegionBrushOpacity50}"
BorderBrush="{DynamicResource BorderBrush}"
BorderThickness="0,0,0,1">
@@ -889,18 +890,17 @@
</Border>
<Button
Grid.Row="1"
Width="160"
Height="60"
Margin="0,20,0,0"
Width="100"
Height="50"
Margin="0,10,0,0"
HorizontalAlignment="Center"
Command="{s:Action StartMiniGame}"
Content="{c:Binding 'Idle ? &quot;Link Start!&quot; : &quot;Stop!&quot;'}"
IsEnabled="{c:Binding 'Inited and !Stopping'}" />
</Grid>
<Grid Grid.Column="1" Margin="50,50,30,10" IsEnabled="{Binding Idle}" VerticalAlignment="Top">
<Grid Grid.Column="1" Margin="10" IsEnabled="{Binding Idle}" VerticalAlignment="Top">
<Grid Visibility="{c:Binding 'SelectedMiniGameItem != null'}">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
@@ -924,8 +924,9 @@
SelectedValuePath="Value" />
</Grid>
<controls:TextBlock
VerticalAlignment="Top"
Grid.Row="1"
Margin="10,0,10,10"
Margin="10"
Text="{Binding MiniGameTip}"
TextWrapping="Wrap" />
</Grid>
@@ -950,7 +951,7 @@
<ItemsControl
HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"
ItemsSource="{Binding MiniGameLogs}">
ItemsSource="{Binding LogItemViewModels, Source={x:Static helper:Instances.TaskQueueViewModel}}">
<ItemsControl.ItemTemplate>
<DataTemplate>
<Grid>