TyroneGit/CapMachine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

提交了仪表的模型

Browse Source
This commit is contained in:
Tyrone CT
2024-07-28 22:59:11 +08:00
parent c9f4e88e04
commit a76546ebe6
59 changed files with 3273 additions and 586 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
CapMachine.Wpf/App.xaml.cs
View File

@@ -53,7 +53,9 @@ namespace CapMachine.Wpf
protected override void RegisterTypes(IContainerRegistry containerRegistry)
{
////注册日志服务
//containerRegistry.RegisterSingleton<ILogService, LogService>();
containerRegistry.RegisterSingleton<ILogService, LogService>();
containerRegistry.RegisterSingleton<SysService>();
containerRegistry.RegisterSingleton<ConfigService>();
////注册设备服务
//containerRegistry.RegisterSingleton<MachineDataService>();
@@ -79,9 +81,12 @@ namespace CapMachine.Wpf
containerRegistry.RegisterForNavigation<MonitorView, MonitorViewModel>();
containerRegistry.RegisterForNavigation<ProConfigView, ProConfigViewModel>();
containerRegistry.RegisterForNavigation<RealTimeChartView, RealTimeChartViewModel>();
//containerRegistry.RegisterForNavigation<ProChartView, ProChartViewModel>();
//containerRegistry.RegisterForNavigation<ProConfigView, ProConfigViewModel>();
containerRegistry.RegisterForNavigation<UserManageView, UserManageViewModel>();
containerRegistry.RegisterForNavigation<ActionLogView, ActionLogViewModel>();
containerRegistry.RegisterForNavigation<FooterView, FooterViewModel>();
containerRegistry.RegisterForNavigation<ProStepConfigPsView, ProStepConfigPsViewModel>();
containerRegistry.RegisterForNavigation<ProStepConfigMainView, ProStepConfigMainViewModel>();
//注册Dialog视图时绑定VM
containerRegistry.RegisterDialog<DialogCreateProView, DialogCreateProViewModel>();
containerRegistry.RegisterDialog<DialogEditProView, DialogEditProViewModel>();
@@ -120,6 +125,7 @@ namespace CapMachine.Wpf
//从容器中获取MainView的实例对象
var container = ContainerLocator.Container;
var shell = container.Resolve<object>("MainView");
if (shell is Window view)
{
//更新Prism注册区域信息
@@ -127,6 +133,10 @@ namespace CapMachine.Wpf
RegionManager.SetRegionManager(view, regionManager);
RegionManager.UpdateRegions();
//给MainView的MainViewFooterContentRegion区域设置FooterView具体的信息
regionManager.RequestNavigate("MainViewFooterContentRegion", nameof(FooterView));
//调用首页的INavigationAware 接口做一个初始化操作
if (view.DataContext is INavigationAware navigationAware)
{
@@ -134,6 +144,7 @@ namespace CapMachine.Wpf
//呈现首页
App.Current.MainWindow = view;
}
}
//先加载服务，防止在ViewModel中使用时速度慢
@@ -141,8 +152,11 @@ namespace CapMachine.Wpf
//var appVersionService1 = ContainerLocator.Container.Resolve<MachineDataService>();
//var appVersionService2 = ContainerLocator.Container.Resolve<ILogService>();
var appVersionService3 = ContainerLocator.Container.Resolve<MachineRtDataService>();
var appVersionService4 = ContainerLocator.Container.Resolve<ProStepConfigPsView>();
base.OnInitialized();
}
}