From 16195913d0e6cf1367247712629d8d04c67a8e81 Mon Sep 17 00:00:00 2001
From: denglihong2007 <2639367181@qq.com>
Date: Tue, 4 Mar 2025 12:30:47 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B7=A8=E9=9B=B6=E7=82=B9=E5=90=8E?=
 =?UTF-8?q?=E9=87=8D=E6=96=B0=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CRSim/ViewModels/Windows/ScreenViewModel.cs     | 17 ++---------------
 .../ChengduMetro/PlatformScreenViewModel.cs     | 12 ++----------
 2 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/CRSim/ViewModels/Windows/ScreenViewModel.cs b/CRSim/ViewModels/Windows/ScreenViewModel.cs
index d5d2dca..79dce1b 100644
--- a/CRSim/ViewModels/Windows/ScreenViewModel.cs
+++ b/CRSim/ViewModels/Windows/ScreenViewModel.cs
@@ -69,27 +69,14 @@ namespace CRSim.ViewModels
                         TrainNumber = trainNumber.Number,
                         Terminal = trainNumber.Terminal,
                         Origin = trainNumber.Origin,
-                        ArrivalTime = trainNumber.ArrivalTime,
-                        DepartureTime = trainNumber.DepartureTime ?? DateTime.MinValue,
+                        ArrivalTime = trainNumber.ArrivalTime == null ? null : trainNumber.DepartureTime.Value < _timeService.GetDateTimeNow() ? trainNumber.ArrivalTime.Value.AddDays(1) : trainNumber.ArrivalTime.Value,
+                        DepartureTime = trainNumber.DepartureTime.Value < _timeService.GetDateTimeNow() ? trainNumber.DepartureTime.Value.AddDays(1) : trainNumber.DepartureTime.Value,
                         TicketChecks = trainNumber.TicketChecks,
                         WaitingArea = station.WaitingAreas.Where(x => x.TicketChecks.Intersect(trainNumber.TicketChecks).ToList().Count!=0).FirstOrDefault().Name,
                         Platform = trainNumber.Platform,
                         Landmark = trainNumber.Landmark,
                         State = TimeSpan.Zero
                     });
-                    TrainInfo.Add(new TrainInfo
-                    {
-                        TrainNumber = trainNumber.Number,
-                        Terminal = trainNumber.Terminal,
-                        Origin = trainNumber.Origin,
-                        ArrivalTime = trainNumber.ArrivalTime?.AddDays(1),
-                        DepartureTime = (trainNumber.DepartureTime ?? DateTime.MinValue).AddDays(1),
-                        TicketChecks = trainNumber.TicketChecks,
-                        WaitingArea = station.WaitingAreas.Where(x => x.TicketChecks.Intersect(trainNumber.TicketChecks).ToList().Count != 0).FirstOrDefault().Name,
-                        Platform = trainNumber.Platform,
-                        Landmark= trainNumber.Landmark,
-                        State = TimeSpan.Zero
-                    });
                 }
             }
             TrainInfo = [.. TrainInfo.OrderBy(x => x.DepartureTime)];
diff --git a/CRSim/ViewModels/Windows/Stations/ChengduMetro/PlatformScreenViewModel.cs b/CRSim/ViewModels/Windows/Stations/ChengduMetro/PlatformScreenViewModel.cs
index d01cd5d..a83c2c4 100644
--- a/CRSim/ViewModels/Windows/Stations/ChengduMetro/PlatformScreenViewModel.cs
+++ b/CRSim/ViewModels/Windows/Stations/ChengduMetro/PlatformScreenViewModel.cs
@@ -28,16 +28,8 @@
                     {
                         TrainNumber = trainNumber.Number,
                         Terminal = trainNumber.Terminal,
-                        ArrivalTime = trainNumber.ArrivalTime,
-                        DepartureTime = trainNumber.DepartureTime ?? DateTime.MinValue,
-                        State = TimeSpan.Zero
-                    });
-                    TrainInfos.Add(new TrainInfo
-                    {
-                        TrainNumber = trainNumber.Number,
-                        Terminal = trainNumber.Terminal,
-                        ArrivalTime = trainNumber.ArrivalTime?.AddDays(1),
-                        DepartureTime = (trainNumber.DepartureTime ?? DateTime.MinValue).AddDays(1),
+                        ArrivalTime = trainNumber.ArrivalTime == null ? null : trainNumber.DepartureTime.Value < _timeService.GetDateTimeNow() ? trainNumber.ArrivalTime.Value.AddDays(1) : trainNumber.ArrivalTime.Value,
+                        DepartureTime = trainNumber.DepartureTime.Value < _timeService.GetDateTimeNow() ? trainNumber.DepartureTime.Value.AddDays(1) : trainNumber.DepartureTime.Value,
                         State = TimeSpan.Zero
                     });
                 }