diff --git a/CRSim.ScreenSimulator/Assets/Advertisement-3.mp4 b/CRSim.ScreenSimulator/Assets/Advertisement-3.mp4 new file mode 100644 index 0000000..0c6527a Binary files /dev/null and b/CRSim.ScreenSimulator/Assets/Advertisement-3.mp4 differ diff --git a/CRSim.ScreenSimulator/Assets/TianjinMetro/PlatformScreen.png b/CRSim.ScreenSimulator/Assets/TianjinMetro/PlatformScreen.png new file mode 100644 index 0000000..cfde666 Binary files /dev/null and b/CRSim.ScreenSimulator/Assets/TianjinMetro/PlatformScreen.png differ diff --git a/CRSim.ScreenSimulator/Assets/TianjinMetro/TianjinMetro-Icon.png b/CRSim.ScreenSimulator/Assets/TianjinMetro/TianjinMetro-Icon.png new file mode 100644 index 0000000..22dd6a3 Binary files /dev/null and b/CRSim.ScreenSimulator/Assets/TianjinMetro/TianjinMetro-Icon.png differ diff --git a/CRSim.ScreenSimulator/CRSim.ScreenSimulator.csproj b/CRSim.ScreenSimulator/CRSim.ScreenSimulator.csproj index 0c58670..0523a0d 100644 --- a/CRSim.ScreenSimulator/CRSim.ScreenSimulator.csproj +++ b/CRSim.ScreenSimulator/CRSim.ScreenSimulator.csproj @@ -8,10 +8,13 @@ + + + @@ -21,6 +24,9 @@ PreserveNewest + + PreserveNewest + @@ -57,6 +63,9 @@ Code + + Code + Code @@ -120,6 +129,8 @@ + + diff --git a/CRSim.ScreenSimulator/Models/StylesInfoData.json b/CRSim.ScreenSimulator/Models/StylesInfoData.json index 7c0fc92..f879a47 100644 --- a/CRSim.ScreenSimulator/Models/StylesInfoData.json +++ b/CRSim.ScreenSimulator/Models/StylesInfoData.json @@ -104,6 +104,19 @@ "Platform" ] }, + { + "UniqueId": "TianjinMetro.PlatformScreen", + "Title": "天津地铁站台看板", + "Station": "天津地铁", + "Author": "电排骨", + "Type": "站台屏", + "Parameters": [ + "Station", + "Text", + "Video", + "Platform" + ] + }, { "UniqueId": "Guangyuan.PrimaryScreen", "Title": "广元站主要看板", diff --git a/CRSim.ScreenSimulator/ViewModels/TianjinMetro/PlatformScreenViewModel.cs b/CRSim.ScreenSimulator/ViewModels/TianjinMetro/PlatformScreenViewModel.cs new file mode 100644 index 0000000..5c6964c --- /dev/null +++ b/CRSim.ScreenSimulator/ViewModels/TianjinMetro/PlatformScreenViewModel.cs @@ -0,0 +1,13 @@ +using CRSim.Core.Services; +namespace CRSim.ScreenSimulator.ViewModels.TianjinMetro +{ + public class PlatformScreenViewModel : MetroPlatformScreenViewModel + { + public PlatformScreenViewModel(ITimeService timeService, ISettingsService settingsService) + : base(timeService, settingsService) + { + Text = "海河明珠闪耀津门,古今交融绘就华章。五大道镌刻百年风华,滨海新区涌动创新浪潮。狗不理飘香,相声茶馆笑声扬。意式风情街浪漫流淌,古文化街非遗绽放。生态宜居城,开放包容乡。天津卫,邀您共谱新时代乐章!"; + Video = new("Assets\\Advertisement-3.mp4", UriKind.Relative); + } + } +} diff --git a/CRSim.ScreenSimulator/Views/TianjinMetro/PlatformScreenView.xaml b/CRSim.ScreenSimulator/Views/TianjinMetro/PlatformScreenView.xaml new file mode 100644 index 0000000..cc64a16 --- /dev/null +++ b/CRSim.ScreenSimulator/Views/TianjinMetro/PlatformScreenView.xaml @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CRSim.ScreenSimulator/Views/TianjinMetro/PlatformScreenView.xaml.cs b/CRSim.ScreenSimulator/Views/TianjinMetro/PlatformScreenView.xaml.cs new file mode 100644 index 0000000..769951a --- /dev/null +++ b/CRSim.ScreenSimulator/Views/TianjinMetro/PlatformScreenView.xaml.cs @@ -0,0 +1,24 @@ +using CRSim.ScreenSimulator.ViewModels.TianjinMetro; +using System.Windows; + +namespace CRSim.ScreenSimulator.Views.TianjinMetro +{ + public partial class PlatformScreenView : BaseScreenView + { + public PlatformScreenViewModel ViewModel { get; } + public PlatformScreenView(PlatformScreenViewModel viewModel) + { + InitializeComponent(); + ViewModel = viewModel; + DataContext = viewModel; + player.Play(); + } + + private void MediaElement_MediaEnded(object sender, RoutedEventArgs e) + { + player.Position = TimeSpan.Zero; + player.Play(); + } + + } +} diff --git a/CRSim/CRSim.csproj b/CRSim/CRSim.csproj index c51776f..2023e62 100644 --- a/CRSim/CRSim.csproj +++ b/CRSim/CRSim.csproj @@ -9,7 +9,7 @@ 13.0 CRSim.App Assets\CRSimIcon.ico - 2.2.0.0 + 2.2.1.0