diff --git a/CRSim.ScreenSimulator/ViewModels/ScreenViewModel.cs b/CRSim.ScreenSimulator/ViewModels/ScreenViewModel.cs index 00f6155..7a1bed7 100644 --- a/CRSim.ScreenSimulator/ViewModels/ScreenViewModel.cs +++ b/CRSim.ScreenSimulator/ViewModels/ScreenViewModel.cs @@ -24,8 +24,8 @@ namespace CRSim.ScreenSimulator.ViewModels private string _thisPlatform; [ObservableProperty] private string _thisTicketCheck; - public ObservableCollection LeftScreen { get; private set; } = []; - public ObservableCollection RightScreen { get; private set; } = []; + public ObservableCollection ScreenA { get; private set; } = []; + public ObservableCollection ScreenB { get; private set; } = []; public List TrainInfo { get; set; } = []; @@ -148,13 +148,13 @@ namespace CRSim.ScreenSimulator.ViewModels { for (int i = 0; i < ItemsPerPage; i++) { - LeftScreen.Add(TrainInfo.Count > i ? TrainInfo[i] : new()); + ScreenA.Add(TrainInfo.Count > i ? TrainInfo[i] : new()); } - if(LeftScreen.Count > ItemsPerPage) + if(ScreenA.Count > ItemsPerPage) { for (int i = 0; i < ItemsPerPage; i++) { - LeftScreen.RemoveAt(0); + ScreenA.RemoveAt(0); } } return; @@ -166,7 +166,7 @@ namespace CRSim.ScreenSimulator.ViewModels { case 1: { - LeftScreen.Clear(); + ScreenA.Clear(); var items = TrainInfo.Skip(startIndex).Take(ItemsPerPage).ToList(); while (items.Count < ItemsPerPage) { @@ -174,14 +174,14 @@ namespace CRSim.ScreenSimulator.ViewModels } foreach (var item in items) { - LeftScreen.Add(item); + ScreenA.Add(item); } break; } case 2: { - LeftScreen.Clear(); - RightScreen.Clear(); + ScreenA.Clear(); + ScreenB.Clear(); var leftItems = TrainInfo.Skip(startIndex).Take(ItemsPerPage).ToList(); while (leftItems.Count < ItemsPerPage) @@ -190,7 +190,7 @@ namespace CRSim.ScreenSimulator.ViewModels } foreach (var item in leftItems) { - LeftScreen.Add(item); + ScreenA.Add(item); } var rightItems = TrainInfo.Skip(startIndex + ItemsPerPage).Take(ItemsPerPage).ToList(); @@ -200,7 +200,7 @@ namespace CRSim.ScreenSimulator.ViewModels } foreach (var item in rightItems) { - RightScreen.Add(item); + ScreenB.Add(item); } break; } diff --git a/CRSim.ScreenSimulator/ViewModels/Zibo/TicketCheckScreenViewModel.cs b/CRSim.ScreenSimulator/ViewModels/Zibo/TicketCheckScreenViewModel.cs index 250fe9c..ce9a4c2 100644 --- a/CRSim.ScreenSimulator/ViewModels/Zibo/TicketCheckScreenViewModel.cs +++ b/CRSim.ScreenSimulator/ViewModels/Zibo/TicketCheckScreenViewModel.cs @@ -19,8 +19,8 @@ namespace CRSim.ScreenSimulator.ViewModels.Zibo Application.Current.Dispatcher.Invoke(() => { int pageCount = (int)Math.Ceiling((double)TrainInfo.Count / (ItemsPerPage * PageCount.Value)); - LeftScreen.Clear(); - RightScreen.Clear(); + ScreenA.Clear(); + ScreenB.Clear(); int startIndex = CurrentPageIndex * ItemsPerPage * PageCount.Value; var ItemsToShow = TrainInfo.Skip(startIndex).Take(ItemsPerPage * PageCount.Value).ToList(); var leftItems = ItemsToShow.Where((item, index) => index % 2 == 0).ToList(); @@ -35,11 +35,11 @@ namespace CRSim.ScreenSimulator.ViewModels.Zibo } foreach (var item in leftItems) { - LeftScreen.Add(item); + ScreenA.Add(item); } foreach (var item in rightItems) { - RightScreen.Add(item); + ScreenB.Add(item); } CurrentPageIndex = CurrentPageIndex + 1 >= Math.Min(_settings.MaxPages, pageCount) ? 0 : CurrentPageIndex + 1; }); diff --git a/CRSim.ScreenSimulator/Views/Ankang/ExitScreenView.xaml b/CRSim.ScreenSimulator/Views/Ankang/ExitScreenView.xaml index 77c53cb..c50fe2b 100644 --- a/CRSim.ScreenSimulator/Views/Ankang/ExitScreenView.xaml +++ b/CRSim.ScreenSimulator/Views/Ankang/ExitScreenView.xaml @@ -8,8 +8,6 @@ xmlns:views="clr-namespace:CRSim.ScreenSimulator.Views" xmlns:converters="clr-namespace:CRSim.ScreenSimulator.Converters" xmlns:converters1="clr-namespace:CRSim.Shared.Converters;assembly=CRSim.Shared" - Title="引导屏" SizeToContent="WidthAndHeight" - WindowStyle="None" AllowsTransparency="True" Background="Transparent" ResizeMode="NoResize" FontFamily="微软雅黑" FontSize="20"> @@ -25,6 +23,7 @@ - + AlternationCount="2" > @@ -151,7 +150,7 @@ - + diff --git a/CRSim.ScreenSimulator/Views/BaseDataGrid.cs b/CRSim.ScreenSimulator/Views/BaseDataGrid.cs new file mode 100644 index 0000000..d290aeb --- /dev/null +++ b/CRSim.ScreenSimulator/Views/BaseDataGrid.cs @@ -0,0 +1,23 @@ +using System.Windows; +using System.Windows.Controls; + +namespace CRSim.ScreenSimulator.Views +{ + public class BaseDataGrid : DataGrid + { + public BaseDataGrid() + { + GridLinesVisibility = DataGridGridLinesVisibility.None; + HeadersVisibility = DataGridHeadersVisibility.Column; + BorderThickness = new Thickness(0); + CanUserResizeRows = false; + CanUserReorderColumns = false; + CanUserResizeColumns = false; + CanUserSortColumns = false; + CanUserAddRows = false; + AutoGenerateColumns = false; + IsEnabled = false; + IsReadOnly = true; + } + } +} diff --git a/CRSim.ScreenSimulator/Views/BaseScreenView.cs b/CRSim.ScreenSimulator/Views/BaseScreenView.cs index c4a0e8e..084d50f 100644 --- a/CRSim.ScreenSimulator/Views/BaseScreenView.cs +++ b/CRSim.ScreenSimulator/Views/BaseScreenView.cs @@ -2,11 +2,9 @@ using System.IO; using System.Text.Json; using System.Text.Json.Serialization; -using System.Threading.Tasks; using System.Windows; using System.Windows.Input; using System.Windows.Media; -using static System.Net.Mime.MediaTypeNames; namespace CRSim.ScreenSimulator.Views { @@ -15,10 +13,16 @@ namespace CRSim.ScreenSimulator.Views public Guid SessionID; protected BaseScreenView() { + Title = "引导屏"; + Background = Brushes.Transparent; RenderOptions.SetEdgeMode(this, EdgeMode.Aliased); MouseDown += Window_MouseDown; KeyDown += Window_KeyDown; Unloaded += Window_Unloaded; + SizeToContent = SizeToContent.WidthAndHeight; + ResizeMode = ResizeMode.NoResize; + WindowStyle = WindowStyle.None; + AllowsTransparency = true; } private async void Window_Unloaded(object sender, RoutedEventArgs e) diff --git a/CRSim.ScreenSimulator/Views/Beijing/ArrivalScreenView.xaml b/CRSim.ScreenSimulator/Views/Beijing/ArrivalScreenView.xaml index 813d9b2..3655d10 100644 --- a/CRSim.ScreenSimulator/Views/Beijing/ArrivalScreenView.xaml +++ b/CRSim.ScreenSimulator/Views/Beijing/ArrivalScreenView.xaml @@ -8,10 +8,7 @@ xmlns:views="clr-namespace:CRSim.ScreenSimulator.Views" xmlns:converters="clr-namespace:CRSim.ScreenSimulator.Converters" xmlns:converters1="clr-namespace:CRSim.Shared.Converters;assembly=CRSim.Shared" - FontFamily="等线" FontSize="25" FontWeight="Bold" - Title="引导屏" SizeToContent="WidthAndHeight" - WindowStyle="None" AllowsTransparency="True" Background="Black" - ResizeMode="NoResize"> + FontFamily="等线" FontSize="25" FontWeight="Bold" Background="Black"> @@ -68,6 +62,7 @@ @@ -81,6 +76,7 @@ @@ -94,6 +90,7 @@ @@ -107,6 +104,7 @@ @@ -120,6 +118,7 @@ - + diff --git a/CRSim.ScreenSimulator/Views/BeijingNan/PrimaryScreenView.xaml b/CRSim.ScreenSimulator/Views/BeijingNan/PrimaryScreenView.xaml index a45ee01..a7c140b 100644 --- a/CRSim.ScreenSimulator/Views/BeijingNan/PrimaryScreenView.xaml +++ b/CRSim.ScreenSimulator/Views/BeijingNan/PrimaryScreenView.xaml @@ -7,10 +7,7 @@ mc:Ignorable="d" xmlns:views="clr-namespace:CRSim.ScreenSimulator.Views" xmlns:converters="clr-namespace:CRSim.ScreenSimulator.Converters" - xmlns:converters1="clr-namespace:CRSim.Shared.Converters;assembly=CRSim.Shared" - Title="引导屏" SizeToContent="WidthAndHeight" - WindowStyle="None" AllowsTransparency="True" Background="Transparent" - ResizeMode="NoResize"> + xmlns:converters1="clr-namespace:CRSim.Shared.Converters;assembly=CRSim.Shared"> @@ -29,6 +26,7 @@ - + AlternationCount="2" > @@ -165,6 +163,6 @@ - + diff --git a/CRSim.ScreenSimulator/Views/BeijingNan/SecondaryPlatformScreenView.xaml b/CRSim.ScreenSimulator/Views/BeijingNan/SecondaryPlatformScreenView.xaml index 59f9fb4..9472b89 100644 --- a/CRSim.ScreenSimulator/Views/BeijingNan/SecondaryPlatformScreenView.xaml +++ b/CRSim.ScreenSimulator/Views/BeijingNan/SecondaryPlatformScreenView.xaml @@ -9,10 +9,7 @@ xmlns:converters="clr-namespace:CRSim.ScreenSimulator.Converters" xmlns:converters1="clr-namespace:CRSim.Shared.Converters;assembly=CRSim.Shared" FontFamily="宋体" FontSize="25" FontWeight="Bold" - Title="引导屏" SizeToContent="WidthAndHeight" - WindowStyle="None" AllowsTransparency="True" Background="Black" - xmlns:views="clr-namespace:CRSim.ScreenSimulator.Views" - ResizeMode="NoResize"> + xmlns:views="clr-namespace:CRSim.ScreenSimulator.Views"> @@ -20,16 +17,16 @@ - + - + - + @@ -42,7 +39,7 @@ - + diff --git a/CRSim.ScreenSimulator/Views/BeijingNan/TicketCheckScreenView.xaml b/CRSim.ScreenSimulator/Views/BeijingNan/TicketCheckScreenView.xaml index d2d2dac..27dd4bd 100644 --- a/CRSim.ScreenSimulator/Views/BeijingNan/TicketCheckScreenView.xaml +++ b/CRSim.ScreenSimulator/Views/BeijingNan/TicketCheckScreenView.xaml @@ -7,11 +7,8 @@ mc:Ignorable="d" xmlns:converters="clr-namespace:CRSim.ScreenSimulator.Converters" xmlns:converters1="clr-namespace:CRSim.Shared.Converters;assembly=CRSim.Shared" - FontFamily="等线" FontSize="20" FontWeight="Bold" - Title="引导屏" SizeToContent="WidthAndHeight" - WindowStyle="None" AllowsTransparency="True" Background="#0036DF" - xmlns:views="clr-namespace:CRSim.ScreenSimulator.Views" - ResizeMode="NoResize"> + FontFamily="等线" FontSize="20" FontWeight="Bold" Background="#0036DF" + xmlns:views="clr-namespace:CRSim.ScreenSimulator.Views"> @@ -54,6 +48,7 @@ @@ -67,6 +62,7 @@ @@ -81,6 +77,7 @@ @@ -123,6 +120,7 @@ - + diff --git a/CRSim.ScreenSimulator/Views/BeijingXi/PrimaryScreenView.xaml b/CRSim.ScreenSimulator/Views/BeijingXi/PrimaryScreenView.xaml index 3e8264a..67180b8 100644 --- a/CRSim.ScreenSimulator/Views/BeijingXi/PrimaryScreenView.xaml +++ b/CRSim.ScreenSimulator/Views/BeijingXi/PrimaryScreenView.xaml @@ -7,10 +7,7 @@ mc:Ignorable="d" xmlns:views="clr-namespace:CRSim.ScreenSimulator.Views" xmlns:converters="clr-namespace:CRSim.ScreenSimulator.Converters" - xmlns:converters1="clr-namespace:CRSim.Shared.Converters;assembly=CRSim.Shared" - Title="引导屏" SizeToContent="WidthAndHeight" - WindowStyle="None" AllowsTransparency="True" Background="Transparent" - ResizeMode="NoResize"> + xmlns:converters1="clr-namespace:CRSim.Shared.Converters;assembly=CRSim.Shared"> @@ -24,6 +21,7 @@ - + @@ -150,13 +144,13 @@ - - + + AlternationCount="2" > @@ -245,6 +239,6 @@ - + diff --git a/CRSim.ScreenSimulator/Views/ChengduDong/PillarTicketCheckScreenView.xaml b/CRSim.ScreenSimulator/Views/ChengduDong/PillarTicketCheckScreenView.xaml index abae693..8a5f73f 100644 --- a/CRSim.ScreenSimulator/Views/ChengduDong/PillarTicketCheckScreenView.xaml +++ b/CRSim.ScreenSimulator/Views/ChengduDong/PillarTicketCheckScreenView.xaml @@ -8,10 +8,7 @@ mc:Ignorable="d" xmlns:converters="clr-namespace:CRSim.ScreenSimulator.Converters" xmlns:converters1="clr-namespace:CRSim.Shared.Converters;assembly=CRSim.Shared" - Title="引导屏" SizeToContent="WidthAndHeight" - WindowStyle="None" AllowsTransparency="True" Background="Transparent" - xmlns:views="clr-namespace:CRSim.ScreenSimulator.Views" FontFamily="宋体" FontSize="28" - ResizeMode="NoResize"> + xmlns:views="clr-namespace:CRSim.ScreenSimulator.Views" FontFamily="宋体" FontSize="28"> diff --git a/CRSim.ScreenSimulator/Views/ChengduDong/PrimaryTicketCheckScreenView.xaml b/CRSim.ScreenSimulator/Views/ChengduDong/PrimaryTicketCheckScreenView.xaml index 4fc9101..046f2ac 100644 --- a/CRSim.ScreenSimulator/Views/ChengduDong/PrimaryTicketCheckScreenView.xaml +++ b/CRSim.ScreenSimulator/Views/ChengduDong/PrimaryTicketCheckScreenView.xaml @@ -7,11 +7,8 @@ mc:Ignorable="d" xmlns:converters="clr-namespace:CRSim.ScreenSimulator.Converters" xmlns:converters1="clr-namespace:CRSim.Shared.Converters;assembly=CRSim.Shared" - FontFamily="等线" FontSize="20" FontWeight="Bold" - Title="引导屏" SizeToContent="WidthAndHeight" - WindowStyle="None" AllowsTransparency="True" Background="#0036DF" - xmlns:views="clr-namespace:CRSim.ScreenSimulator.Views" - ResizeMode="NoResize"> + FontFamily="等线" FontSize="20" FontWeight="Bold" Background="#0036DF" + xmlns:views="clr-namespace:CRSim.ScreenSimulator.Views"> @@ -55,6 +49,7 @@ @@ -68,6 +63,7 @@ @@ -82,6 +78,7 @@ @@ -139,19 +136,20 @@ - - + + - - + + diff --git a/CRSim.ScreenSimulator/Views/ChengduDong/SecondaryScreenView.xaml b/CRSim.ScreenSimulator/Views/ChengduDong/SecondaryScreenView.xaml index 9050e91..ece418b 100644 --- a/CRSim.ScreenSimulator/Views/ChengduDong/SecondaryScreenView.xaml +++ b/CRSim.ScreenSimulator/Views/ChengduDong/SecondaryScreenView.xaml @@ -7,13 +7,9 @@ mc:Ignorable="d" xmlns:converters="clr-namespace:CRSim.ScreenSimulator.Converters" xmlns:converters1="clr-namespace:CRSim.Shared.Converters;assembly=CRSim.Shared" - Title="引导屏" SizeToContent="WidthAndHeight" - WindowStyle="None" AllowsTransparency="True" Background="Transparent" - xmlns:views="clr-namespace:CRSim.ScreenSimulator.Views" - ResizeMode="NoResize"> + xmlns:views="clr-namespace:CRSim.ScreenSimulator.Views"> - - + + - - - - + + + + @@ -238,6 +230,7 @@ - - + + - - + + diff --git a/CRSim.ScreenSimulator/Views/ChengduMetro/PlatformScreenView.xaml b/CRSim.ScreenSimulator/Views/ChengduMetro/PlatformScreenView.xaml index c834955..225ff67 100644 --- a/CRSim.ScreenSimulator/Views/ChengduMetro/PlatformScreenView.xaml +++ b/CRSim.ScreenSimulator/Views/ChengduMetro/PlatformScreenView.xaml @@ -8,10 +8,8 @@ mc:Ignorable="d" xmlns:converters="clr-namespace:CRSim.ScreenSimulator.Converters" xmlns:converters1="clr-namespace:CRSim.Shared.Converters;assembly=CRSim.Shared" - Title="引导屏" SizeToContent="WidthAndHeight" - WindowStyle="None" AllowsTransparency="True" Background="Transparent" - xmlns:views="clr-namespace:CRSim.ScreenSimulator.Views" FontFamily="DengXian" FontWeight="SemiBold" - ResizeMode="NoResize"> + Title="引导屏" + xmlns:views="clr-namespace:CRSim.ScreenSimulator.Views" FontFamily="DengXian" FontWeight="SemiBold"> diff --git a/CRSim.ScreenSimulator/Views/DaqingDong/ConcourseBridgeScreenView.xaml b/CRSim.ScreenSimulator/Views/DaqingDong/ConcourseBridgeScreenView.xaml index 9c9acb7..e0e9b71 100644 --- a/CRSim.ScreenSimulator/Views/DaqingDong/ConcourseBridgeScreenView.xaml +++ b/CRSim.ScreenSimulator/Views/DaqingDong/ConcourseBridgeScreenView.xaml @@ -10,10 +10,8 @@ xmlns:converters="clr-namespace:CRSim.ScreenSimulator.Converters" xmlns:converters1="clr-namespace:CRSim.Shared.Converters;assembly=CRSim.Shared" FontFamily="等线" FontSize="25" FontWeight="Bold" - Title="引导屏" SizeToContent="WidthAndHeight" - WindowStyle="None" AllowsTransparency="True" Background="#201921" Foreground="#fdfce5" - xmlns:views="clr-namespace:CRSim.ScreenSimulator.Views" - ResizeMode="NoResize"> + Background="#201921" Foreground="#fdfce5" + xmlns:views="clr-namespace:CRSim.ScreenSimulator.Views"> - + diff --git a/CRSim.ScreenSimulator/Views/DaqingDong/PlatformScreenView.xaml b/CRSim.ScreenSimulator/Views/DaqingDong/PlatformScreenView.xaml index 1e80d73..292b59e 100644 --- a/CRSim.ScreenSimulator/Views/DaqingDong/PlatformScreenView.xaml +++ b/CRSim.ScreenSimulator/Views/DaqingDong/PlatformScreenView.xaml @@ -8,11 +8,8 @@ mc:Ignorable="d" Foreground="#fdf99d" xmlns:converters="clr-namespace:CRSim.ScreenSimulator.Converters" xmlns:converters1="clr-namespace:CRSim.Shared.Converters;assembly=CRSim.Shared" - FontFamily="黑体" FontSize="25" FontWeight="Bold" - Title="引导屏" SizeToContent="WidthAndHeight" - WindowStyle="None" AllowsTransparency="True" Background="Black" - xmlns:views="clr-namespace:CRSim.ScreenSimulator.Views" - ResizeMode="NoResize"> + FontFamily="黑体" FontSize="25" FontWeight="Bold" Background="Black" + xmlns:views="clr-namespace:CRSim.ScreenSimulator.Views"> @@ -36,20 +33,20 @@ - + - + - + - + - + diff --git a/CRSim.ScreenSimulator/Views/Fuzhou/TicketCheckScreenView.xaml b/CRSim.ScreenSimulator/Views/Fuzhou/TicketCheckScreenView.xaml index c585fca..5f09254 100644 --- a/CRSim.ScreenSimulator/Views/Fuzhou/TicketCheckScreenView.xaml +++ b/CRSim.ScreenSimulator/Views/Fuzhou/TicketCheckScreenView.xaml @@ -8,10 +8,10 @@ xmlns:converters="clr-namespace:CRSim.ScreenSimulator.Converters" xmlns:converters1="clr-namespace:CRSim.Shared.Converters;assembly=CRSim.Shared" FontFamily="黑体" FontSize="20" FontWeight="Bold" - Title="引导屏" SizeToContent="WidthAndHeight" - WindowStyle="None" AllowsTransparency="True" Background="Black" + + Background="Black" xmlns:views="clr-namespace:CRSim.ScreenSimulator.Views" - ResizeMode="NoResize"> + > - + diff --git a/CRSim.ScreenSimulator/Views/FuzhouNan/TicketCheckScreenView.xaml b/CRSim.ScreenSimulator/Views/FuzhouNan/TicketCheckScreenView.xaml index fe88902..d9c1d84 100644 --- a/CRSim.ScreenSimulator/Views/FuzhouNan/TicketCheckScreenView.xaml +++ b/CRSim.ScreenSimulator/Views/FuzhouNan/TicketCheckScreenView.xaml @@ -8,10 +8,10 @@ xmlns:converters="clr-namespace:CRSim.ScreenSimulator.Converters" xmlns:converters1="clr-namespace:CRSim.Shared.Converters;assembly=CRSim.Shared" FontFamily="宋体" FontSize="20" FontWeight="Bold" - Title="引导屏" SizeToContent="WidthAndHeight" - WindowStyle="None" AllowsTransparency="True" Background="Black" + + Background="Black" xmlns:views="clr-namespace:CRSim.ScreenSimulator.Views" - ResizeMode="NoResize"> + > - + diff --git a/CRSim.ScreenSimulator/Views/GuangdongIntercity/SecondaryScreenView.xaml b/CRSim.ScreenSimulator/Views/GuangdongIntercity/SecondaryScreenView.xaml index ee15506..f5e4680 100644 --- a/CRSim.ScreenSimulator/Views/GuangdongIntercity/SecondaryScreenView.xaml +++ b/CRSim.ScreenSimulator/Views/GuangdongIntercity/SecondaryScreenView.xaml @@ -7,9 +7,7 @@ mc:Ignorable="d" xmlns:converters="clr-namespace:CRSim.ScreenSimulator.Converters" xmlns:converters1="clr-namespace:CRSim.Shared.Converters;assembly=CRSim.Shared" - Title="引导屏" SizeToContent="WidthAndHeight" - WindowStyle="None" AllowsTransparency="True" Background="Transparent" - xmlns:views="clr-namespace:CRSim.ScreenSimulator.Views" ResizeMode="NoResize" + xmlns:views="clr-namespace:CRSim.ScreenSimulator.Views" FontFamily="黑体" FontSize="18"> @@ -27,6 +25,7 @@ - + diff --git a/CRSim.ScreenSimulator/Views/Hanzhong/PlatformScreenView.xaml b/CRSim.ScreenSimulator/Views/Hanzhong/PlatformScreenView.xaml index 26a08e7..d469126 100644 --- a/CRSim.ScreenSimulator/Views/Hanzhong/PlatformScreenView.xaml +++ b/CRSim.ScreenSimulator/Views/Hanzhong/PlatformScreenView.xaml @@ -7,16 +7,13 @@ mc:Ignorable="d" xmlns:converters="clr-namespace:CRSim.ScreenSimulator.Converters" xmlns:converters1="clr-namespace:CRSim.Shared.Converters;assembly=CRSim.Shared" - FontFamily="黑体" FontSize="20" - Title="引导屏" SizeToContent="WidthAndHeight" - WindowStyle="None" AllowsTransparency="True" Background="#0028BD" - xmlns:views="clr-namespace:CRSim.ScreenSimulator.Views" - ResizeMode="NoResize"> + FontFamily="黑体" FontSize="20" Background="#004BA3" + xmlns:views="clr-namespace:CRSim.ScreenSimulator.Views"> - + @@ -35,23 +32,23 @@ - - + + - - - - - + + + + + - + - + @@ -70,7 +67,7 @@ - + diff --git a/CRSim.ScreenSimulator/Views/Harbin/PrimaryScreenView.xaml b/CRSim.ScreenSimulator/Views/Harbin/PrimaryScreenView.xaml index 14111dd..2e52571 100644 --- a/CRSim.ScreenSimulator/Views/Harbin/PrimaryScreenView.xaml +++ b/CRSim.ScreenSimulator/Views/Harbin/PrimaryScreenView.xaml @@ -7,9 +7,7 @@ mc:Ignorable="d" xmlns:converters="clr-namespace:CRSim.ScreenSimulator.Converters" xmlns:converters1="clr-namespace:CRSim.Shared.Converters;assembly=CRSim.Shared" - Title="引导屏" SizeToContent="WidthAndHeight" - WindowStyle="None" AllowsTransparency="True" Background="Transparent" - xmlns:views="clr-namespace:CRSim.ScreenSimulator.Views" ResizeMode="NoResize" + xmlns:views="clr-namespace:CRSim.ScreenSimulator.Views" FontFamily="黑体" FontSize="20"> @@ -25,6 +23,7 @@ - - @@ -107,12 +98,7 @@ - + @@ -209,7 +195,7 @@ - + diff --git a/CRSim.ScreenSimulator/Views/Mianyang/PlatformScreenView.xaml b/CRSim.ScreenSimulator/Views/Mianyang/PlatformScreenView.xaml index 9a09448..3fae6f4 100644 --- a/CRSim.ScreenSimulator/Views/Mianyang/PlatformScreenView.xaml +++ b/CRSim.ScreenSimulator/Views/Mianyang/PlatformScreenView.xaml @@ -8,11 +8,8 @@ mc:Ignorable="d" xmlns:converters="clr-namespace:CRSim.ScreenSimulator.Converters" xmlns:converters1="clr-namespace:CRSim.Shared.Converters;assembly=CRSim.Shared" - FontFamily="宋体" FontSize="28" FontWeight="Bold" - Title="引导屏" SizeToContent="WidthAndHeight" - WindowStyle="None" AllowsTransparency="True" Background="Black" - xmlns:views="clr-namespace:CRSim.ScreenSimulator.Views" - ResizeMode="NoResize"> + FontFamily="宋体" FontSize="28" FontWeight="Bold" Background="Black" + xmlns:views="clr-namespace:CRSim.ScreenSimulator.Views"> @@ -40,11 +37,11 @@ - + - - + + @@ -57,11 +54,11 @@ - + - + - + @@ -72,7 +69,7 @@ - + diff --git a/CRSim.ScreenSimulator/Views/Niuzhou/PrimaryScreenView.xaml b/CRSim.ScreenSimulator/Views/Niuzhou/PrimaryScreenView.xaml index c039afe..1d4390f 100644 --- a/CRSim.ScreenSimulator/Views/Niuzhou/PrimaryScreenView.xaml +++ b/CRSim.ScreenSimulator/Views/Niuzhou/PrimaryScreenView.xaml @@ -7,9 +7,7 @@ mc:Ignorable="d" xmlns:converters="clr-namespace:CRSim.ScreenSimulator.Converters" xmlns:converters1="clr-namespace:CRSim.Shared.Converters;assembly=CRSim.Shared" - Title="引导屏" SizeToContent="WidthAndHeight" FontWeight="Bold" - WindowStyle="None" AllowsTransparency="True" Background="Transparent" - xmlns:views="clr-namespace:CRSim.ScreenSimulator.Views" ResizeMode="NoResize" + FontWeight="Bold" xmlns:views="clr-namespace:CRSim.ScreenSimulator.Views" FontFamily="宋体" FontSize="20"> @@ -25,6 +23,7 @@ - + @@ -138,7 +133,7 @@ - + diff --git a/CRSim.ScreenSimulator/Views/Shanghai/OutsideScreenView.xaml b/CRSim.ScreenSimulator/Views/Shanghai/OutsideScreenView.xaml index 818e614..56c68f7 100644 --- a/CRSim.ScreenSimulator/Views/Shanghai/OutsideScreenView.xaml +++ b/CRSim.ScreenSimulator/Views/Shanghai/OutsideScreenView.xaml @@ -7,11 +7,7 @@ mc:Ignorable="d" xmlns:converters="clr-namespace:CRSim.ScreenSimulator.Converters" xmlns:converters1="clr-namespace:CRSim.Shared.Converters;assembly=CRSim.Shared" - FontFamily="黑体" - Title="引导屏" SizeToContent="WidthAndHeight" - WindowStyle="None" AllowsTransparency="True" Background="Black" - xmlns:views="clr-namespace:CRSim.ScreenSimulator.Views" - ResizeMode="NoResize"> + FontFamily="黑体" xmlns:views="clr-namespace:CRSim.ScreenSimulator.Views"> - + diff --git a/CRSim.ScreenSimulator/Views/Tianjin/PlatformScreenView.xaml b/CRSim.ScreenSimulator/Views/Tianjin/PlatformScreenView.xaml index 0f868b7..24a07b2 100644 --- a/CRSim.ScreenSimulator/Views/Tianjin/PlatformScreenView.xaml +++ b/CRSim.ScreenSimulator/Views/Tianjin/PlatformScreenView.xaml @@ -7,11 +7,8 @@ mc:Ignorable="d" xmlns:converters="clr-namespace:CRSim.ScreenSimulator.Converters" xmlns:converters1="clr-namespace:CRSim.Shared.Converters;assembly=CRSim.Shared" - FontFamily="黑体" FontSize="28" - Title="引导屏" SizeToContent="WidthAndHeight" - WindowStyle="None" AllowsTransparency="True" Background="Black" - xmlns:views="clr-namespace:CRSim.ScreenSimulator.Views" - ResizeMode="NoResize"> + FontFamily="黑体" FontSize="28" Background="Black" + xmlns:views="clr-namespace:CRSim.ScreenSimulator.Views"> @@ -42,7 +39,7 @@ - + @@ -50,7 +47,7 @@ - + @@ -60,7 +57,7 @@ - + @@ -77,13 +74,13 @@ - + - + diff --git a/CRSim.ScreenSimulator/Views/TianjinMetro/PlatformScreenView.xaml b/CRSim.ScreenSimulator/Views/TianjinMetro/PlatformScreenView.xaml index cc64a16..5bee86f 100644 --- a/CRSim.ScreenSimulator/Views/TianjinMetro/PlatformScreenView.xaml +++ b/CRSim.ScreenSimulator/Views/TianjinMetro/PlatformScreenView.xaml @@ -8,10 +8,7 @@ mc:Ignorable="d" xmlns:converters="clr-namespace:CRSim.ScreenSimulator.Converters" xmlns:converters1="clr-namespace:CRSim.Shared.Converters;assembly=CRSim.Shared" - Title="引导屏" SizeToContent="WidthAndHeight" - WindowStyle="None" AllowsTransparency="True" Background="Transparent" - xmlns:views="clr-namespace:CRSim.ScreenSimulator.Views" FontFamily="DengXian" FontWeight="SemiBold" - ResizeMode="NoResize"> + xmlns:views="clr-namespace:CRSim.ScreenSimulator.Views" FontFamily="DengXian" FontWeight="SemiBold"> diff --git a/CRSim.ScreenSimulator/Views/XuzhouMetro/PlatformScreenView.xaml b/CRSim.ScreenSimulator/Views/XuzhouMetro/PlatformScreenView.xaml index e9c82ff..6f5dfd4 100644 --- a/CRSim.ScreenSimulator/Views/XuzhouMetro/PlatformScreenView.xaml +++ b/CRSim.ScreenSimulator/Views/XuzhouMetro/PlatformScreenView.xaml @@ -8,10 +8,7 @@ mc:Ignorable="d" xmlns:converters="clr-namespace:CRSim.ScreenSimulator.Converters" xmlns:converters1="clr-namespace:CRSim.Shared.Converters;assembly=CRSim.Shared" - Title="引导屏" SizeToContent="WidthAndHeight" - WindowStyle="None" AllowsTransparency="True" Background="Transparent" - xmlns:views="clr-namespace:CRSim.ScreenSimulator.Views" FontFamily="DengXian" FontWeight="SemiBold" - ResizeMode="NoResize"> + xmlns:views="clr-namespace:CRSim.ScreenSimulator.Views" FontFamily="DengXian" FontWeight="SemiBold"> diff --git a/CRSim.ScreenSimulator/Views/Zibo/ConcourseBridgeScreenView.xaml b/CRSim.ScreenSimulator/Views/Zibo/ConcourseBridgeScreenView.xaml index 82c66ff..c9a195c 100644 --- a/CRSim.ScreenSimulator/Views/Zibo/ConcourseBridgeScreenView.xaml +++ b/CRSim.ScreenSimulator/Views/Zibo/ConcourseBridgeScreenView.xaml @@ -9,14 +9,10 @@ mc:Ignorable="d" xmlns:converters="clr-namespace:CRSim.ScreenSimulator.Converters" xmlns:converters1="clr-namespace:CRSim.Shared.Converters;assembly=CRSim.Shared" - FontFamily="等线" FontSize="25" FontWeight="Bold" - Title="引导屏" SizeToContent="WidthAndHeight" - WindowStyle="None" AllowsTransparency="True" Background="#0006ff" - xmlns:views="clr-namespace:CRSim.ScreenSimulator.Views" - ResizeMode="NoResize"> + FontFamily="等线" FontSize="25" FontWeight="Bold" Background="#0006ff" + xmlns:views="clr-namespace:CRSim.ScreenSimulator.Views"> @@ -93,6 +87,7 @@ @@ -106,6 +101,7 @@ @@ -119,6 +115,7 @@ @@ -132,6 +129,7 @@ - - + + diff --git a/CRSim.ScreenSimulator/Views/Zibo/PlatformScreenView.xaml b/CRSim.ScreenSimulator/Views/Zibo/PlatformScreenView.xaml index 3c12b3c..e6dcdde 100644 --- a/CRSim.ScreenSimulator/Views/Zibo/PlatformScreenView.xaml +++ b/CRSim.ScreenSimulator/Views/Zibo/PlatformScreenView.xaml @@ -8,11 +8,8 @@ mc:Ignorable="d" xmlns:converters="clr-namespace:CRSim.ScreenSimulator.Converters" xmlns:converters1="clr-namespace:CRSim.Shared.Converters;assembly=CRSim.Shared" - FontFamily="黑体" FontSize="28" FontWeight="Bold" - Title="引导屏" SizeToContent="WidthAndHeight" - WindowStyle="None" AllowsTransparency="True" Background="Black" - xmlns:views="clr-namespace:CRSim.ScreenSimulator.Views" - ResizeMode="NoResize"> + FontFamily="黑体" FontSize="28" FontWeight="Bold" Background="Black" + xmlns:views="clr-namespace:CRSim.ScreenSimulator.Views"> @@ -46,11 +43,11 @@ - + - + - + @@ -66,9 +63,9 @@ - + - + @@ -89,7 +86,7 @@ - + diff --git a/CRSim.ScreenSimulator/Views/Zibo/PrimaryScreenView.xaml b/CRSim.ScreenSimulator/Views/Zibo/PrimaryScreenView.xaml index 5a2c613..72fdee1 100644 --- a/CRSim.ScreenSimulator/Views/Zibo/PrimaryScreenView.xaml +++ b/CRSim.ScreenSimulator/Views/Zibo/PrimaryScreenView.xaml @@ -7,10 +7,7 @@ mc:Ignorable="d" xmlns:converters="clr-namespace:CRSim.ScreenSimulator.Converters" xmlns:converters1="clr-namespace:CRSim.Shared.Converters;assembly=CRSim.Shared" - Title="引导屏" SizeToContent="WidthAndHeight" - WindowStyle="None" AllowsTransparency="True" Background="Transparent" - xmlns:views="clr-namespace:CRSim.ScreenSimulator.Views" - ResizeMode="NoResize"> + xmlns:views="clr-namespace:CRSim.ScreenSimulator.Views"> - - + + @@ -203,6 +196,7 @@ - + diff --git a/CRSim.ScreenSimulator/Views/Zibo/SecondaryScreenView.xaml b/CRSim.ScreenSimulator/Views/Zibo/SecondaryScreenView.xaml index c38e8ee..665ea7b 100644 --- a/CRSim.ScreenSimulator/Views/Zibo/SecondaryScreenView.xaml +++ b/CRSim.ScreenSimulator/Views/Zibo/SecondaryScreenView.xaml @@ -7,9 +7,7 @@ mc:Ignorable="d" xmlns:converters="clr-namespace:CRSim.ScreenSimulator.Converters" xmlns:converters1="clr-namespace:CRSim.Shared.Converters;assembly=CRSim.Shared" - Title="引导屏" SizeToContent="WidthAndHeight" - WindowStyle="None" AllowsTransparency="True" Background="Transparent" - xmlns:views="clr-namespace:CRSim.ScreenSimulator.Views" ResizeMode="NoResize" + xmlns:views="clr-namespace:CRSim.ScreenSimulator.Views" FontFamily="等线" FontSize="16"> @@ -24,6 +22,7 @@ - + @@ -220,12 +217,8 @@ - + @@ -242,6 +235,7 @@ - +