增加了初始弹窗,但是没有成功
更改了CAN和LIN协调 更改了配置程序的名称顺序
This commit is contained in:
@@ -8,6 +8,7 @@ using CapMachine.Wpf.ViewModels;
|
||||
using CapMachine.Wpf.Views;
|
||||
using FreeSql;
|
||||
using FreeSql.Internal;
|
||||
using Hardcodet.Wpf.TaskbarNotification;
|
||||
using Prism.DryIoc;
|
||||
using Prism.Ioc;
|
||||
using Prism.Regions;
|
||||
@@ -24,6 +25,8 @@ namespace CapMachine.Wpf
|
||||
/// </summary>
|
||||
public partial class App : PrismApplication
|
||||
{
|
||||
private TaskbarIcon taskBar;
|
||||
|
||||
/// <summary>
|
||||
/// 日志服务
|
||||
/// </summary>
|
||||
@@ -38,7 +41,7 @@ namespace CapMachine.Wpf
|
||||
//24.2.7
|
||||
//Syncfusion.SfSkinManager.SfSkinManager.ApplyStylesOnApplication = true;
|
||||
Syncfusion.Licensing.SyncfusionLicenseProvider.RegisterLicense("MzEyMzM3NkAzMjM0MmUzMDJlMzBHdjVKNUNpNWZxYXQwR05ZbVYvUEtzbGxXMnVxRjYvRGtLSlZUOGpjQW44PQ==");
|
||||
|
||||
|
||||
//System.Threading.Thread.CurrentThread.CurrentUICulture = new System.Globalization.CultureInfo("zh-CN");
|
||||
|
||||
// 授权 a717c797-59e3-48de-b6b4-574a4e03dc79
|
||||
@@ -89,19 +92,26 @@ namespace CapMachine.Wpf
|
||||
{
|
||||
////注册日志服务
|
||||
containerRegistry.RegisterSingleton<ILogService, LogService>();
|
||||
|
||||
//注册基础的服务
|
||||
//containerRegistry.RegisterSingleton<IHostDialogService, DialogHostService>();
|
||||
//containerRegistry.RegisterSingleton<IAppStartService, AppStartService>();
|
||||
//containerRegistry.RegisterSingleton<IApplicationContext, ApplicationContext>();
|
||||
|
||||
containerRegistry.RegisterSingleton<SysRunService>();
|
||||
containerRegistry.RegisterSingleton<ConfigService>();
|
||||
|
||||
containerRegistry.RegisterSingleton<AlarmService>();
|
||||
////注册设备服务
|
||||
//containerRegistry.RegisterSingleton<MachineDataService>();
|
||||
containerRegistry.RegisterSingleton<CanDriveService>();
|
||||
containerRegistry.RegisterSingleton<LinDriveService>();
|
||||
containerRegistry.RegisterSingleton<MachineRtDataService>();
|
||||
containerRegistry.RegisterSingleton<DataRecordService>();
|
||||
containerRegistry.RegisterSingleton<HighSpeedDataService>();
|
||||
containerRegistry.RegisterSingleton<PPCService>();
|
||||
|
||||
|
||||
containerRegistry.RegisterSingleton<ComActionService>();
|
||||
|
||||
|
||||
//注册AutoMapper 将IAutoMapperProvider注入IOC容器,并对外提供IMapper注入类型。
|
||||
containerRegistry.RegisterSingleton<IMapperProvider, MapperConfig>();
|
||||
@@ -145,7 +155,9 @@ namespace CapMachine.Wpf
|
||||
containerRegistry.RegisterForNavigation<QuickMeterStepView, QuickMeterStepViewModel>();
|
||||
containerRegistry.RegisterForNavigation<HistoryDataView, HistoryDataViewModel>();
|
||||
containerRegistry.RegisterForNavigation<CANConfigView, CANConfigViewModel>();
|
||||
|
||||
containerRegistry.RegisterForNavigation<LINConfigView, LinConfigViewModel>();
|
||||
|
||||
|
||||
//注册Dialog视图时绑定VM
|
||||
containerRegistry.RegisterDialog<DialogCreateProView, DialogCreateProViewModel>();
|
||||
containerRegistry.RegisterDialog<DialogEditProView, DialogEditProViewModel>();
|
||||
@@ -162,7 +174,9 @@ namespace CapMachine.Wpf
|
||||
containerRegistry.RegisterDialog<DialogLimitConfigView, DialogLimitConfigViewModel>();
|
||||
containerRegistry.RegisterDialog<DialogSuperHeatCoolConfigView, DialogSuperHeatCoolConfigViewModel>();
|
||||
|
||||
|
||||
containerRegistry.RegisterDialog<SplashScreenView, SplashScreenViewModel>();
|
||||
|
||||
|
||||
//注册AutoMapper
|
||||
//containerRegistry.RegisterSingleton<IAutoMapperProvider, AutoMapperProvider>();
|
||||
//containerRegistry.Register(typeof(IMapper), GetMapper);
|
||||
@@ -191,6 +205,15 @@ namespace CapMachine.Wpf
|
||||
/// </summary>
|
||||
protected override void OnInitialized()
|
||||
{
|
||||
|
||||
//初始加载资源的窗口 *******起始弹窗********
|
||||
//var appStart = ContainerLocator.Container.Resolve<IAppStartService>();
|
||||
//appStart.CreateShell();
|
||||
|
||||
|
||||
|
||||
//#region 初版
|
||||
|
||||
//Thread.CurrentThread.CurrentCulture = new CultureInfo("zh-CN");
|
||||
|
||||
//从容器中获取MainView的实例对象
|
||||
@@ -222,8 +245,7 @@ namespace CapMachine.Wpf
|
||||
|
||||
//先加载服务,防止在ViewModel中使用时速度慢
|
||||
var appVersionService = ContainerLocator.Container.Resolve<IFreeSql>();
|
||||
//var appVersionService1 = ContainerLocator.Container.Resolve<MachineDataService>();
|
||||
//var appVersionService2 = ContainerLocator.Container.Resolve<ILogService>();
|
||||
var appVersionService2 = ContainerLocator.Container.Resolve<ILogService>();
|
||||
var appVersionService12 = ContainerLocator.Container.Resolve<AlarmService>();
|
||||
var appVersionService3 = ContainerLocator.Container.Resolve<MachineRtDataService>();
|
||||
var appVersionService4 = ContainerLocator.Container.Resolve<ProStepConfigPsView>();
|
||||
@@ -235,15 +257,21 @@ namespace CapMachine.Wpf
|
||||
var appVersionService10 = ContainerLocator.Container.Resolve<HighSpeedDataService>();
|
||||
var appVersionService11 = ContainerLocator.Container.Resolve<PPCService>();
|
||||
var appVersionService15 = ContainerLocator.Container.Resolve<ComActionService>();
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
//给当前的全局异常捕捉服务使用
|
||||
LogService = ContainerLocator.Container.Resolve<ILogService>();
|
||||
LogService.Error("ex.ToString()");
|
||||
base.OnInitialized();
|
||||
|
||||
//#endregion
|
||||
|
||||
//*******起始弹窗 * *******
|
||||
//LogService = ContainerLocator.Container.Resolve<ILogService>();
|
||||
//LogService.Error("Start-->");
|
||||
|
||||
//base.OnInitialized();
|
||||
}
|
||||
|
||||
#region 全局异常捕捉
|
||||
@@ -258,9 +286,11 @@ namespace CapMachine.Wpf
|
||||
AppDomain.CurrentDomain.UnhandledException += new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException);
|
||||
}
|
||||
|
||||
|
||||
void App_Exit(object sender, ExitEventArgs e)
|
||||
{
|
||||
//程序退出时需要处理的业务
|
||||
LogService.Error("程序退出");
|
||||
}
|
||||
|
||||
|
||||
@@ -370,8 +400,26 @@ namespace CapMachine.Wpf
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
#endregion
|
||||
|
||||
|
||||
///// <summary>
|
||||
///// *******起始弹窗********
|
||||
///// </summary>
|
||||
//public void Initialization()
|
||||
//{
|
||||
// taskBar = (TaskbarIcon)FindResource("taskBar");
|
||||
|
||||
//}
|
||||
///// <summary>
|
||||
///// *******起始弹窗********
|
||||
///// </summary>
|
||||
//public void Dispose()
|
||||
//{
|
||||
// taskBar?.Dispose();
|
||||
//}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user