增加了初始弹窗,但是没有成功

更改了CAN和LIN协调
更改了配置程序的名称顺序
This commit is contained in:
2025-01-11 12:04:34 +08:00
parent 620c5e8178
commit e49a48fb25
53 changed files with 5118 additions and 131 deletions

View File

@@ -9,7 +9,7 @@ using System.Threading.Tasks;
namespace CapMachine.Wpf.Services
{
/// <summary>
/// 公共操作的服务
/// 存放公共事件的服务
@@ -22,12 +22,14 @@ namespace CapMachine.Wpf.Services
public DataRecordService DataRecordService { get; }
public SysRunService SysRunServer { get; }
public PPCService PPCService { get; }
public CanDriveService CanDriveService { get; }
public LinDriveService LinDriveService { get; }
public MachineRtDataService MachineRtDataService { get; }
public IDialogService DialogService { get; }
public ComActionService(ConfigService configService, IEventAggregator eventAggregator,
DataRecordService dataRecordService, SysRunService sysRunService,PPCService pPCService,
DataRecordService dataRecordService, SysRunService sysRunService, PPCService pPCService, CanDriveService canDriveService, LinDriveService linDriveService,
MachineRtDataService machineRtDataService, IDialogService dialogService)
{
ConfigService = configService;
@@ -36,6 +38,8 @@ namespace CapMachine.Wpf.Services
DataRecordService = dataRecordService;
SysRunServer = sysRunService;
PPCService = pPCService;
CanDriveService = canDriveService;
LinDriveService = linDriveService;
MachineRtDataService = machineRtDataService;
DialogService = dialogService;
@@ -43,7 +47,6 @@ namespace CapMachine.Wpf.Services
}
#region
/// <summary>
@@ -90,6 +93,42 @@ namespace CapMachine.Wpf.Services
}
#endregion
#region CAN和LIN协调
//CAN和LIN同一个时刻只能有一个在工作
/// <summary>
/// CAN是否可以工作
/// </summary>
/// <returns></returns>
public bool IsCanToDoWork()
{
if (LinDriveService.ToomossLinDrive.OpenState == true)
{
return false;
}
return true;
}
/// <summary>
/// LIN是否可以工作
/// </summary>
/// <returns></returns>
public bool IsLINToDoWork()
{
if (CanDriveService.ToomossCanDrive.OpenState == true)
{
return false;
}
return true;
}
#endregion
}
}