ogb912/CRSim
1
0
Fork 0
mirror of https://github.com/denglihong2007/CRSim synced 2026-08-10 19:46:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 部分命名错误或者显示效果差

Browse Source
This commit is contained in:
denglihong2007
2025-04-19 21:59:47 +08:00
parent 1b6d00512a
commit 78574289d6
11 changed files with 106 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CRSim.ScreenSimulator/Converters/LocationToStringConverter.cs
View File

@@ -13,11 +13,9 @@ namespace CRSim.ScreenSimulator.Converters
*/
object IMultiValueConverter.Convert(object[] values, System.Type targetType, object parameter, System.Globalization.CultureInfo culture)
{
// return $"{values[0]},{values[1]},{values[2]}";
if (values[0] is int Length && values[1] is int Location)
{
if(DisplayMode == "least" && values[2] is string Direction){
// return Direction;
if(Direction == "left")
{
if(Location <= Length)

29
CRSim.ScreenSimulator/ViewModels/Beijing/ArrivalScreenViewModel.cs
View File

@@ -7,11 +7,13 @@ namespace CRSim.ScreenSimulator.ViewModels.Beijing
{
public class ArrivalScreenViewModel : ScreenViewModel
{
private ITimeService _timeService;
public ObservableCollection<TrainInfo> Screen { get; set; } = [];
public ArrivalScreenViewModel(ITimeService timeService, ISettingsService settingsService)
: base(timeService, settingsService)
{
StationType = StationType.Departure;
_timeService = timeService;
StationType = StationType.Arrival;
timeService.RefreshSecondsElapsed += RefreshDisplay;
Initialize();
}
@@ -32,5 +34,30 @@ namespace CRSim.ScreenSimulator.ViewModels.Beijing
}
});
}
public override void RefreshData(object? sender, EventArgs e)
{
List<TrainInfo> itemsToRemove = [];
foreach (TrainInfo trainInfo in TrainInfo)
{
if (trainInfo.DepartureTime == null)
{
if (trainInfo.ArrivalTime.Value.Add(_settings.StopDisplayFromArrivalDuration) < _timeService.GetDateTimeNow())
{
itemsToRemove.Add(trainInfo);
}
}
else
{
if (trainInfo.DepartureTime.Value < _timeService.GetDateTimeNow())
{
itemsToRemove.Add(trainInfo);
}
}
}
foreach (var item in itemsToRemove)
{
TrainInfo.Remove(item);
}
}
}
}

6
CRSim.ScreenSimulator/ViewModels/Daqingdong/PlatfromScreenViewModel.cs → CRSim.ScreenSimulator/ViewModels/DaqingDong/ConcourseBridgeScreen.cs
View File

