diff --git a/CRSim/ViewModels/Windows/ScreenViewModel.cs b/CRSim/ViewModels/Windows/ScreenViewModel.cs index 6c24227..5001f1b 100644 --- a/CRSim/ViewModels/Windows/ScreenViewModel.cs +++ b/CRSim/ViewModels/Windows/ScreenViewModel.cs @@ -10,11 +10,7 @@ namespace CRSim.ViewModels public readonly Settings _settings; private readonly TaskCompletionSource _dataLoaded = new(); [ObservableProperty] - private string _currentTime; - [ObservableProperty] - private string _currentDate; - [ObservableProperty] - private string _currentSecond; + private DateTime _currentTime = new(); [ObservableProperty] private string _text = ""; [ObservableProperty] @@ -51,9 +47,7 @@ namespace CRSim.ViewModels private void OnTimeElapsed(object? sender, EventArgs e) { - CurrentTime = _timeService.GetDateTimeNow().ToString("yyyy-MM-dd HH:mm:ss"); - CurrentDate = _timeService.GetDateTimeNow().ToString("yyyy-MM-dd"); - CurrentSecond = _timeService.GetDateTimeNow().ToString("HH:mm:ss"); + CurrentTime = _timeService.GetDateTimeNow(); } public Task WaitForDataLoadAsync() => _dataLoaded.Task; diff --git a/CRSim/Views/Windows/Stations/ChengduDong/SecondaryScreenView.xaml b/CRSim/Views/Windows/Stations/ChengduDong/SecondaryScreenView.xaml index fee1a99..1c0bca7 100644 --- a/CRSim/Views/Windows/Stations/ChengduDong/SecondaryScreenView.xaml +++ b/CRSim/Views/Windows/Stations/ChengduDong/SecondaryScreenView.xaml @@ -20,6 +20,7 @@ + @@ -404,7 +405,7 @@ + Name="labelTime" Text="{Binding CurrentTime,Converter={StaticResource DateTimeToStringTimeConverter}}"> diff --git a/CRSim/Views/Windows/Stations/GuangdongIntercity/SecondaryScreenView.xaml b/CRSim/Views/Windows/Stations/GuangdongIntercity/SecondaryScreenView.xaml index 435b9ea..d136ab0 100644 --- a/CRSim/Views/Windows/Stations/GuangdongIntercity/SecondaryScreenView.xaml +++ b/CRSim/Views/Windows/Stations/GuangdongIntercity/SecondaryScreenView.xaml @@ -15,6 +15,8 @@ + + + + @@ -130,8 +132,8 @@ - - + + diff --git a/CRSim/Views/Windows/Stations/Harbin/PrimaryScreenView.xaml b/CRSim/Views/Windows/Stations/Harbin/PrimaryScreenView.xaml index f551beb..dd00c5d 100644 --- a/CRSim/Views/Windows/Stations/Harbin/PrimaryScreenView.xaml +++ b/CRSim/Views/Windows/Stations/Harbin/PrimaryScreenView.xaml @@ -14,6 +14,7 @@ +