fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-20 02:55:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

perf: InvokeAsync 前判断是否已经在 ui 线程

Browse Source
This commit is contained in:
uye
2024-09-28 00:09:28 +08:00
parent f88c90aa0c
commit 4ab1e3704b
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -218,7 +218,7 @@ namespace MaaWpfGui.ViewModels.UI
_logger.Information("Shutdown in 70 seconds.");
Process.Start("shutdown.exe", "-s -t 70");
Instances.MainWindowManager?.Show();
await Execute.OnUIThreadAsync(() => Instances.MainWindowManager?.Show());
if (await TimerCanceledAsync(
LocalizationHelper.GetString("Shutdown"),
LocalizationHelper.GetString("AboutToShutdown"),
@@ -513,7 +513,7 @@ namespace MaaWpfGui.ViewModels.UI
if (Instances.SettingsViewModel.ShowWindowBeforeForceScheduledStart)
{
await Application.Current.Dispatcher.InvokeAsync(() => Instances.MainWindowManager?.Show());
await Execute.OnUIThreadAsync(() => Instances.MainWindowManager?.Show());
}
if (await TimerCanceledAsync(
@@ -546,9 +546,16 @@ namespace MaaWpfGui.ViewModels.UI
private static async Task<bool> TimerCanceledAsync(string content = "", string tipContent = "", string buttonContent = "", int seconds = 10)
{
var canceled = false;
await await Application.Current.Dispatcher.InvokeAsync(async () =>
if (Application.Current.Dispatcher.CheckAccess())
{
return await ShowDialogAsync();
}
return await await Application.Current.Dispatcher.InvokeAsync(ShowDialogAsync);
async Task<bool> ShowDialogAsync()
{
var canceled = false;
var delay = TimeSpan.FromSeconds(seconds);
var dialogUserControl = new Views.UserControl.TextDialogWithTimerUserControl(
content,
@@ -566,9 +573,8 @@ namespace MaaWpfGui.ViewModels.UI
await Task.WhenAny(Task.Delay(delay), tcs.Task);
dialog.Close();
_logger.Information($"Timer canceled: {canceled}");
});
return canceled;
return canceled;
}
}
/// <summary>