chore: 适配最新commit

This commit is contained in:
denglihong2007
2025-05-18 22:10:57 +08:00
parent bb15ff623e
commit 51f3e1f183
4 changed files with 8 additions and 45 deletions

View File

@@ -15,7 +15,12 @@
<converters1:ListToStringConverter x:Key="ListToStringConverter" Separator="" />
<converters1:DateTimeToStringConverter x:Key="DateTimeToStringConverter" Format="HH:mm" />
<converters:TrainStateConverter x:Key="TrainStateConverter" WaitingText="正在候车"/>
<converters:TrainStateColorConverter x:Key="TrainStateColorConverter" DisplayMode="Alternating_Row_Colors" CheckingTicketsColor="#1f5b54"/>
<converters:TrainStateColorConverter x:Key="TrainStateColorConverter" DisplayMode="Alternating_Row_Colors" CheckingTicketsColor="#1f5b54">
<converters:TrainStateColorConverter.WaitingColorList>
<SolidColorBrush Color="White"/>
<SolidColorBrush Color="#edd16f"/>
</converters:TrainStateColorConverter.WaitingColorList>
</converters:TrainStateColorConverter>
<converters:TextSpacingConverter x:Key="TextSpacingConverter" />
<Style TargetType="DataGridColumnHeader">
<Setter Property="Padding" Value="0"/>

View File

@@ -1,9 +1,4 @@
using CRSim.ScreenSimulator.ViewModels.BeijingNan;
using CRSim.ScreenSimulator.Converters;
using System.Windows;
using System.Collections.Generic;
using System.Windows.Media;
namespace CRSim.ScreenSimulator.Views.BeijingNan
{
public partial class PrimaryScreenView : BaseScreenView
@@ -14,13 +9,6 @@ namespace CRSim.ScreenSimulator.Views.BeijingNan
InitializeComponent();
ViewModel = viewModel;
DataContext = viewModel;
var trainStateColorConverter = (TrainStateColorConverter)Resources["TrainStateColorConverter"];
trainStateColorConverter.WaitingColorList = new List<SolidColorBrush>
{
new SolidColorBrush(Colors.White),
new SolidColorBrush((Color)ColorConverter.ConvertFromString("#edd16f"))
};
}
}
}