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

perf: 修改多余的操作

Browse Source
This commit is contained in:
枫雨
2023-01-05 11:42:42 +08:00
parent bd1f03e468
commit 435b00a5df
2 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/MaaWpfGui/Helper/LogItemViewModel.cs
View File

@@ -27,11 +27,9 @@ namespace MaaWpfGui
/// <param name="content">The content.</param>
/// <param name="color">The font color.</param>
/// <param name="weight">The font weight.</param>
/// <param name="timeColumnContent">The content in time column.</param>
public LogItemViewModel(string content, string color = UILogColor.Message, string weight = "Regular", string timeColumnContent = null)
public LogItemViewModel(string content, string color = UILogColor.Message, string weight = "Regular")
{
Time = DateTime.Now.ToString("MM'-'dd' 'HH':'mm':'ss");
Time = string.IsNullOrWhiteSpace(timeColumnContent) ? Time : string.Concat(Time, "\n", timeColumnContent);
Content = content;
Color = color;
Weight = weight;

28
src/MaaWpfGui/Main/VersionUpdateViewModel.cs
View File

@@ -708,7 +708,7 @@ namespace MaaWpfGui
private bool DownloadGithubAssets(string url, JObject assetsObject,
Downloader downloader = Downloader.Native, string saveTo = null)
{
_taskQueueViewModel = _container.Get<TaskQueueViewModel>();
_logItemViewModels = _container.Get<TaskQueueViewModel>().LogItemViewModels;
return DownloadFile(
url: url,
fileName: assetsObject["name"].ToString(), contentType:
@@ -879,7 +879,7 @@ namespace MaaWpfGui
return downloaded;
}
private static TaskQueueViewModel _taskQueueViewModel = null;
private static System.Collections.ObjectModel.ObservableCollection<LogItemViewModel> _logItemViewModels = null;
private static void OutputDownloadProgress(long value = 0, long maximum = 1, int len = 0, double ts = 1)
{
@@ -893,25 +893,29 @@ namespace MaaWpfGui
private static void OutputDownloadProgress(string output, bool downloading = true)
{
if (_taskQueueViewModel == null)
if (_logItemViewModels == null)
{
return;
}
var log = new LogItemViewModel(downloading ? Localization.GetString("NewVersionFoundDescDownloading") + "\n" + output : output, UILogColor.Download);
Application.Current.Dispatcher.Invoke(() =>
{
// _taskQueueViewModel.LogItemViewModels.Add(log);
if (_taskQueueViewModel.LogItemViewModels.Count > 0 &&
_taskQueueViewModel.LogItemViewModels[0].Color == UILogColor.Download)
if (_logItemViewModels.Count > 0 && _logItemViewModels[0].Color == UILogColor.Download)
{
_taskQueueViewModel.LogItemViewModels.RemoveAt(0);
if (!string.IsNullOrEmpty(output))
{
_logItemViewModels[0] = log;
}
else
{
_logItemViewModels.RemoveAt(0);
}
}
if (!string.IsNullOrEmpty(output))
else if (!string.IsNullOrEmpty(output))
{
var log = new LogItemViewModel(output, UILogColor.Download, timeColumnContent:
downloading ? Localization.GetString("NewVersionFoundDescDownloading") : string.Empty);
_taskQueueViewModel.LogItemViewModels.Insert(0, log);
_logItemViewModels.Insert(0, log);
}
});
}