From fd0878a78a131b64432ec5ef77dac089d3e98c8f Mon Sep 17 00:00:00 2001 From: wxl0430 <141288415+wxl0430@users.noreply.github.com> Date: Wed, 5 Mar 2025 16:17:43 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E4=B8=9C?= =?UTF-8?q?=E5=9F=8E=E5=8D=97=E7=AB=99=E6=AC=A1=E8=A6=81=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 其实是东城南站广东城际的看板了捏，为了命名统一这样写的 --- CRSim/App.xaml.cs | 2 + .../Dongchengnan/SecondaryScreen.png | Bin 0 -> 33969 bytes CRSim/CRSim.csproj | 6 +- CRSim/Models/StylesInfoData.json | 10 + CRSim/ViewModels/Windows/ScreenViewModel.cs | 8 + .../Dongchengnan/SecondaryScreenViewModel.cs | 41 ++++ .../Dongchengnan/SecondaryScreenView.xaml | 197 ++++++++++++++++++ .../Dongchengnan/SecondaryScreenView.xaml.cs | 33 +++ 8 files changed, 296 insertions(+), 1 deletion(-) create mode 100644 CRSim/Assets/StyleImages/Dongchengnan/SecondaryScreen.png create mode 100644 CRSim/ViewModels/Windows/Stations/Dongchengnan/SecondaryScreenViewModel.cs create mode 100644 CRSim/Views/Windows/Stations/Dongchengnan/SecondaryScreenView.xaml create mode 100644 CRSim/Views/Windows/Stations/Dongchengnan/SecondaryScreenView.xaml.cs diff --git a/CRSim/App.xaml.cs b/CRSim/App.xaml.cs index e0a018a..42b79cc 100644 --- a/CRSim/App.xaml.cs +++ b/CRSim/App.xaml.cs @@ -57,6 +57,8 @@ 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/Dongchengnan/SecondaryScreen.png new file mode 100644 index 0000000000000000000000000000000000000000..6f92dc073f30419ab2161d9a522f394648ae13b5 GIT binary patch literal 33969 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 + @@ -93,7 +94,10 @@ Code - + + Code + + Code diff --git a/CRSim/Models/StylesInfoData.json b/CRSim/Models/StylesInfoData.json index 58a1cb4..d2711fd 100644 --- a/CRSim/Models/StylesInfoData.json +++ b/CRSim/Models/StylesInfoData.json @@ -115,5 +115,15 @@ "Parameters": [ "Station" ] + }, + { + "UniqueId": "Dongchengnan SecondaryScreen", + "Title": "东城南站次要看板", + "Station": "Dongchengnan", + "StyleName": "SecondaryScreenView", + "ImagePath": "Assets/StyleImages/Dongchengnan/SecondaryScreen.png", + "Parameters": [ + "Station" + ] } ] \ No newline at end of file diff --git a/CRSim/ViewModels/Windows/ScreenViewModel.cs b/CRSim/ViewModels/Windows/ScreenViewModel.cs index 79dce1b..cfacfde 100644 --- a/CRSim/ViewModels/Windows/ScreenViewModel.cs +++ b/CRSim/ViewModels/Windows/ScreenViewModel.cs @@ -1,4 +1,6 @@ using System.Linq; +using System; +using System.Globalization; namespace CRSim.ViewModels { @@ -14,6 +16,8 @@ namespace CRSim.ViewModels [ObservableProperty] private string _currentSecond; [ObservableProperty] + private string _currentTime_Dongchengnan; + [ObservableProperty] private string _text = ""; [ObservableProperty] private Station _thisStation; @@ -21,6 +25,7 @@ namespace CRSim.ViewModels public List TrainInfo { get; set; } = []; + CultureInfo culture = new CultureInfo("zh-CN"); protected ScreenViewModel(ITimeService timeService, ISettingsService settingsService) { @@ -52,6 +57,9 @@ 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/Dongchengnan/SecondaryScreenViewModel.cs new file mode 100644 index 0000000..8352034 --- /dev/null +++ b/CRSim/ViewModels/Windows/Stations/Dongchengnan/SecondaryScreenViewModel.cs @@ -0,0 +1,41 @@ +namespace CRSim.ViewModels.Dongchengnan +{ + public class SecondaryScreenViewModel : ScreenViewModel + { + public ObservableCollection Screen { get; private set; } = []; + public SecondaryScreenViewModel(ITimeService timeService, ISettingsService settingsService) + : base(timeService, settingsService) + { + ItemsPerPage = 8; + PageCount = 1; + timeService.RefreshSecondsElapsed += RefreshDisplay; + Initialize(); + } + private async void Initialize() + { + await WaitForDataLoadAsync(); + Text = $" 列 车 到 发 信 息"; + RefreshDisplay(null,null); + } + private void RefreshDisplay(object? sender, EventArgs e) + { + Application.Current.Dispatcher.Invoke(() => + { + int pageCount = (int)Math.Ceiling((double)TrainInfo.Count / (ItemsPerPage * PageCount)); + Screen.Clear(); + int startIndex = CurrentPageIndex * ItemsPerPage * PageCount; + var Items = TrainInfo.Skip(startIndex).Take(ItemsPerPage).ToList(); + while (Items.Count < ItemsPerPage) // Fill up with new object() if not enough items + { + Items.Add(new TrainInfo()); + } + foreach (var item in Items) + { + Screen.Add(item); + } + + CurrentPageIndex = CurrentPageIndex + 1 >= Math.Min(_settings.MaxPages, pageCount) ? 0 : CurrentPageIndex + 1; + }); + } + } +} diff --git a/CRSim/Views/Windows/Stations/Dongchengnan/SecondaryScreenView.xaml b/CRSim/Views/Windows/Stations/Dongchengnan/SecondaryScreenView.xaml new file mode 100644 index 0000000..4cfb5f7 --- /dev/null +++ b/CRSim/Views/Windows/Stations/Dongchengnan/SecondaryScreenView.xaml @@ -0,0 +1,197 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CRSim/Views/Windows/Stations/Dongchengnan/SecondaryScreenView.xaml.cs b/CRSim/Views/Windows/Stations/Dongchengnan/SecondaryScreenView.xaml.cs new file mode 100644 index 0000000..d309e66 --- /dev/null +++ b/CRSim/Views/Windows/Stations/Dongchengnan/SecondaryScreenView.xaml.cs @@ -0,0 +1,33 @@ +using CRSim.ViewModels.Dongchengnan; + +namespace CRSim.Views.Dongchengnan +{ + ///

+ /// SecondaryScreen.xaml 的交互逻辑 + /// + public partial class SecondaryScreenView : Window + { + public SecondaryScreenViewModel ViewModel { get; } + public SecondaryScreenView(SecondaryScreenViewModel viewModel) + { + InitializeComponent(); + ViewModel = viewModel; + DataContext = viewModel; + } + private void Window_MouseDown(object sender, MouseButtonEventArgs e) + { + if (e.ChangedButton == MouseButton.Left) + { + DragMove(); + } + } + + private void Window_KeyDown(object sender, KeyEventArgs e) + { + if (e.Key == Key.Escape) + { + Close(); + } + } + } +} From 6f963aa9e53acca861074bf06a6bb56f231596f6 Mon Sep 17 00:00:00 2001 From: denglihong2007 <2639367181@qq.com> Date: Wed, 5 Mar 2025 23:16:18 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E6=AD=A3=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E4=B8=8E=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CRSim/App.xaml.cs | 4 ++-- .../SecondaryScreen.png | Bin CRSim/CRSim.csproj | 5 ++--- CRSim/Models/StylesInfoData.json | 8 ++++---- CRSim/ViewModels/Windows/ScreenViewModel.cs | 6 ------ .../SecondaryScreenViewModel.cs | 4 ++-- .../SecondaryScreenView.xaml | 16 +++++++++++----- .../SecondaryScreenView.xaml.cs | 4 ++-- 8 files changed, 23 insertions(+), 24 deletions(-) rename CRSim/Assets/StyleImages/{Dongchengnan => GuangdongIntercity}/SecondaryScreen.png (100%) rename CRSim/ViewModels/Windows/Stations/{Dongchengnan => GuangdongIntercity}/SecondaryScreenViewModel.cs (94%) rename CRSim/Views/Windows/Stations/{Dongchengnan => GuangdongIntercity}/SecondaryScreenView.xaml (94%) rename CRSim/Views/Windows/Stations/{Dongchengnan => GuangdongIntercity}/SecondaryScreenView.xaml.cs (90%) 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 的交互逻辑