diff --git a/CRSim/Assets/Advertisement-1.mp4 b/CRSim.ScreenSimulator/Assets/Advertisement-1.mp4
similarity index 100%
rename from CRSim/Assets/Advertisement-1.mp4
rename to CRSim.ScreenSimulator/Assets/Advertisement-1.mp4
diff --git a/CRSim/Assets/Advertisement-2.mp4 b/CRSim.ScreenSimulator/Assets/Advertisement-2.mp4
similarity index 100%
rename from CRSim/Assets/Advertisement-2.mp4
rename to CRSim.ScreenSimulator/Assets/Advertisement-2.mp4
diff --git a/CRSim/Assets/StyleImages/Ankang/ExitScreen.png b/CRSim.ScreenSimulator/Assets/Ankang/ExitScreen.png
similarity index 100%
rename from CRSim/Assets/StyleImages/Ankang/ExitScreen.png
rename to CRSim.ScreenSimulator/Assets/Ankang/ExitScreen.png
diff --git a/CRSim/Assets/StyleImages/Beijing/ArrivalScreen.png b/CRSim.ScreenSimulator/Assets/Beijing/ArrivalScreen.png
similarity index 100%
rename from CRSim/Assets/StyleImages/Beijing/ArrivalScreen.png
rename to CRSim.ScreenSimulator/Assets/Beijing/ArrivalScreen.png
diff --git a/CRSim/Assets/StyleImages/BeijingXi/PrimaryScreen.png b/CRSim.ScreenSimulator/Assets/BeijingXi/PrimaryScreen.png
similarity index 100%
rename from CRSim/Assets/StyleImages/BeijingXi/PrimaryScreen.png
rename to CRSim.ScreenSimulator/Assets/BeijingXi/PrimaryScreen.png
diff --git a/CRSim/Assets/StyleImages/ChengduDong/PrimaryTicketCheckScreen.png b/CRSim.ScreenSimulator/Assets/ChengduDong/PrimaryTicketCheckScreen.png
similarity index 100%
rename from CRSim/Assets/StyleImages/ChengduDong/PrimaryTicketCheckScreen.png
rename to CRSim.ScreenSimulator/Assets/ChengduDong/PrimaryTicketCheckScreen.png
diff --git a/CRSim/Assets/StyleImages/ChengduDong/SecondaryScreen.png b/CRSim.ScreenSimulator/Assets/ChengduDong/SecondaryScreen.png
similarity index 100%
rename from CRSim/Assets/StyleImages/ChengduDong/SecondaryScreen.png
rename to CRSim.ScreenSimulator/Assets/ChengduDong/SecondaryScreen.png
diff --git a/CRSim/Assets/StyleImages/ChengduMetro/ChengduMetro-Icon.png b/CRSim.ScreenSimulator/Assets/ChengduMetro/ChengduMetro-Icon.png
similarity index 100%
rename from CRSim/Assets/StyleImages/ChengduMetro/ChengduMetro-Icon.png
rename to CRSim.ScreenSimulator/Assets/ChengduMetro/ChengduMetro-Icon.png
diff --git a/CRSim/Assets/StyleImages/ChengduMetro/PlatformScreen.png b/CRSim.ScreenSimulator/Assets/ChengduMetro/PlatformScreen.png
similarity index 100%
rename from CRSim/Assets/StyleImages/ChengduMetro/PlatformScreen.png
rename to CRSim.ScreenSimulator/Assets/ChengduMetro/PlatformScreen.png
diff --git a/CRSim/Assets/StyleImages/DaqingDong/ConcourseBridgeScreen.png b/CRSim.ScreenSimulator/Assets/DaqingDong/ConcourseBridgeScreen.png
similarity index 100%
rename from CRSim/Assets/StyleImages/DaqingDong/ConcourseBridgeScreen.png
rename to CRSim.ScreenSimulator/Assets/DaqingDong/ConcourseBridgeScreen.png
diff --git a/CRSim/Assets/StyleImages/Fuzhou/TicketCheckScreen.png b/CRSim.ScreenSimulator/Assets/Fuzhou/TicketCheckScreen.png
similarity index 100%
rename from CRSim/Assets/StyleImages/Fuzhou/TicketCheckScreen.png
rename to CRSim.ScreenSimulator/Assets/Fuzhou/TicketCheckScreen.png
diff --git a/CRSim/Assets/StyleImages/FuzhouNan/TicketCheckScreen.png b/CRSim.ScreenSimulator/Assets/FuzhouNan/TicketCheckScreen.png
similarity index 100%
rename from CRSim/Assets/StyleImages/FuzhouNan/TicketCheckScreen.png
rename to CRSim.ScreenSimulator/Assets/FuzhouNan/TicketCheckScreen.png
diff --git a/CRSim/Assets/StyleImages/GuangdongIntercity/SecondaryScreen.png b/CRSim.ScreenSimulator/Assets/GuangdongIntercity/SecondaryScreen.png
similarity index 100%
rename from CRSim/Assets/StyleImages/GuangdongIntercity/SecondaryScreen.png
rename to CRSim.ScreenSimulator/Assets/GuangdongIntercity/SecondaryScreen.png
diff --git a/CRSim/Assets/StyleImages/Guangyuan/PrimaryScreen.png b/CRSim.ScreenSimulator/Assets/Guangyuan/PrimaryScreen.png
similarity index 100%
rename from CRSim/Assets/StyleImages/Guangyuan/PrimaryScreen.png
rename to CRSim.ScreenSimulator/Assets/Guangyuan/PrimaryScreen.png
diff --git a/CRSim/Assets/StyleImages/Hanzhong/Image.png b/CRSim.ScreenSimulator/Assets/Hanzhong/Image.png
similarity index 100%
rename from CRSim/Assets/StyleImages/Hanzhong/Image.png
rename to CRSim.ScreenSimulator/Assets/Hanzhong/Image.png
diff --git a/CRSim/Assets/StyleImages/Hanzhong/PlatformScreen.png b/CRSim.ScreenSimulator/Assets/Hanzhong/PlatformScreen.png
similarity index 100%
rename from CRSim/Assets/StyleImages/Hanzhong/PlatformScreen.png
rename to CRSim.ScreenSimulator/Assets/Hanzhong/PlatformScreen.png
diff --git a/CRSim/Assets/StyleImages/Harbin/PrimaryScreen.png b/CRSim.ScreenSimulator/Assets/Harbin/PrimaryScreen.png
similarity index 100%
rename from CRSim/Assets/StyleImages/Harbin/PrimaryScreen.png
rename to CRSim.ScreenSimulator/Assets/Harbin/PrimaryScreen.png
diff --git a/CRSim/Assets/StyleImages/Jinanxi/SmallScreen.png b/CRSim.ScreenSimulator/Assets/Jinanxi/SmallScreen.png
similarity index 100%
rename from CRSim/Assets/StyleImages/Jinanxi/SmallScreen.png
rename to CRSim.ScreenSimulator/Assets/Jinanxi/SmallScreen.png
diff --git a/CRSim/Assets/StyleImages/Mianyang/PlatformScreen.png b/CRSim.ScreenSimulator/Assets/Mianyang/PlatformScreen.png
similarity index 100%
rename from CRSim/Assets/StyleImages/Mianyang/PlatformScreen.png
rename to CRSim.ScreenSimulator/Assets/Mianyang/PlatformScreen.png
diff --git a/CRSim/Assets/StyleImages/Shanghai/OutsideScreen.png b/CRSim.ScreenSimulator/Assets/Shanghai/OutsideScreen.png
similarity index 100%
rename from CRSim/Assets/StyleImages/Shanghai/OutsideScreen.png
rename to CRSim.ScreenSimulator/Assets/Shanghai/OutsideScreen.png
diff --git a/CRSim/Assets/StyleImages/Tianjin/PlatformScreen.png b/CRSim.ScreenSimulator/Assets/Tianjin/PlatformScreen.png
similarity index 100%
rename from CRSim/Assets/StyleImages/Tianjin/PlatformScreen.png
rename to CRSim.ScreenSimulator/Assets/Tianjin/PlatformScreen.png
diff --git a/CRSim/Assets/StyleImages/Tianjin/image.png b/CRSim.ScreenSimulator/Assets/Tianjin/image.png
similarity index 100%
rename from CRSim/Assets/StyleImages/Tianjin/image.png
rename to CRSim.ScreenSimulator/Assets/Tianjin/image.png
diff --git a/CRSim/Assets/StyleImages/XuzhouMetro/Background.jpg b/CRSim.ScreenSimulator/Assets/XuzhouMetro/Background.jpg
similarity index 100%
rename from CRSim/Assets/StyleImages/XuzhouMetro/Background.jpg
rename to CRSim.ScreenSimulator/Assets/XuzhouMetro/Background.jpg
diff --git a/CRSim/Assets/StyleImages/XuzhouMetro/Metro.png b/CRSim.ScreenSimulator/Assets/XuzhouMetro/Metro.png
similarity index 100%
rename from CRSim/Assets/StyleImages/XuzhouMetro/Metro.png
rename to CRSim.ScreenSimulator/Assets/XuzhouMetro/Metro.png
diff --git a/CRSim/Assets/StyleImages/XuzhouMetro/PlatformScreen.png b/CRSim.ScreenSimulator/Assets/XuzhouMetro/PlatformScreen.png
similarity index 100%
rename from CRSim/Assets/StyleImages/XuzhouMetro/PlatformScreen.png
rename to CRSim.ScreenSimulator/Assets/XuzhouMetro/PlatformScreen.png
diff --git a/CRSim/Assets/StyleImages/XuzhouMetro/XuzhouMetro-Icon.png b/CRSim.ScreenSimulator/Assets/XuzhouMetro/XuzhouMetro-Icon.png
similarity index 100%
rename from CRSim/Assets/StyleImages/XuzhouMetro/XuzhouMetro-Icon.png
rename to CRSim.ScreenSimulator/Assets/XuzhouMetro/XuzhouMetro-Icon.png
diff --git a/CRSim/Assets/StyleImages/Zibo/ConcourseBridgeScreen.png b/CRSim.ScreenSimulator/Assets/Zibo/ConcourseBridgeScreen.png
similarity index 100%
rename from CRSim/Assets/StyleImages/Zibo/ConcourseBridgeScreen.png
rename to CRSim.ScreenSimulator/Assets/Zibo/ConcourseBridgeScreen.png
diff --git a/CRSim/Assets/StyleImages/Zibo/PlatformScreen.png b/CRSim.ScreenSimulator/Assets/Zibo/PlatformScreen.png
similarity index 100%
rename from CRSim/Assets/StyleImages/Zibo/PlatformScreen.png
rename to CRSim.ScreenSimulator/Assets/Zibo/PlatformScreen.png
diff --git a/CRSim/Assets/StyleImages/Zibo/PrimaryScreen.png b/CRSim.ScreenSimulator/Assets/Zibo/PrimaryScreen.png
similarity index 100%
rename from CRSim/Assets/StyleImages/Zibo/PrimaryScreen.png
rename to CRSim.ScreenSimulator/Assets/Zibo/PrimaryScreen.png
diff --git a/CRSim/Assets/StyleImages/Zibo/SecondaryScreen.png b/CRSim.ScreenSimulator/Assets/Zibo/SecondaryScreen.png
similarity index 100%
rename from CRSim/Assets/StyleImages/Zibo/SecondaryScreen.png
rename to CRSim.ScreenSimulator/Assets/Zibo/SecondaryScreen.png
diff --git a/CRSim/Assets/StyleImages/Zibo/TicketCheckScreen.png b/CRSim.ScreenSimulator/Assets/Zibo/TicketCheckScreen.png
similarity index 100%
rename from CRSim/Assets/StyleImages/Zibo/TicketCheckScreen.png
rename to CRSim.ScreenSimulator/Assets/Zibo/TicketCheckScreen.png
diff --git a/CRSim.ScreenSimulator/CRSim.ScreenSimulator.csproj b/CRSim.ScreenSimulator/CRSim.ScreenSimulator.csproj
index 9a47959..7bb15db 100644
--- a/CRSim.ScreenSimulator/CRSim.ScreenSimulator.csproj
+++ b/CRSim.ScreenSimulator/CRSim.ScreenSimulator.csproj
@@ -7,6 +7,19 @@
enable
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+
+
+
+
+
@@ -69,4 +82,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/CRSim/Models/StylesInfoData.json b/CRSim.ScreenSimulator/Models/StylesInfoData.json
similarity index 77%
rename from CRSim/Models/StylesInfoData.json
rename to CRSim.ScreenSimulator/Models/StylesInfoData.json
index 8f67d11..f7635c6 100644
--- a/CRSim/Models/StylesInfoData.json
+++ b/CRSim.ScreenSimulator/Models/StylesInfoData.json
@@ -5,7 +5,6 @@
"Station": "成都东",
"Author": "电排骨",
"Type": "车站大屏",
- "ImagePath": "Assets/StyleImages/ChengduDong/SecondaryScreen.png",
"Parameters": [
"Station",
"Text"
@@ -17,7 +16,6 @@
"Station": "成都东",
"Author": "电排骨",
"Type": "检票口屏",
- "ImagePath": "Assets/StyleImages/ChengduDong/PrimaryTicketCheckScreen.png",
"Parameters": [
"Station",
"TicketCheck",
@@ -30,7 +28,6 @@
"Station": "福州",
"Author": "电排骨",
"Type": "检票口屏",
- "ImagePath": "Assets/StyleImages/Fuzhou/TicketCheckScreen.png",
"Parameters": [
"Station",
"TicketCheck",
@@ -43,7 +40,6 @@
"Station": "福州南",
"Author": "电排骨",
"Type": "检票口屏",
- "ImagePath": "Assets/StyleImages/FuzhouNan/TicketCheckScreen.png",
"Parameters": [
"Station",
"TicketCheck",
@@ -56,7 +52,6 @@
"Station": "北京西",
"Author": "电排骨",
"Type": "车站大屏",
- "ImagePath": "Assets/StyleImages/BeijingXi/PrimaryScreen.png",
"Parameters": [
"Station"
]
@@ -67,7 +62,6 @@
"Station": "哈尔滨",
"Author": "电排骨",
"Type": "车站大屏",
- "ImagePath": "Assets/StyleImages/Harbin/PrimaryScreen.png",
"Parameters": [
"Station",
"Text"
@@ -79,7 +73,6 @@
"Station": "成都地铁",
"Author": "电排骨",
"Type": "站台屏",
- "ImagePath": "Assets/StyleImages/ChengduMetro/PlatformScreen.png",
"Parameters": [
"Station",
"Text",
@@ -93,7 +86,6 @@
"Station": "徐州地铁",
"Author": "电排骨",
"Type": "站台屏",
- "ImagePath": "Assets/StyleImages/XuzhouMetro/PlatformScreen.png",
"Parameters": [
"Station",
"Text",
@@ -107,7 +99,6 @@
"Station": "广元",
"Author": "电排骨",
"Type": "车站大屏",
- "ImagePath": "Assets/StyleImages/Guangyuan/PrimaryScreen.png",
"Parameters": [
"Station",
"Text"
@@ -119,7 +110,6 @@
"Station": "上海",
"Author": "电排骨",
"Type": "车站大屏",
- "ImagePath": "Assets/StyleImages/Shanghai/OutsideScreen.png",
"Parameters": [
"Station"
]
@@ -130,7 +120,6 @@
"Station": "汉中",
"Author": "电排骨",
"Type": "站台屏",
- "ImagePath": "Assets/StyleImages/Hanzhong/PlatformScreen.png",
"Parameters": [
"Station",
"Platform",
@@ -143,7 +132,6 @@
"Station": "天津",
"Author": "电排骨",
"Type": "站台屏",
- "ImagePath": "Assets/StyleImages/Tianjin/PlatformScreen.png",
"Parameters": [
"Station",
"Platform",
@@ -156,7 +144,6 @@
"Station": "绵阳",
"Author": "电排骨",
"Type": "站台屏",
- "ImagePath": "Assets/StyleImages/Mianyang/PlatformScreen.png",
"Parameters": [
"Station",
"Platform",
@@ -169,7 +156,6 @@
"Station": "淄博",
"Author": "wxl0430",
"Type": "车站大屏",
- "ImagePath": "Assets/StyleImages/Zibo/PrimaryScreen.png",
"Parameters": [
"Station"
]
@@ -180,7 +166,6 @@
"Station": "淄博",
"Author": "wxl0430",
"Type": "车站大屏",
- "ImagePath": "Assets/StyleImages/Zibo/SecondaryScreen.png",
"Parameters": [
"Station"
]
@@ -191,7 +176,6 @@
"Station": "淄博",
"Author": "wxl0430",
"Type": "检票口屏",
- "ImagePath": "Assets/StyleImages/Zibo/TicketCheckScreen.png",
"Parameters": [
"Station",
"TicketCheck",
@@ -204,7 +188,6 @@
"Station": "淄博",
"Author": "wxl0430",
"Type": "站台屏",
- "ImagePath": "Assets/StyleImages/Zibo/PlatformScreen.png",
"Parameters": [
"Station",
"Platform",
@@ -218,7 +201,6 @@
"Station": "淄博",
"Author": "wxl0430",
"Type": "走廊出发屏",
- "ImagePath": "Assets/StyleImages/Zibo/ConcourseBridgeScreen.png",
"Parameters": [
"Station",
"Platform",
@@ -231,7 +213,6 @@
"Station": "济南西",
"Author": "wxl0430",
"Type": "车站大屏",
- "ImagePath": "Assets/StyleImages/Jinanxi/SmallScreen.png",
"Parameters": [
"Station"
]
@@ -242,7 +223,6 @@
"Station": "广东城际",
"Author": "电排骨",
"Type": "车站大屏",
- "ImagePath": "Assets/StyleImages/GuangdongIntercity/SecondaryScreen.png",
"Parameters": [
"Station",
"Text"
@@ -254,7 +234,6 @@
"Station": "安康",
"Author": "电排骨",
"Type": "出站口屏",
- "ImagePath": "Assets/StyleImages/Ankang/ExitScreen.png",
"Parameters": [
"Station",
"Text"
@@ -266,7 +245,6 @@
"Station": "北京",
"Author": "wxl0430",
"Type": "走廊到达屏",
- "ImagePath": "Assets/StyleImages/Beijing/ArrivalScreen.png",
"Parameters": [
"Station",
"Platform"
@@ -278,7 +256,6 @@
"Station": "大庆东",
"Author": "wxl0430",
"Type": "走廊出发屏",
- "ImagePath": "Assets/StyleImages/DaqingDong/ConcourseBridgeScreen.png",
"Parameters": [
"Station",
"Platform",
diff --git a/CRSim/Models/StylesInfoDataSource.cs b/CRSim.ScreenSimulator/Models/StylesInfoDataSource.cs
similarity index 87%
rename from CRSim/Models/StylesInfoDataSource.cs
rename to CRSim.ScreenSimulator/Models/StylesInfoDataSource.cs
index 51eb40a..81ecdcf 100644
--- a/CRSim/Models/StylesInfoDataSource.cs
+++ b/CRSim.ScreenSimulator/Models/StylesInfoDataSource.cs
@@ -1,11 +1,13 @@
-namespace CRSim.Models
+using System.Reflection;
+using System.Text.Json;
+
+namespace CRSim.ScreenSimulator.Models
{
public class StylesInfoDataItem
{
public string UniqueId { get; set; }
public string Title { get; set; }
public string Station { get; set; }
- public string ImagePath { get; set; }
public string Author { get; set; }
public string Type { get; set; }
public Type ViewType
@@ -21,7 +23,7 @@
{
get
{
- return new Uri($"pack://application:,,,/{ImagePath}");
+ return new Uri($"pack://application:,,,/CRSim.ScreenSimulator;component/Assets/{UniqueId.Replace('.', '/')}.png");
}
}
@@ -66,7 +68,7 @@
private static string ReadStylesData()
{
var assembly = typeof(StylesInfoDataSource).Assembly;
- var resourceName = "CRSim.Models.StylesInfoData.json";
+ var resourceName = "CRSim.ScreenSimulator.Models.StylesInfoData.json";
using var stream = assembly.GetManifestResourceStream(resourceName);
using var reader = new System.IO.StreamReader(stream);
diff --git a/CRSim.ScreenSimulator/Services/ServiceCollectionExtensions.cs b/CRSim.ScreenSimulator/Services/ServiceCollectionExtensions.cs
new file mode 100644
index 0000000..48fe334
--- /dev/null
+++ b/CRSim.ScreenSimulator/Services/ServiceCollectionExtensions.cs
@@ -0,0 +1,27 @@
+using CRSim.ScreenSimulator.Models;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace CRSim.ScreenSimulator.Services
+{
+ public static class ServiceCollectionExtensions
+ {
+ public static IServiceCollection AddScreenSimulatorServices(this IServiceCollection services)
+ {
+ foreach (var uniqueId in StylesInfoDataSource.Instance.StylesInfo.Select(x => x.UniqueId))
+ {
+ var viewModelType = Type.GetType($"CRSim.ScreenSimulator.ViewModels.{uniqueId}ViewModel");
+ if (viewModelType != null)
+ {
+ services.AddTransient(viewModelType);
+ }
+
+ var viewType = Type.GetType($"CRSim.ScreenSimulator.Views.{uniqueId}View");
+ if (viewType != null)
+ {
+ services.AddTransient(viewType);
+ }
+ }
+ return services;
+ }
+ }
+}
diff --git a/CRSim.ScreenSimulator/Views/ChengduMetro/PlatformScreenView.xaml b/CRSim.ScreenSimulator/Views/ChengduMetro/PlatformScreenView.xaml
index 7fd606d..e8ce16f 100644
--- a/CRSim.ScreenSimulator/Views/ChengduMetro/PlatformScreenView.xaml
+++ b/CRSim.ScreenSimulator/Views/ChengduMetro/PlatformScreenView.xaml
@@ -47,7 +47,7 @@
-
+
diff --git a/CRSim.ScreenSimulator/Views/Hanzhong/PlatformScreenView.xaml b/CRSim.ScreenSimulator/Views/Hanzhong/PlatformScreenView.xaml
index 75ff5b8..e975abc 100644
--- a/CRSim.ScreenSimulator/Views/Hanzhong/PlatformScreenView.xaml
+++ b/CRSim.ScreenSimulator/Views/Hanzhong/PlatformScreenView.xaml
@@ -37,7 +37,7 @@
-
+
diff --git a/CRSim.ScreenSimulator/Views/Tianjin/PlatformScreenView.xaml b/CRSim.ScreenSimulator/Views/Tianjin/PlatformScreenView.xaml
index 4f8bb68..ddffb2d 100644
--- a/CRSim.ScreenSimulator/Views/Tianjin/PlatformScreenView.xaml
+++ b/CRSim.ScreenSimulator/Views/Tianjin/PlatformScreenView.xaml
@@ -49,7 +49,7 @@
-
+
diff --git a/CRSim.ScreenSimulator/Views/XuzhouMetro/PlatformScreenView.xaml b/CRSim.ScreenSimulator/Views/XuzhouMetro/PlatformScreenView.xaml
index 7b61c81..c7c1529 100644
--- a/CRSim.ScreenSimulator/Views/XuzhouMetro/PlatformScreenView.xaml
+++ b/CRSim.ScreenSimulator/Views/XuzhouMetro/PlatformScreenView.xaml
@@ -22,7 +22,7 @@
-
+
@@ -34,7 +34,7 @@
-
+
@@ -56,7 +56,7 @@
-
+
@@ -79,7 +79,7 @@
-
+
diff --git a/CRSim/App.xaml.cs b/CRSim/App.xaml.cs
index eed0b9c..8aa4317 100644
--- a/CRSim/App.xaml.cs
+++ b/CRSim/App.xaml.cs
@@ -1,4 +1,6 @@
-namespace CRSim
+using CRSim.ScreenSimulator.Services;
+
+namespace CRSim
{
///
/// Interaction logic for App.xaml
@@ -38,53 +40,8 @@
services.AddTransient();
services.AddTransient();
+ services.AddScreenSimulatorServices();
- services.AddTransient();
- services.AddTransient();
- services.AddTransient();
- services.AddTransient();
- services.AddTransient();
- services.AddTransient();
- services.AddTransient();
- services.AddTransient();
- services.AddTransient();
- services.AddTransient();
- services.AddTransient();
- services.AddTransient();
- services.AddTransient();
- services.AddTransient();
- services.AddTransient();
- services.AddTransient();
- services.AddTransient();
- services.AddTransient();
- services.AddTransient();
- services.AddTransient();
- services.AddTransient();
- services.AddTransient();
- services.AddTransient();
- services.AddTransient();
- services.AddTransient();
- services.AddTransient();
- services.AddTransient();
- services.AddTransient();
- services.AddTransient();
- services.AddTransient();
- services.AddTransient();
- services.AddTransient();
- services.AddTransient();
- services.AddTransient();
- services.AddTransient();
- services.AddTransient();
- services.AddTransient();
- services.AddTransient();
- services.AddTransient();
- services.AddTransient();
- services.AddTransient();
- services.AddTransient();
- services.AddTransient();
- services.AddTransient();
- services.AddTransient();
- services.AddTransient();
}).Build();
[STAThread]
diff --git a/CRSim/CRSim.csproj b/CRSim/CRSim.csproj
index af84505..452e0cc 100644
--- a/CRSim/CRSim.csproj
+++ b/CRSim/CRSim.csproj
@@ -14,24 +14,8 @@
-
-
-
-
-
-
-
-
-
-
-
- PreserveNewest
-
-
- PreserveNewest
-
@@ -45,38 +29,8 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/CRSim/ViewModels/Pages/Simulation/ScreenSimulationPageViewModel.cs b/CRSim/ViewModels/Pages/Simulation/ScreenSimulationPageViewModel.cs
index 7f834ae..036a7fe 100644
--- a/CRSim/ViewModels/Pages/Simulation/ScreenSimulationPageViewModel.cs
+++ b/CRSim/ViewModels/Pages/Simulation/ScreenSimulationPageViewModel.cs
@@ -1,4 +1,6 @@
-namespace CRSim.ViewModels;
+using CRSim.ScreenSimulator.Models;
+
+namespace CRSim.ViewModels;
public partial class ScreenSimulationPageViewModel : ObservableObject
{