diff --git a/CRSim.ScreenSimulator/Views/BeijingNan/SecondaryPlatformScreenView.xaml b/CRSim.ScreenSimulator/Views/BeijingNan/SecondaryPlatformScreenView.xaml index d6db153..59f9fb4 100644 --- a/CRSim.ScreenSimulator/Views/BeijingNan/SecondaryPlatformScreenView.xaml +++ b/CRSim.ScreenSimulator/Views/BeijingNan/SecondaryPlatformScreenView.xaml @@ -8,55 +8,25 @@ mc:Ignorable="d" Foreground="#df3a38" xmlns:converters="clr-namespace:CRSim.ScreenSimulator.Converters" xmlns:converters1="clr-namespace:CRSim.Shared.Converters;assembly=CRSim.Shared" - FontFamily="黑体" FontSize="25" FontWeight="Bold" + FontFamily="宋体" FontSize="25" FontWeight="Bold" Title="引导屏" SizeToContent="WidthAndHeight" WindowStyle="None" AllowsTransparency="True" Background="Black" xmlns:views="clr-namespace:CRSim.ScreenSimulator.Views" ResizeMode="NoResize"> - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + @@ -66,10 +36,10 @@ - - - - + + + + @@ -78,7 +48,11 @@ - - + + + + diff --git a/CRSim.ScreenSimulator/Views/BeijingNan/TicketCheckScreenView.xaml b/CRSim.ScreenSimulator/Views/BeijingNan/TicketCheckScreenView.xaml index 051410d..d2d2dac 100644 --- a/CRSim.ScreenSimulator/Views/BeijingNan/TicketCheckScreenView.xaml +++ b/CRSim.ScreenSimulator/Views/BeijingNan/TicketCheckScreenView.xaml @@ -1,9 +1,9 @@ - - + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CRSim.ScreenSimulator/Views/BeijingNan/TicketCheckScreenView.xaml.cs b/CRSim.ScreenSimulator/Views/BeijingNan/TicketCheckScreenView.xaml.cs index 0b78974..4e5f6d0 100644 --- a/CRSim.ScreenSimulator/Views/BeijingNan/TicketCheckScreenView.xaml.cs +++ b/CRSim.ScreenSimulator/Views/BeijingNan/TicketCheckScreenView.xaml.cs @@ -1,12 +1,6 @@ using CRSim.ScreenSimulator.ViewModels.BeijingNan; -using System.Windows; -using System.Windows.Input; -using System.Windows.Media; namespace CRSim.ScreenSimulator.Views.BeijingNan { - /// - /// SecondaryScreen.xaml 的交互逻辑 - /// public partial class TicketCheckScreenView : BaseScreenView { public TicketCheckScreenViewModel ViewModel { get; }