Merge branch 'S07' into test

This commit is contained in:
hardstylewyl 2025-03-31 10:10:47 +08:00
commit 36514e11a0

View File

@ -89,19 +89,13 @@ public sealed class TransportWarningDetailsIndex : IdBaseIndex
public TimeSpan CalcCumulativeTimeSpan(TrackDetailsIndex? startStatusTrack, TrackDetailsIndex? endStatusTrack) public TimeSpan CalcCumulativeTimeSpan(TrackDetailsIndex? startStatusTrack, TrackDetailsIndex? endStatusTrack)
{ {
TimeSpan timeSpan; TimeSpan timeSpan;
var startTime = startStatusTrack?.GetUtc0TrackTime() ?? GetUtc0StartTrackTime();
if (Status == (int) TransportWarningStatus.已关闭) if (Status == (int) TransportWarningStatus.已关闭)
{
timeSpan = TimeSpan.FromMilliseconds(CumulativeTimeSpan); timeSpan = TimeSpan.FromMilliseconds(CumulativeTimeSpan);
}
else if (endStatusTrack != null) else if (endStatusTrack != null)
{ timeSpan = endStatusTrack.GetUtc0TrackTime().Subtract(startTime);
timeSpan = endStatusTrack.GetUtc0TrackTime()
.Subtract(startStatusTrack!.GetUtc0TrackTime());
}
else else
{ timeSpan = DateTime.UtcNow.Subtract(startTime);
timeSpan = DateTime.UtcNow.Subtract(startStatusTrack!.GetUtc0TrackTime());
}
return timeSpan; return timeSpan;
} }