diff --git a/CRSim.ScreenSimulator/Assets/ShenyangBei/PlatformScreen.png b/CRSim.ScreenSimulator/Assets/ShenyangBei/PlatformScreen.png new file mode 100644 index 0000000..8939c98 Binary files /dev/null and b/CRSim.ScreenSimulator/Assets/ShenyangBei/PlatformScreen.png differ diff --git a/CRSim.ScreenSimulator/CRSim.ScreenSimulator.csproj b/CRSim.ScreenSimulator/CRSim.ScreenSimulator.csproj index 9fbea31..4aee3f4 100644 --- a/CRSim.ScreenSimulator/CRSim.ScreenSimulator.csproj +++ b/CRSim.ScreenSimulator/CRSim.ScreenSimulator.csproj @@ -13,6 +13,7 @@ + @@ -122,6 +123,7 @@ + diff --git a/CRSim.ScreenSimulator/Models/StylesInfoData.json b/CRSim.ScreenSimulator/Models/StylesInfoData.json index e690660..a1630d7 100644 --- a/CRSim.ScreenSimulator/Models/StylesInfoData.json +++ b/CRSim.ScreenSimulator/Models/StylesInfoData.json @@ -366,5 +366,17 @@ "Platform", "Location" ] + }, + { + "UniqueId": "ShenyangBei.PlatformScreen", + "Title": "沈阳北站站台看板", + "Region": "沈阳", + "Author": "电排骨", + "Type": "站台屏", + "Parameters": [ + "Station", + "Platform", + "Location" + ] } ] \ No newline at end of file diff --git a/CRSim.ScreenSimulator/ViewModels/ShenyangBei/PrimaryPlatformScreenViewModel.cs b/CRSim.ScreenSimulator/ViewModels/ShenyangBei/PrimaryPlatformScreenViewModel.cs new file mode 100644 index 0000000..9ca45b5 --- /dev/null +++ b/CRSim.ScreenSimulator/ViewModels/ShenyangBei/PrimaryPlatformScreenViewModel.cs @@ -0,0 +1,12 @@ +using CRSim.Core.Services; +namespace CRSim.ScreenSimulator.ViewModels.ShenyangBei +{ + public class PlatformScreenViewModel : ScreenViewModel + { + public PlatformScreenViewModel(ITimeService timeService, ISettingsService settingsService) + : base(timeService, settingsService) + { + ItemsPerPage = 1; + } + } +} diff --git a/CRSim.ScreenSimulator/Views/ShenyangBei/PrimaryPlatformScreenView.xaml b/CRSim.ScreenSimulator/Views/ShenyangBei/PrimaryPlatformScreenView.xaml new file mode 100644 index 0000000..ca72247 --- /dev/null +++ b/CRSim.ScreenSimulator/Views/ShenyangBei/PrimaryPlatformScreenView.xaml @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CRSim.ScreenSimulator/Views/ShenyangBei/PrimaryPlatformScreenView.xaml.cs b/CRSim.ScreenSimulator/Views/ShenyangBei/PrimaryPlatformScreenView.xaml.cs new file mode 100644 index 0000000..ab5923d --- /dev/null +++ b/CRSim.ScreenSimulator/Views/ShenyangBei/PrimaryPlatformScreenView.xaml.cs @@ -0,0 +1,15 @@ +using CRSim.ScreenSimulator.ViewModels.ShenyangBei; + +namespace CRSim.ScreenSimulator.Views.ShenyangBei +{ + public partial class PlatformScreenView : BaseScreenView + { + public PlatformScreenViewModel ViewModel { get; } + public PlatformScreenView(PlatformScreenViewModel viewModel) + { + InitializeComponent(); + ViewModel = viewModel; + DataContext = viewModel; + } + } +} diff --git a/CRSim.Shared/Converters/DateTimeToStringConverter.cs b/CRSim.Shared/Converters/DateTimeToStringConverter.cs index 51fe929..10a9d5e 100644 --- a/CRSim.Shared/Converters/DateTimeToStringConverter.cs +++ b/CRSim.Shared/Converters/DateTimeToStringConverter.cs @@ -15,7 +15,7 @@ namespace CRSim.Shared.Converters var CultureInfo = new CultureInfo(Culture); return dateTime.ToString(Format,CultureInfo); } - return string.Empty; + return "--:--"; } public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) { diff --git a/CRSim/CRSim.csproj b/CRSim/CRSim.csproj index fdd9495..c24f669 100644 --- a/CRSim/CRSim.csproj +++ b/CRSim/CRSim.csproj @@ -9,7 +9,7 @@ 13.0 CRSim.App Assets\CRSimIcon.ico - 2.2.1.3 + 2.2.2.0