From 4c4f8f4d6d44490da5edc35ec70576f4ed24adbf Mon Sep 17 00:00:00 2001 From: MistEO Date: Sat, 1 Apr 2023 13:22:19 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E9=B1=BC?= =?UTF-8?q?=E4=BA=BA=E8=8A=82=E5=88=A4=E6=96=AD=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MaaWpfGui/Extensions/DateTimeExtension.cs | 7 ++++++- src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs | 8 +------- src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs | 2 +- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/MaaWpfGui/Extensions/DateTimeExtension.cs b/src/MaaWpfGui/Extensions/DateTimeExtension.cs index 7e8f25cc26..4878d9ae38 100644 --- a/src/MaaWpfGui/Extensions/DateTimeExtension.cs +++ b/src/MaaWpfGui/Extensions/DateTimeExtension.cs @@ -1,4 +1,4 @@ -// +// // MaaWpfGui - A part of the MaaCoreArknights project // Copyright (C) 2021 MistEO and Contributors // @@ -50,5 +50,10 @@ namespace MaaWpfGui.Extensions { return dt.ToString("yyyy/MM/dd HH:mm:ss", DateTimeFormatInfo.InvariantInfo); } + + public static bool IsAprilFoolsDay(this DateTime dt) + { + return dt.Month == 4 && dt.Day == 1; + } } } diff --git a/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs b/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs index 0ddf95dda5..2c874d6c83 100644 --- a/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs +++ b/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs @@ -2633,19 +2633,13 @@ namespace MaaWpfGui.ViewModels.UI } } - public static bool AprilFoolsDay() - { - var yjDate = DateTime.UtcNow.ToYJDate(); - return yjDate.Month == 4 && yjDate.Day == 1; - } - /// /// Did you buy wine? /// /// The answer. public bool DidYouBuyWine() { - if (AprilFoolsDay()) + if (DateTime.UtcNow.ToYJDate().IsAprilFoolsDay()) { return true; } diff --git a/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs b/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs index b78ff5f343..146720a62a 100644 --- a/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs +++ b/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs @@ -306,7 +306,7 @@ namespace MaaWpfGui.ViewModels.UI UpdateStageList(true); RefreshCustonInfrastPlan(); - if (SettingsViewModel.AprilFoolsDay()) + if (DateTime.UtcNow.ToYJDate().IsAprilFoolsDay()) { AddLog(LocalizationHelper.GetString("BuyWineOnAprilFoolsDay"), UiLogColor.Info); }