Merge branch 'S07' into test
This commit is contained in:
commit
36514e11a0
@ -89,19 +89,13 @@ public sealed class TransportWarningDetailsIndex : IdBaseIndex
|
||||
public TimeSpan CalcCumulativeTimeSpan(TrackDetailsIndex? startStatusTrack, TrackDetailsIndex? endStatusTrack)
|
||||
{
|
||||
TimeSpan timeSpan;
|
||||
var startTime = startStatusTrack?.GetUtc0TrackTime() ?? GetUtc0StartTrackTime();
|
||||
if (Status == (int) TransportWarningStatus.已关闭)
|
||||
{
|
||||
timeSpan = TimeSpan.FromMilliseconds(CumulativeTimeSpan);
|
||||
}
|
||||
else if (endStatusTrack != null)
|
||||
{
|
||||
timeSpan = endStatusTrack.GetUtc0TrackTime()
|
||||
.Subtract(startStatusTrack!.GetUtc0TrackTime());
|
||||
}
|
||||
timeSpan = endStatusTrack.GetUtc0TrackTime().Subtract(startTime);
|
||||
else
|
||||
{
|
||||
timeSpan = DateTime.UtcNow.Subtract(startStatusTrack!.GetUtc0TrackTime());
|
||||
}
|
||||
timeSpan = DateTime.UtcNow.Subtract(startTime);
|
||||
|
||||
return timeSpan;
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user