From fe5744f328926ff7d73b23497403b91f91fefbd3 Mon Sep 17 00:00:00 2001
From: uye <99072975+ABA2396@users.noreply.github.com>
Date: Thu, 1 May 2025 14:00:38 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=9E=84=E5=BB=BA=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/MaaWpfGui/Extensions/DateTimeExtension.cs | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/MaaWpfGui/Extensions/DateTimeExtension.cs b/src/MaaWpfGui/Extensions/DateTimeExtension.cs
index 7e2a102ddf..cae6e91b86 100644
--- a/src/MaaWpfGui/Extensions/DateTimeExtension.cs
+++ b/src/MaaWpfGui/Extensions/DateTimeExtension.cs
@@ -62,11 +62,20 @@ namespace MaaWpfGui.Extensions
 
         public static string ToLocalTimeString(this DateTime dt, string? format = null)
         {
-            var dateTimeFormat = LocalizationHelper.FormatDateTime(DateTime.Now);
+            var localTime = dt.Kind switch
+            {
+                DateTimeKind.Utc => dt.ToLocalTime(),
+                DateTimeKind.Local => dt,
+                _ => DateTime.SpecifyKind(dt, DateTimeKind.Utc).ToLocalTime(),
+            };
 
-            return string.IsNullOrEmpty(format)
-                ? dt.ToLocalTime().ToString($"{dateTimeFormat} HH:mm:ss", CustomCultureInfo)
-                : dt.ToLocalTime().ToString(format, CustomCultureInfo);
+            if (!string.IsNullOrEmpty(format))
+            {
+                return localTime.ToString(format, CustomCultureInfo);
+            }
+
+            var dateTimeFormat = LocalizationHelper.FormatDateTime(localTime);
+            return localTime.ToString($"{dateTimeFormat} HH:mm:ss", CustomCultureInfo);
         }
 
         public static DateTime ToDateTime(this System.Runtime.InteropServices.ComTypes.FILETIME filetime)