ogb912/CRSim
1
0
Fork 0
mirror of https://github.com/denglihong2007/CRSim synced 2026-08-05 08:55:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: 增加晚点未定功能

Browse Source
This commit is contained in:
denglihong2007
2026-03-28 22:00:33 +08:00
parent fbbf75413f
commit 2044c19f24
11 changed files with 254 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
CRSim.ScreenSimulator/ViewModels/BaseScreenViewModel.cs
View File

@@ -196,22 +196,27 @@ namespace CRSim.ScreenSimulator.ViewModels
{
var now = TimeService.GetDateTimeNow();
var today = now.Date;
var scheduleOffset = TrainStatus.GetScheduleOffset(trainNumber.Status);
if (_settings.LoadTodayOnly && today.Add((trainNumber.DepartureTime ?? trainNumber.ArrivalTime)!.Value).Add(trainNumber.Status.Value) < now)
if (_settings.LoadTodayOnly && today.Add((trainNumber.DepartureTime ?? trainNumber.ArrivalTime)!.Value).Add(scheduleOffset) < now)
{
continue;
}
DateTime? AdjustTime(TimeSpan? time, TimeSpan? status) =>
time.HasValue ? (today.Add(time.Value).Add(status.Value) > now ? today.Add(time.Value) : today.Add(time.Value).AddDays(1)) : null;
DateTime? AdjustTime(TimeSpan? time, TimeSpan status) =>
time.HasValue ? (today.Add(time.Value).Add(status) > now ? today.Add(time.Value) : today.Add(time.Value).AddDays(1)) : null;
var departureOffset = trainNumber.Status is TimeSpan knownStatus && knownStatus > TimeSpan.Zero && !TrainStatus.IsDelayUnknown(knownStatus)
? knownStatus
: TimeSpan.Zero;
TrainInfo.Add(new TrainInfo
{
TrainNumber = trainNumber.Number,
Terminal = trainNumber.Terminal,
Origin = trainNumber.Origin,
ArrivalTime = AdjustTime(trainNumber.ArrivalTime, trainNumber.Status),
DepartureTime = trainNumber.Status > TimeSpan.Zero ? AdjustTime(trainNumber.DepartureTime, trainNumber.Status) : AdjustTime(trainNumber.DepartureTime, TimeSpan.Zero),
ArrivalTime = AdjustTime(trainNumber.ArrivalTime, scheduleOffset),
DepartureTime = AdjustTime(trainNumber.DepartureTime, departureOffset),
TicketChecks = trainNumber.TicketCheckIds is null ? [] : [.. station.WaitingAreas
.SelectMany(w => w.TicketChecks)
.Where(tc => trainNumber.TicketCheckIds.Contains(tc.Id))
@@ -232,4 +237,4 @@ namespace CRSim.ScreenSimulator.ViewModels
DataLoaded.SetResult(true);
}
}
}
}