ogb912/CRSim
1
0
Fork 0
mirror of https://github.com/denglihong2007/CRSim synced 2026-08-06 09:16:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #20 from denglihong2007/dev

Browse Source 
fix: 跨零点后重新显示
This commit is contained in:
denglihong2007
2025-03-04 12:33:02 +08:00
committed by GitHub
parent ad85b8fd60 16195913d0
commit 802fcd1b1b
2 changed files with 4 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
CRSim/ViewModels/Windows/ScreenViewModel.cs
View File

@@ -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)];

12
CRSim/ViewModels/Windows/Stations/ChengduMetro/PlatformScreenViewModel.cs
View File

@@ -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
});
}