diff --git a/CRSim/App.xaml.cs b/CRSim/App.xaml.cs index d7b1713..d6bc60f 100644 --- a/CRSim/App.xaml.cs +++ b/CRSim/App.xaml.cs @@ -1,8 +1,4 @@ -using CRSim.PlatformDiagram; -using CRSim.WebsiteSimulator; -using System.Diagnostics; - -namespace CRSim +namespace CRSim { public partial class App : Application { @@ -59,7 +55,6 @@ namespace CRSim services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); - services.AddSingleton(); services.AddTransient(); services.AddTransient(); services.AddTransient(); diff --git a/CRSim/Properties/GlobalUsing.cs b/CRSim/Properties/GlobalUsing.cs index c5a27e9..3e4086d 100644 --- a/CRSim/Properties/GlobalUsing.cs +++ b/CRSim/Properties/GlobalUsing.cs @@ -7,12 +7,11 @@ global using System.Threading.Tasks; global using System.Collections.Generic; global using System.Collections.ObjectModel; global using System.Reflection; -global using System.Timers; +global using System.Diagnostics; global using System.Threading; global using Microsoft.UI.Xaml; global using Microsoft.UI.Xaml.Controls; -global using Microsoft.UI.Dispatching; global using Microsoft.UI.Windowing; global using Microsoft.Extensions.Hosting; global using Microsoft.Extensions.DependencyInjection; @@ -25,13 +24,15 @@ global using CRSim.Models; global using CRSim.Services; global using CRSim.ViewModels; global using CRSim.ScreenSimulator; +global using CRSim.PlatformDiagram; +global using CRSim.WebsiteSimulator; global using CRSim.Core.Utils; global using CRSim.Core.Models; global using CRSim.Core.Services; global using CRSim.Core.Abstractions; + global using OfficeOpenXml; -global using CommunityToolkit.WinUI; global using Windows.Graphics; \ No newline at end of file diff --git a/CRSim/Properties/launchSettings.json b/CRSim/Properties/launchSettings.json index 799e74e..555ba4c 100644 --- a/CRSim/Properties/launchSettings.json +++ b/CRSim/Properties/launchSettings.json @@ -1,7 +1,8 @@ { "profiles": { "CRSim (Package)": { - "commandName": "MsixPackage" + "commandName": "MsixPackage", + "commandLineArgs": "-debug" }, "CRSim (Unpackaged)": { "commandName": "Project", diff --git a/CRSim/ViewModels/PlatformDiagramPageViewModel.cs b/CRSim/ViewModels/PlatformDiagramPageViewModel.cs index 2ef27f7..2900902 100644 --- a/CRSim/ViewModels/PlatformDiagramPageViewModel.cs +++ b/CRSim/ViewModels/PlatformDiagramPageViewModel.cs @@ -1,8 +1,6 @@ -using CRSim.PlatformDiagram; +namespace CRSim.ViewModels; -namespace CRSim.ViewModels; - -public partial class PlatformDiagramPageViewModel(IDialogService _dialogService, IDatabaseService _databaseService, Generator _generator) : ObservableObject +public partial class PlatformDiagramPageViewModel(IDialogService _dialogService, IDatabaseService _databaseService) : ObservableObject { public string PageTitle = "生成站台占用图"; public Station? SelectedStation;