diff --git a/CRSim.ScreenSimulator/CRSim.ScreenSimulator.csproj b/CRSim.ScreenSimulator/CRSim.ScreenSimulator.csproj new file mode 100644 index 0000000..b30ef43 --- /dev/null +++ b/CRSim.ScreenSimulator/CRSim.ScreenSimulator.csproj @@ -0,0 +1,66 @@ + + + + net9.0-windows + enable + true + enable + + + + + + + + + + + + + + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + + diff --git a/CRSim/Converters/LandmarkToStringConverter.cs b/CRSim.ScreenSimulator/Converters/LandmarkToStringConverter.cs similarity index 76% rename from CRSim/Converters/LandmarkToStringConverter.cs rename to CRSim.ScreenSimulator/Converters/LandmarkToStringConverter.cs index a2ec5c0..4a7088a 100644 --- a/CRSim/Converters/LandmarkToStringConverter.cs +++ b/CRSim.ScreenSimulator/Converters/LandmarkToStringConverter.cs @@ -1,10 +1,7 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Globalization; +using System.Windows.Data; -namespace CRSim.Converters +namespace CRSim.ScreenSimulator.Converters { public class LandmarkToStringConverter : IValueConverter { diff --git a/CRSim/Converters/LocationToStringConverter.cs b/CRSim.ScreenSimulator/Converters/LocationToStringConverter.cs similarity index 91% rename from CRSim/Converters/LocationToStringConverter.cs rename to CRSim.ScreenSimulator/Converters/LocationToStringConverter.cs index 25d6adf..f1e6b75 100644 --- a/CRSim/Converters/LocationToStringConverter.cs +++ b/CRSim.ScreenSimulator/Converters/LocationToStringConverter.cs @@ -1,4 +1,7 @@ -namespace CRSim.Converters +using System.Globalization; +using System.Windows.Data; + +namespace CRSim.ScreenSimulator.Converters { public class LocationToStringConverter : IMultiValueConverter { diff --git a/CRSim/Converters/MetroDateTimeToStringConverter.cs b/CRSim.ScreenSimulator/Converters/MetroDateTimeToStringConverter.cs similarity index 89% rename from CRSim/Converters/MetroDateTimeToStringConverter.cs rename to CRSim.ScreenSimulator/Converters/MetroDateTimeToStringConverter.cs index 6b834e3..91d247b 100644 --- a/CRSim/Converters/MetroDateTimeToStringConverter.cs +++ b/CRSim.ScreenSimulator/Converters/MetroDateTimeToStringConverter.cs @@ -1,4 +1,11 @@ -namespace CRSim.Converters +using CRSim.Core.Services; +using CRSim.ScreenSimulator.Models; +using Microsoft.Extensions.DependencyInjection; +using System.Globalization; +using System.Windows; +using System.Windows.Data; + +namespace CRSim.ScreenSimulator.Converters { public class MetroDateTimeToStringConverter : IValueConverter { diff --git a/CRSim/Converters/MetroDateTimeToVisibilityConverter.cs b/CRSim.ScreenSimulator/Converters/MetroDateTimeToVisibilityConverter.cs similarity index 86% rename from CRSim/Converters/MetroDateTimeToVisibilityConverter.cs rename to CRSim.ScreenSimulator/Converters/MetroDateTimeToVisibilityConverter.cs index 7cf71d1..bad6db9 100644 --- a/CRSim/Converters/MetroDateTimeToVisibilityConverter.cs +++ b/CRSim.ScreenSimulator/Converters/MetroDateTimeToVisibilityConverter.cs @@ -1,4 +1,11 @@ -namespace CRSim.Converters +using CRSim.Core.Services; +using CRSim.ScreenSimulator.Models; +using Microsoft.Extensions.DependencyInjection; +using System.Globalization; +using System.Windows; +using System.Windows.Data; + +namespace CRSim.ScreenSimulator.Converters { public class MetroDateTimeToVisibilityConverter : IValueConverter { diff --git a/CRSim/Converters/NumberToStringConverter.cs b/CRSim.ScreenSimulator/Converters/NumberToStringConverter.cs similarity index 91% rename from CRSim/Converters/NumberToStringConverter.cs rename to CRSim.ScreenSimulator/Converters/NumberToStringConverter.cs index 5c5d5fa..1466d99 100644 --- a/CRSim/Converters/NumberToStringConverter.cs +++ b/CRSim.ScreenSimulator/Converters/NumberToStringConverter.cs @@ -1,10 +1,12 @@ using System; using System.Collections.Generic; +using System.Globalization; using System.Linq; using System.Text; using System.Threading.Tasks; +using System.Windows.Data; -namespace CRSim.Converters +namespace CRSim.ScreenSimulator.Converters { public class NumberToStringConverter : IValueConverter { diff --git a/CRSim/Converters/TextSpacingConverter.cs b/CRSim.ScreenSimulator/Converters/TextSpacingConverter.cs similarity index 81% rename from CRSim/Converters/TextSpacingConverter.cs rename to CRSim.ScreenSimulator/Converters/TextSpacingConverter.cs index 3a64355..efdfe86 100644 --- a/CRSim/Converters/TextSpacingConverter.cs +++ b/CRSim.ScreenSimulator/Converters/TextSpacingConverter.cs @@ -1,10 +1,7 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Globalization; +using System.Windows.Data; -namespace CRSim.Converters +namespace CRSim.ScreenSimulator.Converters { public class TextSpacingConverter : IValueConverter { diff --git a/CRSim/Converters/TrainStateColorConverter.cs b/CRSim.ScreenSimulator/Converters/TrainStateColorConverter.cs similarity index 90% rename from CRSim/Converters/TrainStateColorConverter.cs rename to CRSim.ScreenSimulator/Converters/TrainStateColorConverter.cs index 60cb4ff..67b4850 100644 --- a/CRSim/Converters/TrainStateColorConverter.cs +++ b/CRSim.ScreenSimulator/Converters/TrainStateColorConverter.cs @@ -1,4 +1,11 @@ -namespace CRSim.Converters +using CRSim.Core.Models; +using CRSim.Core.Services; +using Microsoft.Extensions.DependencyInjection; +using System.Globalization; +using System.Windows; +using System.Windows.Data; +using System.Windows.Media; +namespace CRSim.ScreenSimulator.Converters { public class TrainStateColorConverter : IMultiValueConverter { diff --git a/CRSim/Converters/TrainStateConverter.cs b/CRSim.ScreenSimulator/Converters/TrainStateConverter.cs similarity index 91% rename from CRSim/Converters/TrainStateConverter.cs rename to CRSim.ScreenSimulator/Converters/TrainStateConverter.cs index ced0883..a11b893 100644 --- a/CRSim/Converters/TrainStateConverter.cs +++ b/CRSim.ScreenSimulator/Converters/TrainStateConverter.cs @@ -1,4 +1,11 @@ -namespace CRSim.Converters +using CRSim.Core.Models; +using CRSim.Core.Services; +using Microsoft.Extensions.DependencyInjection; +using System.Globalization; +using System.Windows; +using System.Windows.Data; + +namespace CRSim.ScreenSimulator.Converters { public class TrainStateConverter : IMultiValueConverter { diff --git a/CRSim/Models/TrainInfo.cs b/CRSim.ScreenSimulator/Models/TrainInfo.cs similarity index 93% rename from CRSim/Models/TrainInfo.cs rename to CRSim.ScreenSimulator/Models/TrainInfo.cs index ab99261..1d01f87 100644 --- a/CRSim/Models/TrainInfo.cs +++ b/CRSim.ScreenSimulator/Models/TrainInfo.cs @@ -1,4 +1,4 @@ -namespace CRSim.Models +namespace CRSim.ScreenSimulator.Models { public class TrainInfo { diff --git a/CRSim/ViewModels/Windows/ScreenViewModel.cs b/CRSim.ScreenSimulator/ViewModels/Windows/ScreenViewModel.cs similarity index 95% rename from CRSim/ViewModels/Windows/ScreenViewModel.cs rename to CRSim.ScreenSimulator/ViewModels/Windows/ScreenViewModel.cs index cac1ba1..146d842 100644 --- a/CRSim/ViewModels/Windows/ScreenViewModel.cs +++ b/CRSim.ScreenSimulator/ViewModels/Windows/ScreenViewModel.cs @@ -1,8 +1,10 @@ -using System.Linq; -using System; -using System.Globalization; +using CommunityToolkit.Mvvm.ComponentModel; +using CRSim.Core.Services; +using CRSim.Core.Models; +using CRSim.ScreenSimulator.Models; +using System.ComponentModel; -namespace CRSim.ViewModels +namespace CRSim.ScreenSimulator.ViewModels { public partial class ScreenViewModel : ObservableObject { diff --git a/CRSim/ViewModels/Windows/Stations/Ankang/ExitScreenViewModel.cs b/CRSim.ScreenSimulator/ViewModels/Windows/Stations/Ankang/ExitScreenViewModel.cs similarity index 94% rename from CRSim/ViewModels/Windows/Stations/Ankang/ExitScreenViewModel.cs rename to CRSim.ScreenSimulator/ViewModels/Windows/Stations/Ankang/ExitScreenViewModel.cs index 61b7399..53d93a2 100644 --- a/CRSim/ViewModels/Windows/Stations/Ankang/ExitScreenViewModel.cs +++ b/CRSim.ScreenSimulator/ViewModels/Windows/Stations/Ankang/ExitScreenViewModel.cs @@ -1,4 +1,10 @@ -namespace CRSim.ViewModels.Ankang +using CRSim.Core.Services; +using CRSim.ScreenSimulator.Models; +using System.Collections.ObjectModel; +using CRSim.Core.Models; +using System.Windows; + +namespace CRSim.ScreenSimulator.ViewModels.Ankang { public class ExitScreenViewModel : ScreenViewModel { diff --git a/CRSim/ViewModels/Windows/Stations/BeijingXi/PrimaryScreenViewModel.cs b/CRSim.ScreenSimulator/ViewModels/Windows/Stations/BeijingXi/PrimaryScreenViewModel.cs similarity index 91% rename from CRSim/ViewModels/Windows/Stations/BeijingXi/PrimaryScreenViewModel.cs rename to CRSim.ScreenSimulator/ViewModels/Windows/Stations/BeijingXi/PrimaryScreenViewModel.cs index e6f6f6a..34c6cc7 100644 --- a/CRSim/ViewModels/Windows/Stations/BeijingXi/PrimaryScreenViewModel.cs +++ b/CRSim.ScreenSimulator/ViewModels/Windows/Stations/BeijingXi/PrimaryScreenViewModel.cs @@ -1,4 +1,9 @@ -namespace CRSim.ViewModels.BeijingXi +using CRSim.Core.Models; +using CRSim.Core.Services; +using CRSim.ScreenSimulator.Models; +using System.Collections.ObjectModel; +using System.Windows; +namespace CRSim.ScreenSimulator.ViewModels.BeijingXi { public class PrimaryScreenViewModel : ScreenViewModel { diff --git a/CRSim/ViewModels/Windows/Stations/ChengduDong/PrimaryTicketCheckScreenViewModel.cs b/CRSim.ScreenSimulator/ViewModels/Windows/Stations/ChengduDong/PrimaryTicketCheckScreenViewModel.cs similarity index 85% rename from CRSim/ViewModels/Windows/Stations/ChengduDong/PrimaryTicketCheckScreenViewModel.cs rename to CRSim.ScreenSimulator/ViewModels/Windows/Stations/ChengduDong/PrimaryTicketCheckScreenViewModel.cs index d530709..f4168fc 100644 --- a/CRSim/ViewModels/Windows/Stations/ChengduDong/PrimaryTicketCheckScreenViewModel.cs +++ b/CRSim.ScreenSimulator/ViewModels/Windows/Stations/ChengduDong/PrimaryTicketCheckScreenViewModel.cs @@ -1,4 +1,9 @@ -namespace CRSim.ViewModels.ChengduDong +using CRSim.Core.Models; +using CRSim.Core.Services; +using CRSim.ScreenSimulator.Models; +using System.Collections.ObjectModel; +using System.Windows; +namespace CRSim.ScreenSimulator.ViewModels.ChengduDong { public class PrimaryTicketCheckScreenViewModel : ScreenViewModel { diff --git a/CRSim/ViewModels/Windows/Stations/ChengduDong/SecondaryScreenViewModel.cs b/CRSim.ScreenSimulator/ViewModels/Windows/Stations/ChengduDong/SecondaryScreenViewModel.cs similarity index 91% rename from CRSim/ViewModels/Windows/Stations/ChengduDong/SecondaryScreenViewModel.cs rename to CRSim.ScreenSimulator/ViewModels/Windows/Stations/ChengduDong/SecondaryScreenViewModel.cs index 33131dc..34bd78e 100644 --- a/CRSim/ViewModels/Windows/Stations/ChengduDong/SecondaryScreenViewModel.cs +++ b/CRSim.ScreenSimulator/ViewModels/Windows/Stations/ChengduDong/SecondaryScreenViewModel.cs @@ -1,4 +1,9 @@ -namespace CRSim.ViewModels.ChengduDong +using CRSim.Core.Models; +using CRSim.Core.Services; +using System.Windows; +using CRSim.ScreenSimulator.Models; +using System.Collections.ObjectModel; +namespace CRSim.ScreenSimulator.ViewModels.ChengduDong { public class SecondaryScreenViewModel : ScreenViewModel { diff --git a/CRSim/ViewModels/Windows/Stations/ChengduMetro/PlatformScreenViewModel.cs b/CRSim.ScreenSimulator/ViewModels/Windows/Stations/ChengduMetro/PlatformScreenViewModel.cs similarity index 93% rename from CRSim/ViewModels/Windows/Stations/ChengduMetro/PlatformScreenViewModel.cs rename to CRSim.ScreenSimulator/ViewModels/Windows/Stations/ChengduMetro/PlatformScreenViewModel.cs index e39014a..507bc7e 100644 --- a/CRSim/ViewModels/Windows/Stations/ChengduMetro/PlatformScreenViewModel.cs +++ b/CRSim.ScreenSimulator/ViewModels/Windows/Stations/ChengduMetro/PlatformScreenViewModel.cs @@ -1,4 +1,8 @@ -namespace CRSim.ViewModels.ChengduMetro +using CommunityToolkit.Mvvm.ComponentModel; +using CRSim.Core.Models; +using CRSim.Core.Services; +using CRSim.ScreenSimulator.Models; +namespace CRSim.ScreenSimulator.ViewModels.ChengduMetro { public partial class PlatformScreenViewModel : ObservableObject { diff --git a/CRSim/ViewModels/Windows/Stations/Fuzhou/TicketCheckScreenViewModel.cs b/CRSim.ScreenSimulator/ViewModels/Windows/Stations/Fuzhou/TicketCheckScreenViewModel.cs similarity index 84% rename from CRSim/ViewModels/Windows/Stations/Fuzhou/TicketCheckScreenViewModel.cs rename to CRSim.ScreenSimulator/ViewModels/Windows/Stations/Fuzhou/TicketCheckScreenViewModel.cs index 0b2e931..a2402dc 100644 --- a/CRSim/ViewModels/Windows/Stations/Fuzhou/TicketCheckScreenViewModel.cs +++ b/CRSim.ScreenSimulator/ViewModels/Windows/Stations/Fuzhou/TicketCheckScreenViewModel.cs @@ -1,4 +1,9 @@ -namespace CRSim.ViewModels.Fuzhou +using CRSim.Core.Services; +using CRSim.ScreenSimulator.Models; +using System.Collections.ObjectModel; +using CRSim.Core.Models; +using System.Windows; +namespace CRSim.ScreenSimulator.ViewModels.Fuzhou { public class TicketCheckScreenViewModel : ScreenViewModel { diff --git a/CRSim/ViewModels/Windows/Stations/GuangdongIntercity/SecondaryScreenViewModel.cs b/CRSim.ScreenSimulator/ViewModels/Windows/Stations/GuangdongIntercity/SecondaryScreenViewModel.cs similarity index 89% rename from CRSim/ViewModels/Windows/Stations/GuangdongIntercity/SecondaryScreenViewModel.cs rename to CRSim.ScreenSimulator/ViewModels/Windows/Stations/GuangdongIntercity/SecondaryScreenViewModel.cs index b136988..f4e014c 100644 --- a/CRSim/ViewModels/Windows/Stations/GuangdongIntercity/SecondaryScreenViewModel.cs +++ b/CRSim.ScreenSimulator/ViewModels/Windows/Stations/GuangdongIntercity/SecondaryScreenViewModel.cs @@ -1,4 +1,8 @@ -namespace CRSim.ViewModels.GuangdongIntercity +using System.Windows; +using CRSim.Core.Services; +using CRSim.ScreenSimulator.Models; +using System.Collections.ObjectModel; +namespace CRSim.ScreenSimulator.ViewModels.GuangdongIntercity { public class SecondaryScreenViewModel : ScreenViewModel { diff --git a/CRSim/ViewModels/Windows/Stations/Guangyuan/PrimaryScreenViewModel.cs b/CRSim.ScreenSimulator/ViewModels/Windows/Stations/Guangyuan/PrimaryScreenViewModel.cs similarity index 88% rename from CRSim/ViewModels/Windows/Stations/Guangyuan/PrimaryScreenViewModel.cs rename to CRSim.ScreenSimulator/ViewModels/Windows/Stations/Guangyuan/PrimaryScreenViewModel.cs index 9354bc1..cfda8ec 100644 --- a/CRSim/ViewModels/Windows/Stations/Guangyuan/PrimaryScreenViewModel.cs +++ b/CRSim.ScreenSimulator/ViewModels/Windows/Stations/Guangyuan/PrimaryScreenViewModel.cs @@ -1,4 +1,9 @@ -namespace CRSim.ViewModels.Guangyuan +using CRSim.Core.Services; +using CRSim.ScreenSimulator.Models; +using System.Collections.ObjectModel; +using System.Windows; +using CRSim.Core.Models; +namespace CRSim.ScreenSimulator.ViewModels.Guangyuan { public class OutsideScreenViewModel : ScreenViewModel { diff --git a/CRSim/ViewModels/Windows/Stations/Hanzhong/PlatformScreenViewModel.cs b/CRSim.ScreenSimulator/ViewModels/Windows/Stations/Hanzhong/PlatformScreenViewModel.cs similarity index 92% rename from CRSim/ViewModels/Windows/Stations/Hanzhong/PlatformScreenViewModel.cs rename to CRSim.ScreenSimulator/ViewModels/Windows/Stations/Hanzhong/PlatformScreenViewModel.cs index 1e68027..3516c0f 100644 --- a/CRSim/ViewModels/Windows/Stations/Hanzhong/PlatformScreenViewModel.cs +++ b/CRSim.ScreenSimulator/ViewModels/Windows/Stations/Hanzhong/PlatformScreenViewModel.cs @@ -1,4 +1,8 @@ -namespace CRSim.ViewModels.Hanzhong +using CRSim.Core.Services; +using CRSim.ScreenSimulator.Models; +using System.Collections.ObjectModel; +using System.Windows; +namespace CRSim.ScreenSimulator.ViewModels.Hanzhong { public class PlatformScreenViewModel : ScreenViewModel { diff --git a/CRSim/ViewModels/Windows/Stations/Harbin/PrimaryScreenViewModel.cs b/CRSim.ScreenSimulator/ViewModels/Windows/Stations/Harbin/PrimaryScreenViewModel.cs similarity index 92% rename from CRSim/ViewModels/Windows/Stations/Harbin/PrimaryScreenViewModel.cs rename to CRSim.ScreenSimulator/ViewModels/Windows/Stations/Harbin/PrimaryScreenViewModel.cs index 09d7ec5..bf700c1 100644 --- a/CRSim/ViewModels/Windows/Stations/Harbin/PrimaryScreenViewModel.cs +++ b/CRSim.ScreenSimulator/ViewModels/Windows/Stations/Harbin/PrimaryScreenViewModel.cs @@ -1,4 +1,9 @@ -namespace CRSim.ViewModels.Harbin +using CRSim.Core.Models; +using CRSim.Core.Services; +using CRSim.ScreenSimulator.Models; +using System.Collections.ObjectModel; +using System.Windows; +namespace CRSim.ScreenSimulator.ViewModels.Harbin { public class PrimaryScreenViewModel : ScreenViewModel { diff --git a/CRSim/ViewModels/Windows/Stations/Jinanxi/SmallScreenViewModel.cs b/CRSim.ScreenSimulator/ViewModels/Windows/Stations/Jinanxi/SmallScreenViewModel.cs similarity index 89% rename from CRSim/ViewModels/Windows/Stations/Jinanxi/SmallScreenViewModel.cs rename to CRSim.ScreenSimulator/ViewModels/Windows/Stations/Jinanxi/SmallScreenViewModel.cs index 58f09af..473c2ac 100644 --- a/CRSim/ViewModels/Windows/Stations/Jinanxi/SmallScreenViewModel.cs +++ b/CRSim.ScreenSimulator/ViewModels/Windows/Stations/Jinanxi/SmallScreenViewModel.cs @@ -1,4 +1,9 @@ -namespace CRSim.ViewModels.Jinanxi +using CRSim.Core.Models; +using CRSim.Core.Services; +using CRSim.ScreenSimulator.Models; +using System.Collections.ObjectModel; +using System.Windows; +namespace CRSim.ScreenSimulator.ViewModels.Jinanxi { public class SmallScreenViewModel : ScreenViewModel { diff --git a/CRSim/ViewModels/Windows/Stations/Shanghai/OutsideScreenViewModel.cs b/CRSim.ScreenSimulator/ViewModels/Windows/Stations/Shanghai/OutsideScreenViewModel.cs similarity index 88% rename from CRSim/ViewModels/Windows/Stations/Shanghai/OutsideScreenViewModel.cs rename to CRSim.ScreenSimulator/ViewModels/Windows/Stations/Shanghai/OutsideScreenViewModel.cs index b3d0cf5..b1e1958 100644 --- a/CRSim/ViewModels/Windows/Stations/Shanghai/OutsideScreenViewModel.cs +++ b/CRSim.ScreenSimulator/ViewModels/Windows/Stations/Shanghai/OutsideScreenViewModel.cs @@ -1,4 +1,9 @@ -namespace CRSim.ViewModels.Shanghai +using CRSim.Core.Services; +using CRSim.Core.Models; +using CRSim.ScreenSimulator.Models; +using System.Collections.ObjectModel; +using System.Windows; +namespace CRSim.ScreenSimulator.ViewModels.Shanghai { public class OutsideScreenViewModel : ScreenViewModel { diff --git a/CRSim/ViewModels/Windows/Stations/Tianjin/PlatformScreenViewModel.cs b/CRSim.ScreenSimulator/ViewModels/Windows/Stations/Tianjin/PlatformScreenViewModel.cs similarity index 92% rename from CRSim/ViewModels/Windows/Stations/Tianjin/PlatformScreenViewModel.cs rename to CRSim.ScreenSimulator/ViewModels/Windows/Stations/Tianjin/PlatformScreenViewModel.cs index 4026431..d690715 100644 --- a/CRSim/ViewModels/Windows/Stations/Tianjin/PlatformScreenViewModel.cs +++ b/CRSim.ScreenSimulator/ViewModels/Windows/Stations/Tianjin/PlatformScreenViewModel.cs @@ -1,4 +1,8 @@ -namespace CRSim.ViewModels.Tianjin +using CRSim.Core.Services; +using CRSim.ScreenSimulator.Models; +using System.Collections.ObjectModel; +using System.Windows; +namespace CRSim.ScreenSimulator.ViewModels.Tianjin { public class PlatformScreenViewModel : ScreenViewModel { diff --git a/CRSim/ViewModels/Windows/Stations/Zibo/PrimaryScreenViewModel.cs b/CRSim.ScreenSimulator/ViewModels/Windows/Stations/Zibo/PrimaryScreenViewModel.cs similarity index 91% rename from CRSim/ViewModels/Windows/Stations/Zibo/PrimaryScreenViewModel.cs rename to CRSim.ScreenSimulator/ViewModels/Windows/Stations/Zibo/PrimaryScreenViewModel.cs index 3493bff..091c66c 100644 --- a/CRSim/ViewModels/Windows/Stations/Zibo/PrimaryScreenViewModel.cs +++ b/CRSim.ScreenSimulator/ViewModels/Windows/Stations/Zibo/PrimaryScreenViewModel.cs @@ -1,4 +1,9 @@ -namespace CRSim.ViewModels.Zibo +using CRSim.Core.Models; +using CRSim.Core.Services; +using CRSim.ScreenSimulator.Models; +using System.Collections.ObjectModel; +using System.Windows; +namespace CRSim.ScreenSimulator.ViewModels.Zibo { public class PrimaryScreenViewModel : ScreenViewModel { diff --git a/CRSim/ViewModels/Windows/Stations/Zibo/SecondaryScreenViewModel.cs b/CRSim.ScreenSimulator/ViewModels/Windows/Stations/Zibo/SecondaryScreenViewModel.cs similarity index 89% rename from CRSim/ViewModels/Windows/Stations/Zibo/SecondaryScreenViewModel.cs rename to CRSim.ScreenSimulator/ViewModels/Windows/Stations/Zibo/SecondaryScreenViewModel.cs index ec9ea11..410ae2c 100644 --- a/CRSim/ViewModels/Windows/Stations/Zibo/SecondaryScreenViewModel.cs +++ b/CRSim.ScreenSimulator/ViewModels/Windows/Stations/Zibo/SecondaryScreenViewModel.cs @@ -1,4 +1,9 @@ -namespace CRSim.ViewModels.Zibo +using CRSim.Core.Models; +using CRSim.Core.Services; +using CRSim.ScreenSimulator.Models; +using System.Windows; +using System.Collections.ObjectModel; +namespace CRSim.ScreenSimulator.ViewModels.Zibo { public class SecondaryScreenViewModel : ScreenViewModel { diff --git a/CRSim/Views/Windows/Stations/Ankang/ExitScreenView.xaml b/CRSim.ScreenSimulator/Views/Windows/Stations/Ankang/ExitScreenView.xaml similarity index 93% rename from CRSim/Views/Windows/Stations/Ankang/ExitScreenView.xaml rename to CRSim.ScreenSimulator/Views/Windows/Stations/Ankang/ExitScreenView.xaml index 6e189a3..bb290d8 100644 --- a/CRSim/Views/Windows/Stations/Ankang/ExitScreenView.xaml +++ b/CRSim.ScreenSimulator/Views/Windows/Stations/Ankang/ExitScreenView.xaml @@ -1,20 +1,21 @@ - - - - - + + + + - - - + + + @@ -114,7 +115,7 @@ - + @@ -298,7 +299,7 @@ - + diff --git a/CRSim/Views/Windows/Stations/ChengduDong/SecondaryScreenView.xaml.cs b/CRSim.ScreenSimulator/Views/Windows/Stations/ChengduDong/SecondaryScreenView.xaml.cs similarity index 82% rename from CRSim/Views/Windows/Stations/ChengduDong/SecondaryScreenView.xaml.cs rename to CRSim.ScreenSimulator/Views/Windows/Stations/ChengduDong/SecondaryScreenView.xaml.cs index 27df31f..2d75f87 100644 --- a/CRSim/Views/Windows/Stations/ChengduDong/SecondaryScreenView.xaml.cs +++ b/CRSim.ScreenSimulator/Views/Windows/Stations/ChengduDong/SecondaryScreenView.xaml.cs @@ -1,6 +1,9 @@ -using CRSim.ViewModels.ChengduDong; +using CRSim.ScreenSimulator.ViewModels.ChengduDong; +using System.Windows; +using System.Windows.Input; +using System.Windows.Media; -namespace CRSim.Views.ChengduDong +namespace CRSim.ScreenSimulator.Views.ChengduDong { /// /// SecondaryScreen.xaml 的交互逻辑 diff --git a/CRSim/Views/Windows/Stations/ChengduMetro/PlatformScreenView.xaml b/CRSim.ScreenSimulator/Views/Windows/Stations/ChengduMetro/PlatformScreenView.xaml similarity index 92% rename from CRSim/Views/Windows/Stations/ChengduMetro/PlatformScreenView.xaml rename to CRSim.ScreenSimulator/Views/Windows/Stations/ChengduMetro/PlatformScreenView.xaml index b949d3a..4fc0a0d 100644 --- a/CRSim/Views/Windows/Stations/ChengduMetro/PlatformScreenView.xaml +++ b/CRSim.ScreenSimulator/Views/Windows/Stations/ChengduMetro/PlatformScreenView.xaml @@ -1,22 +1,22 @@ - - - - - + + + + diff --git a/CRSim/Views/Windows/Stations/ChengduMetro/PlatformScreenView.xaml.cs b/CRSim.ScreenSimulator/Views/Windows/Stations/ChengduMetro/PlatformScreenView.xaml.cs similarity index 85% rename from CRSim/Views/Windows/Stations/ChengduMetro/PlatformScreenView.xaml.cs rename to CRSim.ScreenSimulator/Views/Windows/Stations/ChengduMetro/PlatformScreenView.xaml.cs index ef86c25..f678781 100644 --- a/CRSim/Views/Windows/Stations/ChengduMetro/PlatformScreenView.xaml.cs +++ b/CRSim.ScreenSimulator/Views/Windows/Stations/ChengduMetro/PlatformScreenView.xaml.cs @@ -1,8 +1,9 @@ -using CRSim.ViewModels.ChengduMetro; -using System.Windows.Controls; -using System.Windows.Media.Animation; +using CRSim.ScreenSimulator.ViewModels.ChengduMetro; +using System.Windows; +using System.Windows.Input; +using System.Windows.Media; -namespace CRSim.Views.ChengduMetro +namespace CRSim.ScreenSimulator.Views.ChengduMetro { /// /// SecondaryScreen.xaml 的交互逻辑 diff --git a/CRSim/Views/Windows/Stations/Fuzhou/TicketCheckScreenView.xaml b/CRSim.ScreenSimulator/Views/Windows/Stations/Fuzhou/TicketCheckScreenView.xaml similarity index 96% rename from CRSim/Views/Windows/Stations/Fuzhou/TicketCheckScreenView.xaml rename to CRSim.ScreenSimulator/Views/Windows/Stations/Fuzhou/TicketCheckScreenView.xaml index 06fef71..cf0ea99 100644 --- a/CRSim/Views/Windows/Stations/Fuzhou/TicketCheckScreenView.xaml +++ b/CRSim.ScreenSimulator/Views/Windows/Stations/Fuzhou/TicketCheckScreenView.xaml @@ -1,11 +1,12 @@ - - - + + diff --git a/CRSim/Views/Windows/Stations/Fuzhou/TicketCheckScreenView.xaml.cs b/CRSim.ScreenSimulator/Views/Windows/Stations/Fuzhou/TicketCheckScreenView.xaml.cs similarity index 83% rename from CRSim/Views/Windows/Stations/Fuzhou/TicketCheckScreenView.xaml.cs rename to CRSim.ScreenSimulator/Views/Windows/Stations/Fuzhou/TicketCheckScreenView.xaml.cs index 4f1ad2c..f045d83 100644 --- a/CRSim/Views/Windows/Stations/Fuzhou/TicketCheckScreenView.xaml.cs +++ b/CRSim.ScreenSimulator/Views/Windows/Stations/Fuzhou/TicketCheckScreenView.xaml.cs @@ -1,6 +1,9 @@ -using CRSim.ViewModels.Fuzhou; +using CRSim.ScreenSimulator.ViewModels.Fuzhou; +using System.Windows; +using System.Windows.Input; +using System.Windows.Media; -namespace CRSim.Views.Fuzhou +namespace CRSim.ScreenSimulator.Views.Fuzhou { /// /// SecondaryScreen.xaml 的交互逻辑 diff --git a/CRSim/Views/Windows/Stations/GuangdongIntercity/SecondaryScreenView.xaml b/CRSim.ScreenSimulator/Views/Windows/Stations/GuangdongIntercity/SecondaryScreenView.xaml similarity index 93% rename from CRSim/Views/Windows/Stations/GuangdongIntercity/SecondaryScreenView.xaml rename to CRSim.ScreenSimulator/Views/Windows/Stations/GuangdongIntercity/SecondaryScreenView.xaml index d86aeac..3865f8b 100644 --- a/CRSim/Views/Windows/Stations/GuangdongIntercity/SecondaryScreenView.xaml +++ b/CRSim.ScreenSimulator/Views/Windows/Stations/GuangdongIntercity/SecondaryScreenView.xaml @@ -1,22 +1,23 @@ - - - - - - + + + + + - - - - + + + + @@ -77,7 +78,7 @@ - + /// SecondaryScreen.xaml 的交互逻辑 diff --git a/CRSim/Views/Windows/Stations/Hanzhong/PlatformScreenView.xaml b/CRSim.ScreenSimulator/Views/Windows/Stations/Hanzhong/PlatformScreenView.xaml similarity index 92% rename from CRSim/Views/Windows/Stations/Hanzhong/PlatformScreenView.xaml rename to CRSim.ScreenSimulator/Views/Windows/Stations/Hanzhong/PlatformScreenView.xaml index a2298e3..75ff5b8 100644 --- a/CRSim/Views/Windows/Stations/Hanzhong/PlatformScreenView.xaml +++ b/CRSim.ScreenSimulator/Views/Windows/Stations/Hanzhong/PlatformScreenView.xaml @@ -1,18 +1,19 @@ - - + diff --git a/CRSim/Views/Windows/Stations/Tianjin/PlatformScreenView.xaml.cs b/CRSim.ScreenSimulator/Views/Windows/Stations/Hanzhong/PlatformScreenView.xaml.cs similarity index 82% rename from CRSim/Views/Windows/Stations/Tianjin/PlatformScreenView.xaml.cs rename to CRSim.ScreenSimulator/Views/Windows/Stations/Hanzhong/PlatformScreenView.xaml.cs index a015b0b..bf5c709 100644 --- a/CRSim/Views/Windows/Stations/Tianjin/PlatformScreenView.xaml.cs +++ b/CRSim.ScreenSimulator/Views/Windows/Stations/Hanzhong/PlatformScreenView.xaml.cs @@ -1,6 +1,9 @@ -using CRSim.ViewModels.Tianjin; +using CRSim.ScreenSimulator.ViewModels.Hanzhong; +using System.Windows; +using System.Windows.Input; +using System.Windows.Media; -namespace CRSim.Views.Tianjin +namespace CRSim.ScreenSimulator.Views.Hanzhong { /// /// SecondaryScreen.xaml 的交互逻辑 diff --git a/CRSim/Views/Windows/Stations/Harbin/PrimaryScreenView.xaml b/CRSim.ScreenSimulator/Views/Windows/Stations/Harbin/PrimaryScreenView.xaml similarity index 96% rename from CRSim/Views/Windows/Stations/Harbin/PrimaryScreenView.xaml rename to CRSim.ScreenSimulator/Views/Windows/Stations/Harbin/PrimaryScreenView.xaml index dd00c5d..65dae8a 100644 --- a/CRSim/Views/Windows/Stations/Harbin/PrimaryScreenView.xaml +++ b/CRSim.ScreenSimulator/Views/Windows/Stations/Harbin/PrimaryScreenView.xaml @@ -1,20 +1,21 @@ - - - - - + + + + - - + + diff --git a/CRSim/Views/Windows/Stations/Shanghai/OutsideScreenView.xaml.cs b/CRSim.ScreenSimulator/Views/Windows/Stations/Shanghai/OutsideScreenView.xaml.cs similarity index 82% rename from CRSim/Views/Windows/Stations/Shanghai/OutsideScreenView.xaml.cs rename to CRSim.ScreenSimulator/Views/Windows/Stations/Shanghai/OutsideScreenView.xaml.cs index fc6b209..fb58f12 100644 --- a/CRSim/Views/Windows/Stations/Shanghai/OutsideScreenView.xaml.cs +++ b/CRSim.ScreenSimulator/Views/Windows/Stations/Shanghai/OutsideScreenView.xaml.cs @@ -1,6 +1,9 @@ -using CRSim.ViewModels.Shanghai; +using CRSim.ScreenSimulator.ViewModels.Shanghai; +using System.Windows; +using System.Windows.Input; +using System.Windows.Media; -namespace CRSim.Views.Shanghai +namespace CRSim.ScreenSimulator.Views.Shanghai { /// /// SecondaryScreen.xaml 的交互逻辑 diff --git a/CRSim/Views/Windows/Stations/Tianjin/PlatformScreenView.xaml b/CRSim.ScreenSimulator/Views/Windows/Stations/Tianjin/PlatformScreenView.xaml similarity index 92% rename from CRSim/Views/Windows/Stations/Tianjin/PlatformScreenView.xaml rename to CRSim.ScreenSimulator/Views/Windows/Stations/Tianjin/PlatformScreenView.xaml index 02da0dc..4f8bb68 100644 --- a/CRSim/Views/Windows/Stations/Tianjin/PlatformScreenView.xaml +++ b/CRSim.ScreenSimulator/Views/Windows/Stations/Tianjin/PlatformScreenView.xaml @@ -1,18 +1,19 @@ - - + diff --git a/CRSim/Views/Windows/Stations/Hanzhong/PlatformScreenView.xaml.cs b/CRSim.ScreenSimulator/Views/Windows/Stations/Tianjin/PlatformScreenView.xaml.cs similarity index 82% rename from CRSim/Views/Windows/Stations/Hanzhong/PlatformScreenView.xaml.cs rename to CRSim.ScreenSimulator/Views/Windows/Stations/Tianjin/PlatformScreenView.xaml.cs index d559852..ff0bd3c 100644 --- a/CRSim/Views/Windows/Stations/Hanzhong/PlatformScreenView.xaml.cs +++ b/CRSim.ScreenSimulator/Views/Windows/Stations/Tianjin/PlatformScreenView.xaml.cs @@ -1,6 +1,9 @@ -using CRSim.ViewModels.Hanzhong; +using CRSim.ScreenSimulator.ViewModels.Tianjin; +using System.Windows; +using System.Windows.Input; +using System.Windows.Media; -namespace CRSim.Views.Hanzhong +namespace CRSim.ScreenSimulator.Views.Tianjin { /// /// SecondaryScreen.xaml 的交互逻辑 diff --git a/CRSim/Views/Windows/Stations/Zibo/PrimaryScreenView.xaml b/CRSim.ScreenSimulator/Views/Windows/Stations/Zibo/PrimaryScreenView.xaml similarity index 97% rename from CRSim/Views/Windows/Stations/Zibo/PrimaryScreenView.xaml rename to CRSim.ScreenSimulator/Views/Windows/Stations/Zibo/PrimaryScreenView.xaml index e6e67d1..1df45b1 100644 --- a/CRSim/Views/Windows/Stations/Zibo/PrimaryScreenView.xaml +++ b/CRSim.ScreenSimulator/Views/Windows/Stations/Zibo/PrimaryScreenView.xaml @@ -1,11 +1,12 @@ - - - + + diff --git a/CRSim/Views/Windows/Stations/Zibo/PrimaryScreenView.xaml.cs b/CRSim.ScreenSimulator/Views/Windows/Stations/Zibo/PrimaryScreenView.xaml.cs similarity index 83% rename from CRSim/Views/Windows/Stations/Zibo/PrimaryScreenView.xaml.cs rename to CRSim.ScreenSimulator/Views/Windows/Stations/Zibo/PrimaryScreenView.xaml.cs index a475193..0aef33a 100644 --- a/CRSim/Views/Windows/Stations/Zibo/PrimaryScreenView.xaml.cs +++ b/CRSim.ScreenSimulator/Views/Windows/Stations/Zibo/PrimaryScreenView.xaml.cs @@ -1,6 +1,9 @@ -using CRSim.ViewModels.Zibo; +using CRSim.ScreenSimulator.ViewModels.Zibo; +using System.Windows; +using System.Windows.Input; +using System.Windows.Media; -namespace CRSim.Views.Zibo +namespace CRSim.ScreenSimulator.Views.Zibo { /// /// PrimaryScreen.xaml 的交互逻辑 diff --git a/CRSim/Views/Windows/Stations/Zibo/SecondaryScreenView.xaml b/CRSim.ScreenSimulator/Views/Windows/Stations/Zibo/SecondaryScreenView.xaml similarity index 93% rename from CRSim/Views/Windows/Stations/Zibo/SecondaryScreenView.xaml rename to CRSim.ScreenSimulator/Views/Windows/Stations/Zibo/SecondaryScreenView.xaml index 8f06837..9c900fb 100644 --- a/CRSim/Views/Windows/Stations/Zibo/SecondaryScreenView.xaml +++ b/CRSim.ScreenSimulator/Views/Windows/Stations/Zibo/SecondaryScreenView.xaml @@ -1,19 +1,20 @@ - - - - + + + - - - - - - - - - - - - - - - - - - - - 请再次检查各项配置是否正确 - -