diff --git a/CRSim/App.xaml.cs b/CRSim/App.xaml.cs index 42b79cc..0b737d0 100644 --- a/CRSim/App.xaml.cs +++ b/CRSim/App.xaml.cs @@ -57,8 +57,8 @@ services.AddTransient(); services.AddTransient(); services.AddTransient(); - services.AddTransient(); - services.AddTransient(); + services.AddTransient(); + services.AddTransient(); }).Build(); [STAThread] diff --git a/CRSim/Assets/StyleImages/Dongchengnan/SecondaryScreen.png b/CRSim/Assets/StyleImages/GuangdongIntercity/SecondaryScreen.png similarity index 100% rename from CRSim/Assets/StyleImages/Dongchengnan/SecondaryScreen.png rename to CRSim/Assets/StyleImages/GuangdongIntercity/SecondaryScreen.png diff --git a/CRSim/CRSim.csproj b/CRSim/CRSim.csproj index cf1c4ba..d7cea1b 100644 --- a/CRSim/CRSim.csproj +++ b/CRSim/CRSim.csproj @@ -14,7 +14,6 @@ - PreserveNewest @@ -36,6 +35,7 @@ + @@ -44,7 +44,6 @@ - @@ -97,7 +96,7 @@ Code - + Code diff --git a/CRSim/Models/StylesInfoData.json b/CRSim/Models/StylesInfoData.json index d2711fd..926d596 100644 --- a/CRSim/Models/StylesInfoData.json +++ b/CRSim/Models/StylesInfoData.json @@ -117,11 +117,11 @@ ] }, { - "UniqueId": "Dongchengnan SecondaryScreen", - "Title": "东城南站次要看板", - "Station": "Dongchengnan", + "UniqueId": "GuangdongIntercity SecondaryScreen", + "Title": "广东城际次要看板", + "Station": "GuangdongIntercity", "StyleName": "SecondaryScreenView", - "ImagePath": "Assets/StyleImages/Dongchengnan/SecondaryScreen.png", + "ImagePath": "Assets/StyleImages/GuangdongIntercity/SecondaryScreen.png", "Parameters": [ "Station" ] diff --git a/CRSim/ViewModels/Windows/ScreenViewModel.cs b/CRSim/ViewModels/Windows/ScreenViewModel.cs index cfacfde..6c24227 100644 --- a/CRSim/ViewModels/Windows/ScreenViewModel.cs +++ b/CRSim/ViewModels/Windows/ScreenViewModel.cs @@ -16,8 +16,6 @@ namespace CRSim.ViewModels [ObservableProperty] private string _currentSecond; [ObservableProperty] - private string _currentTime_Dongchengnan; - [ObservableProperty] private string _text = ""; [ObservableProperty] private Station _thisStation; @@ -25,7 +23,6 @@ namespace CRSim.ViewModels public List TrainInfo { get; set; } = []; - CultureInfo culture = new CultureInfo("zh-CN"); protected ScreenViewModel(ITimeService timeService, ISettingsService settingsService) { @@ -57,9 +54,6 @@ namespace CRSim.ViewModels 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_Dongchengnan = _timeService.GetDateTimeNow().ToString("H:m") + "\n" + - culture.DateTimeFormat.GetDayName(_timeService.GetDateTimeNow().DayOfWeek) + "\n" + - _timeService.GetDateTimeNow().ToString("yyyy/M/d"); } public Task WaitForDataLoadAsync() => _dataLoaded.Task; diff --git a/CRSim/ViewModels/Windows/Stations/Dongchengnan/SecondaryScreenViewModel.cs b/CRSim/ViewModels/Windows/Stations/GuangdongIntercity/SecondaryScreenViewModel.cs similarity index 94% rename from CRSim/ViewModels/Windows/Stations/Dongchengnan/SecondaryScreenViewModel.cs rename to CRSim/ViewModels/Windows/Stations/GuangdongIntercity/SecondaryScreenViewModel.cs index 8352034..1e1810c 100644 --- a/CRSim/ViewModels/Windows/Stations/Dongchengnan/SecondaryScreenViewModel.cs +++ b/CRSim/ViewModels/Windows/Stations/GuangdongIntercity/SecondaryScreenViewModel.cs @@ -1,4 +1,4 @@ -namespace CRSim.ViewModels.Dongchengnan +namespace CRSim.ViewModels.GuangdongIntercity { public class SecondaryScreenViewModel : ScreenViewModel { @@ -14,7 +14,7 @@ private async void Initialize() { await WaitForDataLoadAsync(); - Text = $" 列 车 到 发 信 息"; + Text = $"列 车 到 发 信 息"; RefreshDisplay(null,null); } private void RefreshDisplay(object? sender, EventArgs e) diff --git a/CRSim/Views/Windows/Stations/Dongchengnan/SecondaryScreenView.xaml b/CRSim/Views/Windows/Stations/GuangdongIntercity/SecondaryScreenView.xaml similarity index 94% rename from CRSim/Views/Windows/Stations/Dongchengnan/SecondaryScreenView.xaml rename to CRSim/Views/Windows/Stations/GuangdongIntercity/SecondaryScreenView.xaml index 4cfb5f7..435b9ea 100644 --- a/CRSim/Views/Windows/Stations/Dongchengnan/SecondaryScreenView.xaml +++ b/CRSim/Views/Windows/Stations/GuangdongIntercity/SecondaryScreenView.xaml @@ -1,9 +1,9 @@ - - - + + + + + + - + diff --git a/CRSim/Views/Windows/Stations/Dongchengnan/SecondaryScreenView.xaml.cs b/CRSim/Views/Windows/Stations/GuangdongIntercity/SecondaryScreenView.xaml.cs similarity index 90% rename from CRSim/Views/Windows/Stations/Dongchengnan/SecondaryScreenView.xaml.cs rename to CRSim/Views/Windows/Stations/GuangdongIntercity/SecondaryScreenView.xaml.cs index d309e66..c39b045 100644 --- a/CRSim/Views/Windows/Stations/Dongchengnan/SecondaryScreenView.xaml.cs +++ b/CRSim/Views/Windows/Stations/GuangdongIntercity/SecondaryScreenView.xaml.cs @@ -1,6 +1,6 @@ -using CRSim.ViewModels.Dongchengnan; +using CRSim.ViewModels.GuangdongIntercity; -namespace CRSim.Views.Dongchengnan +namespace CRSim.Views.GuangdongIntercity { /// /// SecondaryScreen.xaml 的交互逻辑