From 1f14a4ef79f714d91c2e7fae772cdc499d983737 Mon Sep 17 00:00:00 2001
From: denglihong2007 <98096191+denglihong2007@users.noreply.github.com>
Date: Fri, 26 Sep 2025 23:49:32 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=99=9A=E7=82=B9=E8=BD=A6=E6=AC=A1?=
 =?UTF-8?q?=E5=9C=A8=E5=8E=9F=E5=8F=91=E8=BD=A6=E6=97=B6=E9=97=B4=E5=90=8E?=
 =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CRSim.ScreenSimulator/ViewModels/BaseScreenViewModel.cs       | 4 ++--
 .../ViewModels/MetroPlatformScreenViewModel.cs                | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CRSim.ScreenSimulator/ViewModels/BaseScreenViewModel.cs b/CRSim.ScreenSimulator/ViewModels/BaseScreenViewModel.cs
index 44a3e9b..96af3cc 100644
--- a/CRSim.ScreenSimulator/ViewModels/BaseScreenViewModel.cs
+++ b/CRSim.ScreenSimulator/ViewModels/BaseScreenViewModel.cs
@@ -124,13 +124,13 @@ namespace CRSim.ScreenSimulator.ViewModels
                     var now = TimeService.GetDateTimeNow();
                     var today = now.Date;
 
-                    if (_settings.LoadTodayOnly && today.Add((trainNumber.DepartureTime??trainNumber.ArrivalTime)!.Value) < now)
+                    if (_settings.LoadTodayOnly && today.Add((trainNumber.DepartureTime??trainNumber.ArrivalTime)!.Value).Add(trainNumber.Status.Value) < now)
                     {
                         continue;
                     }
 
                     DateTime? AdjustTime(TimeSpan? time) =>
-                        time.HasValue ? (today.Add(time.Value) > now ? today.Add(time.Value) : today.Add(time.Value).AddDays(1)) : null;
+                        time.HasValue ? (today.Add(time.Value).Add(trainNumber.Status.Value) > now ? today.Add(time.Value) : today.Add(time.Value).AddDays(1)) : null;
 
                     TrainInfo.Add(new TrainInfo
                     {
diff --git a/CRSim.ScreenSimulator/ViewModels/MetroPlatformScreenViewModel.cs b/CRSim.ScreenSimulator/ViewModels/MetroPlatformScreenViewModel.cs
index d420efd..8e1e822 100644
--- a/CRSim.ScreenSimulator/ViewModels/MetroPlatformScreenViewModel.cs
+++ b/CRSim.ScreenSimulator/ViewModels/MetroPlatformScreenViewModel.cs
@@ -53,12 +53,12 @@ namespace CRSim.ScreenSimulator.ViewModels
                 {
                     var now = TimeService.GetDateTimeNow();
                     var today = now.Date;
-                    if (_settings.LoadTodayOnly && today.Add((trainNumber.DepartureTime ?? trainNumber.ArrivalTime)!.Value) < now)
+                    if (_settings.LoadTodayOnly && today.Add((trainNumber.DepartureTime ?? trainNumber.ArrivalTime)!.Value).Add(trainNumber.Status.Value) < now)
                     {
                         continue;
                     }
                     DateTime? AdjustTime(TimeSpan? time) =>
-                        time.HasValue ? (today.Add(time.Value) > now ? today.Add(time.Value) : today.Add(time.Value).AddDays(1)) : null;
+                        time.HasValue ? (today.Add(time.Value).Add(trainNumber.Status.Value) > now ? today.Add(time.Value) : today.Add(time.Value).AddDays(1)) : null;
 
                     TrainInfos.Add(new TrainInfo
                     {