@@ -3,12 +3,12 @@ using CRSim.Core.Services;
using CRSim.ScreenSimulator.Models;
using System.Collections.ObjectModel;
using System.Windows;
namespace CRSim.ScreenSimulator.ViewModels.Daqingdong
namespace CRSim.ScreenSimulator.ViewModels.DaqingDong
{
public class PlatformScreenViewModel : ScreenViewModel
public class ConcourseBridgeScreenViewModel : ScreenViewModel
{
public ObservableCollection<TrainInfo> Screen { get; set; } = [];
public PlatformScreenViewModel(ITimeService timeService, ISettingsService settingsService)
public ConcourseBridgeScreenViewModel(ITimeService timeService, ISettingsService settingsService)
: base(timeService, settingsService)
{
StationType = StationType.Departure;

39
CRSim.ScreenSimulator/Views/Beijing/ArrivalScreenView.xaml
View File

@@ -9,7 +9,7 @@
xmlns:converters1="clr-namespace:CRSim.Shared.Converters;assembly=CRSim.Shared"
FontFamily="等线" FontSize="25" FontWeight="Bold"
Title="引导屏" SizeToContent="WidthAndHeight"
WindowStyle="None" AllowsTransparency="True" Background="#253f71"
WindowStyle="None" AllowsTransparency="True" Background="Black"
KeyDown="Window_KeyDown"
ResizeMode="NoResize" MouseDown="Window_MouseDown">
<Window.Resources>
@@ -17,7 +17,7 @@
<!-- 去除列头的间距 -->
<Setter Property="Padding" Value="0"/>
<Setter Property="Margin" Value="0"/>
<Setter Property="BorderBrush" Value="#253f71"/>
<Setter Property="BorderBrush" Value="Black"/>
<Setter Property="BorderThickness" Value="0"/>
</Style>
<converters:TrainStateColorConverter x:Key="TrainStateColorConverter"/>
@@ -29,29 +29,28 @@
<converters1:DateTimeToStringConverter x:Key="DateTimeToStringConverter" Format="HH:mm" />
</Window.Resources>
<StackPanel Orientation="Horizontal">
<Grid Background="#253f71" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Width="150">
<Grid.RowDefinitions>
<RowDefinition Height="*"/>
</Grid.RowDefinitions>
<TextBlock Text="{Binding ThisPlatform}" FontSize="50" TextAlignment="Center" VerticalAlignment="Center" FontFamily="黑体" FontWeight="Black" Foreground="#ffffff" Margin="10,0,0,25">
<StackPanel Orientation="Vertical" Background="Black" VerticalAlignment="Center">
<TextBlock Text="{Binding ThisPlatform}" FontSize="64" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="#ffffff">
<TextBlock.LayoutTransform>
<ScaleTransform ScaleX="1.25" ScaleY="1"/>
<ScaleTransform ScaleX="1.2" ScaleY="1"/>
</TextBlock.LayoutTransform>
</TextBlock>
<TextBlock Text="站台" FontSize="18" TextAlignment="Left" VerticalAlignment="Center" FontFamily="黑体" FontWeight="Black" Foreground="#ffffff" Margin="25,50,0,0" />
<TextBlock Text="Platform" FontSize="16" TextAlignment="Left" VerticalAlignment="Center" FontFamily="黑体" FontWeight="Black" Foreground="#ffffff" Margin="85,50,0,0" />
</Grid>
<StackPanel Orientation="Horizontal" Margin="10,0">
<TextBlock Text="站台" FontSize="18" VerticalAlignment="Center" Foreground="#ffffff" Margin="0,0,15,0"/>
<TextBlock Text="platform" FontSize="16" VerticalAlignment="Center" Foreground="#ffffff" />
</StackPanel>
</StackPanel>
<StackPanel Orientation="Vertical">
<DataGrid ItemsSource="{Binding Screen}" AutoGenerateColumns="False"
<DataGrid ItemsSource="{Binding Screen}" AutoGenerateColumns="False" BorderThickness="0"
CanUserResizeColumns="False" CanUserSortColumns="False" CanUserAddRows="False"
CanUserResizeRows="False" CanUserReorderColumns="False"
IsReadOnly="True" GridLinesVisibility="None" RowHeight="28" Foreground="White"
IsReadOnly="True" GridLinesVisibility="None" RowHeight="34" Foreground="White"
HeadersVisibility="Column" IsEnabled="False">
<DataGrid.Columns>
<DataGridTextColumn Binding="{Binding TrainNumber}">
<DataGridTextColumn.HeaderTemplate>
<DataTemplate>
<TextBlock Text="车次" Padding="2" HorizontalAlignment="Stretch" TextAlignment="Center" Background="#253f71" Width="110"/>
<TextBlock Text="车次" Padding="2" HorizontalAlignment="Stretch" TextAlignment="Center" Background="Black" Width="110"/>
</DataTemplate>
</DataGridTextColumn.HeaderTemplate>
<DataGridTextColumn.ElementStyle>
@@ -64,7 +63,7 @@
<DataGridTextColumn Binding="{Binding Origin}">
<DataGridTextColumn.HeaderTemplate>
<DataTemplate>
<TextBlock Text="始发站" Padding="2" HorizontalAlignment="Stretch" TextAlignment="Center" Background="#253f71" Width="110"/>
<TextBlock Text="始发站" Padding="2" HorizontalAlignment="Stretch" TextAlignment="Center" Background="Black" Width="110"/>
</DataTemplate>
</DataGridTextColumn.HeaderTemplate>
<DataGridTextColumn.ElementStyle>
@@ -77,7 +76,7 @@
<DataGridTextColumn Binding="{Binding Terminal}">
<DataGridTextColumn.HeaderTemplate>
<DataTemplate>
<TextBlock Text="终到站" Padding="2" HorizontalAlignment="Stretch" TextAlignment="Center" Background="#253f71" Width="110"/>
<TextBlock Text="终到站" Padding="2" HorizontalAlignment="Stretch" TextAlignment="Center" Background="Black" Width="110"/>
</DataTemplate>
</DataGridTextColumn.HeaderTemplate>
<DataGridTextColumn.ElementStyle>
@@ -90,7 +89,7 @@
<DataGridTextColumn Binding="{Binding ArrivalTime, Converter={StaticResource DateTimeToStringConverter}}">
<DataGridTextColumn.HeaderTemplate>
<DataTemplate>
<TextBlock Text="到点" Padding="2" HorizontalAlignment="Stretch" TextAlignment="Center" Background="#253f71" Width="100"/>
<TextBlock Text="到点" Padding="2" HorizontalAlignment="Stretch" TextAlignment="Center" Background="Black" Width="100"/>
</DataTemplate>
</DataGridTextColumn.HeaderTemplate>
<DataGridTextColumn.ElementStyle>
@@ -103,7 +102,7 @@
<DataGridTextColumn Binding="{Binding Platform}">
<DataGridTextColumn.HeaderTemplate>
<DataTemplate>
<TextBlock Text="站台" Padding="2" HorizontalAlignment="Stretch" TextAlignment="Center" Background="#253f71" Width="80"/>
<TextBlock Text="站台" Padding="2" HorizontalAlignment="Stretch" TextAlignment="Center" Background="Black" Width="80"/>
</DataTemplate>
</DataGridTextColumn.HeaderTemplate>
<DataGridTextColumn.ElementStyle>
@@ -116,7 +115,7 @@
<DataGridTextColumn>
<DataGridTextColumn.HeaderTemplate>
<DataTemplate>
<TextBlock Text="状态" Padding="2" HorizontalAlignment="Stretch" TextAlignment="Center" Background="#253f71" Width="130"/>
<TextBlock Text="状态" Padding="2" HorizontalAlignment="Stretch" TextAlignment="Center" Background="Black" Width="130"/>
</DataTemplate>
</DataGridTextColumn.HeaderTemplate>
<DataGridTextColumn.ElementStyle>
@@ -135,7 +134,7 @@
</DataGrid.Columns>
<DataGrid.RowStyle>
<Style TargetType="DataGridRow">
<Setter Property="Background" Value="#253f71"/>
<Setter Property="Background" Value="Black"/>
</Style>
</DataGrid.RowStyle>
</DataGrid>

46
CRSim.ScreenSimulator/Views/Daqingdong/PlatformScreenView.xaml → CRSim.ScreenSimulator/Views/DaqingDong/ConcourseBridgeScreen.xaml
View File

@@ -1,10 +1,10 @@
<Window x:Class="CRSim.ScreenSimulator.Views.Daqingdong.PlatformScreenView"
<Window x:Class="CRSim.ScreenSimulator.Views.DaqingDong.ConcourseBridgeScreenView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:pp="https://www.cnblogs.com/pumbaa"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:CRSim.ScreenSimulator.Views.Daqingdong"
xmlns:local="clr-namespace:CRSim.ScreenSimulator.Views.DaqingDong"
xmlns:sys="clr-namespace:System;assembly=mscorlib"
mc:Ignorable="d"
xmlns:converters="clr-namespace:CRSim.ScreenSimulator.Converters"
@@ -31,23 +31,18 @@
<converters1:DateTimeToStringConverter x:Key="DateTimeToStringConverter" Format="HH:mm" />
</Window.Resources>
<StackPanel Orientation="Horizontal">
<Grid Background="#2556ff" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Width="180">
<Grid.RowDefinitions>
<RowDefinition Height="*"/>
</Grid.RowDefinitions>
<TextBlock Text="{Binding ThisPlatform}" FontSize="80" TextAlignment="Center" VerticalAlignment="Center" FontFamily="黑体" FontWeight="Black" Foreground="#ffffff" Margin="-80,0,0,0">
<TextBlock.LayoutTransform>
<ScaleTransform ScaleX="1.25" ScaleY="1"/>
</TextBlock.LayoutTransform>
</TextBlock>
<TextBlock Text="站 台" FontSize="35" TextAlignment="Left" VerticalAlignment="Center" FontFamily="黑体" FontWeight="Black" Foreground="#ffffff" Margin="75,0,0,22" />
<TextBlock Text="Platfrom" FontSize="23" TextAlignment="Left" VerticalAlignment="Center" FontFamily="黑体" FontWeight="Black" Foreground="#ffffff" Margin="75,32,0,0" />
</Grid>
<StackPanel Background="#2556ff" Orientation="Horizontal">
<TextBlock Text="{Binding ThisPlatform}" FontSize="82" VerticalAlignment="Center" Foreground="#ffffff" Margin="6,0,0,0"/>
<StackPanel Orientation="Vertical" VerticalAlignment="Center" Margin="0,0,6,0">
<TextBlock Text="站 台" FontSize="35" VerticalAlignment="Center" Foreground="#ffffff" Margin="0,0,0,4"/>
<TextBlock Text="Platfrom" FontSize="22" VerticalAlignment="Center" Foreground="#ffffff"/>
</StackPanel>
</StackPanel>
<StackPanel Orientation="Vertical">
<DataGrid ItemsSource="{Binding Screen}" AutoGenerateColumns="False"
<DataGrid ItemsSource="{Binding Screen}" AutoGenerateColumns="False" BorderThickness="0"
CanUserResizeColumns="False" CanUserSortColumns="False" CanUserAddRows="False"
CanUserResizeRows="False" CanUserReorderColumns="False" ClipToBounds="False"
IsReadOnly="True" GridLinesVisibility="None" RowHeight="35" Foreground="White"
IsReadOnly="True" GridLinesVisibility="None" RowHeight="34" Foreground="White"
HeadersVisibility="Column" IsEnabled="False">
<DataGrid.Columns>
<DataGridTextColumn>
@@ -171,17 +166,12 @@
</DataGrid.CellStyle>
</DataGrid>
</StackPanel>
<Grid Background="#2556ff" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Width="180">
<Grid.RowDefinitions>
<RowDefinition Height="*"/>
</Grid.RowDefinitions>
<TextBlock Text="{Binding ThisPlatform}" FontSize="80" TextAlignment="Center" VerticalAlignment="Center" FontFamily="黑体" FontWeight="Black" Foreground="#ffffff" Margin="-85,0,0,0">
<TextBlock.LayoutTransform>
<ScaleTransform ScaleX="1.25" ScaleY="1"/>
</TextBlock.LayoutTransform>
</TextBlock>
<TextBlock Text="站 台" FontSize="35" TextAlignment="Left" VerticalAlignment="Center" FontFamily="黑体" FontWeight="Black" Foreground="#ffffff" Margin="75,0,0,22" />
<TextBlock Text="Platfrom" FontSize="23" TextAlignment="Left" VerticalAlignment="Center" FontFamily="黑体" FontWeight="Black" Foreground="#ffffff" Margin="75,32,0,0" />
</Grid>
<StackPanel Background="#2556ff" Orientation="Horizontal">
<TextBlock Text="{Binding ThisPlatform}" FontSize="82" VerticalAlignment="Center" Foreground="#ffffff" Margin="6,0,0,0"/>
<StackPanel Orientation="Vertical" VerticalAlignment="Center" Margin="0,0,6,0">
<TextBlock Text="站 台" FontSize="35" VerticalAlignment="Center" Foreground="#ffffff" Margin="0,0,0,4"/>
<TextBlock Text="Platfrom" FontSize="22" VerticalAlignment="Center" Foreground="#ffffff"/>
</StackPanel>
</StackPanel>
</StackPanel>
</Window>

10
CRSim.ScreenSimulator/Views/Daqingdong/PlatformScreenView.xaml.cs → CRSim.ScreenSimulator/Views/DaqingDong/ConcourseBridgeScreen.xaml.cs
View File

@@ -1,16 +1,16 @@
using CRSim.ScreenSimulator.ViewModels.Daqingdong;
using CRSim.ScreenSimulator.ViewModels.DaqingDong;
using System.Windows;
using System.Windows.Input;
using System.Windows.Media;
namespace CRSim.ScreenSimulator.Views.Daqingdong
namespace CRSim.ScreenSimulator.Views.DaqingDong
{
/// <summary>
/// SecondaryScreen.xaml 的交互逻辑
/// </summary>
public partial class PlatformScreenView : Window
public partial class ConcourseBridgeScreenView : Window
{
public PlatformScreenViewModel ViewModel { get; }
public PlatformScreenView(PlatformScreenViewModel viewModel)
public ConcourseBridgeScreenViewModel ViewModel { get; }
public ConcourseBridgeScreenView(ConcourseBridgeScreenViewModel viewModel)
{
InitializeComponent();
RenderOptions.SetEdgeMode(this, EdgeMode.Aliased);

50
CRSim.ScreenSimulator/Views/Zibo/ConcourseBridgeScreenView.xaml
View File

@@ -31,27 +31,25 @@
<converters1:DateTimeToStringConverter x:Key="DateTimeToStringConverter" Format="HH:mm" />
</Window.Resources>
<StackPanel Orientation="Horizontal">
<Grid Background="#000000" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" MinWidth="220">
<Grid.RowDefinitions>
<RowDefinition Height="*"/>
</Grid.RowDefinitions>
<Grid Width="40" Height="30" Margin="-70,0,30,0">
<Path Data="M1221 2752 c-470 -449 -856 -822 -858 -828 -2 -6 329 -338 735 -737 l740 -726 692 -31 c381 -17 694 -29 695 -28 1 2 -208 275 -465 608 l-467 605 1453 3 1454 2 0 375 0 375 -1477 0 -1478 0 580 580 c472 472 575 580 555 580 -14 0 -304 9 -645 20 -341 11 -629 19 -640 19 -12 0 -343 -310 -874 -817z" Stroke="White" Fill="White" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Stretch="Uniform"/>
</Grid>
<TextBlock Text="{Binding ThisPlatform}" FontSize="60" TextAlignment="Center" VerticalAlignment="Center" FontFamily="黑体" FontWeight="Black" Foreground="#ffffff" Margin="10,0,0,0">
<StackPanel Orientation="Horizontal" Background="#000000" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
<Path Height="30" Width="40" Stroke="White" Fill="White" Stretch="Uniform" Margin="20,0,10,0"
Data="M1221 2752 c-470 -449 -856 -822 -858 -828 -2 -6 329 -338 735 -737 l740 -726 692 -31 c381 -17 694 -29 695 -28 1 2 -208 275 -465 608 l-467 605 1453 3 1454 2 0 375 0 375 -1477 0 -1478 0 580 580 c472 472 575 580 555 580 -14 0 -304 9 -645 20 -341 11 -629 19 -640 19 -12 0 -343 -310 -874 -817z"/>
<TextBlock Text="{Binding ThisPlatform}" FontSize="60" VerticalAlignment="Center" FontFamily="黑体" Foreground="#ffffff" FontWeight="Normal">
<TextBlock.LayoutTransform>
<ScaleTransform ScaleX="1.25" ScaleY="1"/>
<ScaleTransform ScaleX="1.2" ScaleY="1"/>
</TextBlock.LayoutTransform>
</TextBlock>
<TextBlock Text="站台" FontSize="23" TextAlignment="Left" VerticalAlignment="Center" FontFamily="黑体" FontWeight="Black" Foreground="#ffffff" Margin="140,0,0,12" />
<TextBlock Text="Platfrom" FontSize="16" TextAlignment="Left" VerticalAlignment="Center" FontFamily="黑体" FontWeight="Black" Foreground="#ffffff" Margin="140,23,0,0" />
</Grid>
<StackPanel Orientation="Vertical" VerticalAlignment="Center">
<TextBlock Text="站台" FontSize="23" VerticalAlignment="Center" FontFamily="黑体" Foreground="#ffffff" />
<TextBlock Text="Platfrom" FontSize="16" VerticalAlignment="Center" FontFamily="Arial" Foreground="#ffffff" Margin="0,0,20,0"/>
</StackPanel>
</StackPanel>
<StackPanel Orientation="Vertical">
<DataGrid ItemsSource="{Binding Screen}" AutoGenerateColumns="False"
<DataGrid ItemsSource="{Binding Screen}" AutoGenerateColumns="False" BorderThickness="0"
CanUserResizeColumns="False" CanUserSortColumns="False" CanUserAddRows="False"
CanUserResizeRows="False" CanUserReorderColumns="False" ClipToBounds="False"
IsReadOnly="True" GridLinesVisibility="None" RowHeight="28" Foreground="White"
HeadersVisibility="Column" IsEnabled="False">
IsReadOnly="True" GridLinesVisibility="None" RowHeight="34" Foreground="White"
HeadersVisibility="Column" IsEnabled="False" Margin="0,4">
<DataGrid.Columns>
<DataGridTextColumn>
<DataGridTextColumn.HeaderTemplate>
@@ -155,20 +153,18 @@
</DataGrid.RowStyle>
</DataGrid>
</StackPanel>
<Grid Background="#000000" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" MinWidth="220">
<Grid.RowDefinitions>
<RowDefinition Height="*"/>
</Grid.RowDefinitions>
<TextBlock Text="{Binding ThisPlatform}" FontSize="60" TextAlignment="Center" VerticalAlignment="Center" FontFamily="黑体" FontWeight="Black" Foreground="#ffffff" Margin="-100,0,0,0">
<StackPanel Orientation="Horizontal" Background="#000000" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
<TextBlock Text="{Binding ThisPlatform}" FontSize="60" VerticalAlignment="Center" FontFamily="黑体" Foreground="#ffffff" FontWeight="Normal" Margin="20,0,0,0">
<TextBlock.LayoutTransform>
<ScaleTransform ScaleX="1.25" ScaleY="1"/>
<ScaleTransform ScaleX="1.2" ScaleY="1"/>
</TextBlock.LayoutTransform>
</TextBlock>
<TextBlock Text="站台" FontSize="23" TextAlignment="Right" VerticalAlignment="Center" FontFamily="黑体" FontWeight="Black" Foreground="#ffffff" Margin="0,0,70,12" />
<TextBlock Text="Platfrom" FontSize="16" TextAlignment="Right" VerticalAlignment="Center" FontFamily="黑体" FontWeight="Black" Foreground="#ffffff" Margin="0,23,70,0" />
<Grid Width="40" Height="30" Margin="130,0,0,0">
<Path Data="M3235 3549 c-291 -9 -555 -18 -585 -18 l-55 -1 580 -580 580 -580 -1478 0 -1477 0 0 -375 0 -375 1454 -2 1453 -3 -467 -605 c-257 -333 -466 -606 -465 -608 1 -1 314 11 695 28 l692 31 739 725 c407 399 739 730 739 734 0 5 -387 378 -860 830 l-860 820 -77 -1 c-43 -1 -316 -10 -608 -20z" Stroke="White" Fill="White" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Stretch="Uniform"/>
</Grid>
</Grid>
<StackPanel Orientation="Vertical" VerticalAlignment="Center">
<TextBlock Text="站台" FontSize="23" VerticalAlignment="Center" FontFamily="黑体" Foreground="#ffffff" />
<TextBlock Text="Platfrom" FontSize="16" VerticalAlignment="Center" FontFamily="Arial" Foreground="#ffffff"/>
</StackPanel>
<Path Height="30" Width="40" Stroke="White" Fill="White" Stretch="Uniform" Margin="10,0,20,0"
Data="M3235 3549 c-291 -9 -555 -18 -585 -18 l-55 -1 580 -580 580 -580 -1478 0 -1477 0 0 -375 0 -375 1454 -2 1453 -3 -467 -605 c-257 -333 -466 -606 -465 -608 1 -1 314 11 695 28 l692 31 739 725 c407 399 739 730 739 734 0 5 -387 378 -860 830 l-860 820 -77 -1 c-43 -1 -316 -10 -608 -20z"/>
</StackPanel>
</StackPanel>
</Window>

4
CRSim/App.xaml.cs
View File

@@ -83,8 +83,8 @@
services.AddTransient<ScreenSimulator.Views.Ankang.ExitScreenView>();
services.AddTransient<ScreenSimulator.Views.Beijing.ArrivalScreenView>();
services.AddTransient<ScreenSimulator.ViewModels.Beijing.ArrivalScreenViewModel>();
services.AddTransient<ScreenSimulator.Views.Daqingdong.PlatformScreenView>();
services.AddTransient<ScreenSimulator.ViewModels.Daqingdong.PlatformScreenViewModel>();
services.AddTransient<ScreenSimulator.Views.DaqingDong.ConcourseBridgeScreenView>();
services.AddTransient<ScreenSimulator.ViewModels.DaqingDong.ConcourseBridgeScreenViewModel>();
}).Build();
[STAThread]

0
CRSim/Assets/StyleImages/Daqingdong/PlatformScreen.png → CRSim/Assets/StyleImages/DaqingDong/ConcourseBridgeScreen.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.1 KiB

After

Width:  |  Height:  |  Size: 5.1 KiB

2
CRSim/CRSim.csproj
View File

@@ -73,7 +73,7 @@
<Resource Include="Assets\StyleImages\Zibo\PlatformScreen.png" />
<Resource Include="Assets\StyleImages\Zibo\ConcourseBridgeScreen.png" />
<Resource Include="Assets\StyleImages\Beijing\ArrivalScreen.png" />
<Resource Include="Assets\StyleImages\Daqingdong\PlatformScreen.png" />
<Resource Include="Assets\StyleImages\DaqingDong\ConcourseBridgeScreen.png" />
<Resource Include="Assets\win11-dashboard.dark.png" />
<Resource Include="Assets\win11-dashboard.light.png" />
<EmbeddedResource Include="Models\StylesInfoData.json" />

14
CRSim/Models/StylesInfoData.json
View File

@@ -217,7 +217,7 @@
"Title": "淄博站廊桥看板",
"Station": "淄博",
"Author": "wxl0430",
"Type": "站台屏",
"Type": "走廊出发屏",
"ImagePath": "Assets/StyleImages/Zibo/ConcourseBridgeScreen.png",
"Parameters": [
"Station",
@@ -262,10 +262,10 @@
},
{
"UniqueId": "Beijing.ArrivalScreen",
"Title": "北京站到达看板",
"Title": "北京站地道到达看板",
"Station": "北京",
"Author": "wxl0430",
"Type": "到达屏（站台）",
"Type": "走廊到达屏",
"ImagePath": "Assets/StyleImages/Beijing/ArrivalScreen.png",
"Parameters": [
"Station",
@@ -273,12 +273,12 @@
]
},
{
"UniqueId": "Daqingdong.PlatformScreen",
"Title": "大庆东站站台看板",
"UniqueId": "DaqingDong.ConcourseBridgeScreen",
"Title": "大庆东站廊桥看板",
"Station": "大庆东",
"Author": "wxl0430",
"Type": "站台屏",
"ImagePath": "Assets/StyleImages/Daqingdong/PlatformScreen.png",
"Type": "走廊出发屏",
"ImagePath": "Assets/StyleImages/DaqingDong/ConcourseBridgeScreen.png",
"Parameters": [
"Station",
"Platform",