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

fix: 修复任务出错日志可能晚于任务完成日志显示的问题

Browse Source
This commit is contained in:
uye
2026-02-09 22:43:14 +08:00
parent 8d983f2c8c
commit cab1d602c9
3 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/MaaWpfGui/Helper/ToolTipHelper.cs
View File

@@ -85,7 +85,7 @@ public static class ToolTipHelper
/// <param name="width">图片宽度，默认 640</param>
/// <param name="height">图片高度，默认 360</param>
/// <returns>ToolTip</returns>
public static ToolTip CreateTooltip(this BitmapImage image, PlacementMode? placementMode = null, double width = 640, double height = 360)
public static ToolTip CreateTooltip(this BitmapSource image, PlacementMode? placementMode = null, double width = 640, double height = 360)
{
var img = new Image
{

7
src/MaaWpfGui/Main/AsstProxy.cs
View File

@@ -1037,12 +1037,7 @@ public class AsstProxy
_tasksStatus.TryGetValue(taskId, out var value);
var log = LocalizationHelper.GetString("TaskError") + LocalizationHelper.GetString(taskChain);
Task.Run(async () => {
var screenshot = await AsstGetImageAsync();
Execute.OnUIThread(() => {
Instances.TaskQueueViewModel.AddLog(log, UiLogColor.Error, toolTip: screenshot?.CreateTooltip(), updateCardImage: true, fetchLatestImage: true);
});
});
Instances.TaskQueueViewModel.AddLog(log, UiLogColor.Error, updateCardImage: true, fetchLatestImage: true, useCardImageAsToolTip: true);
ToastNotification.ShowDirect(log);
if (SettingsViewModel.ExternalNotificationSettings.ExternalNotificationSendWhenError)

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

@@ -300,7 +300,7 @@ public class TaskQueueViewModel : Screen
private static int MaxLogItemsWithThumbnails => SettingsViewModel.GuiSettings.MaxNumberOfLogThumbnails;
private async Task AttachThumbnailToCardAsync(LogCardItemViewModel card, bool forceScreencap)
private async Task AttachThumbnailToCardAsync(LogCardItemViewModel card, bool forceScreencap, bool setToolTipOnLastLogItem = false)
{
if (card is null)
{
@@ -324,6 +324,13 @@ public class TaskQueueViewModel : Screen
}
card.Thumbnail = thumbnail;
TrimOldThumbnails();
// 若需要将当前 Card 图片作为 ToolTip，在缩略图挂载完成后设置最后一条日志的 ToolTip
if (setToolTipOnLastLogItem && card.Items.Count > 0)
{
var lastLogItem = card.Items[^1];
lastLogItem.ToolTip = thumbnail?.CreateTooltip();
}
});
}
catch
@@ -1125,8 +1132,16 @@ public class TaskQueueViewModel : Screen
/// <param name="toolTip">The toolTip</param>
/// <param name="updateCardImage">Whether to update the containing card's image/thumbnail.</param>
/// <param name="fetchLatestImage">Whether to force fetching a fresh screenshot instead of using cache.</param>
/// <param name="useCardImageAsToolTip">Whether to use the current card's image as toolTip.</param>
/// <param name="splitMode">Whether to split cards before/after this log.</param>
public void AddLog(string? content, string color = UiLogColor.Trace, string weight = "Regular", ToolTip? toolTip = null, bool updateCardImage = false, bool fetchLatestImage = false, LogCardSplitMode splitMode = LogCardSplitMode.None)
public void AddLog(string? content,
string color = UiLogColor.Trace,
string weight = "Regular",
ToolTip? toolTip = null,
bool updateCardImage = false,
bool fetchLatestImage = false,
bool useCardImageAsToolTip = false,
LogCardSplitMode splitMode = LogCardSplitMode.None)
{
bool isEmpty = string.IsNullOrEmpty(content);
bool needsBeforeSplit = splitMode == LogCardSplitMode.Before || splitMode == LogCardSplitMode.Both;
@@ -1146,7 +1161,6 @@ public class TaskQueueViewModel : Screen
if (LogCardViewModels.Count > 0)
{
// 如果有内容，添加到卡片
if (!isEmpty)
{
TryMergeIntoLastCard(content!, color, weight, toolTip);
@@ -1154,7 +1168,7 @@ public class TaskQueueViewModel : Screen
if (updateCardImage)
{
_ = AttachThumbnailToCardAsync(LogCardViewModels[^1], fetchLatestImage);
_ = AttachThumbnailToCardAsync(LogCardViewModels[^1], fetchLatestImage, setToolTipOnLastLogItem: useCardImageAsToolTip);
}
}