一些更改

This commit is contained in:
2025-01-21 18:35:00 +08:00
parent 914a8b3dbc
commit 0bbe361ab7
23 changed files with 536 additions and 101 deletions

View File

@@ -14,7 +14,7 @@ namespace CapMachine.Wpf.Services
/// </summary>
public class SysRunService : BindableBase
{
public SysRunService(IEventAggregator eventAggregator,ConfigService configService)
public SysRunService(IEventAggregator eventAggregator,ConfigService configService,CanDriveService canDriveService,LinDriveService linDriveService)
{
// 创建一个定时器设置间隔时间为2000毫秒即2秒
CurTimer = new System.Timers.Timer(5000);
@@ -26,7 +26,9 @@ namespace CapMachine.Wpf.Services
EventAggregator = eventAggregator;
ConfigService = configService;
MachineRunState1 = new MachineRunState("M1", EventAggregator, ConfigService);
CanDriveService = canDriveService;
LinDriveService = linDriveService;
MachineRunState1 = new MachineRunState("M1", EventAggregator, ConfigService,canDriveService,linDriveService);
}
@@ -36,7 +38,6 @@ namespace CapMachine.Wpf.Services
public MachineRunState MachineRunState1 { get; set; }
private void CurTimer_Elapsed(object? sender, System.Timers.ElapsedEventArgs e)
{
CurDateTime = DateTime.Now;
@@ -63,5 +64,7 @@ namespace CapMachine.Wpf.Services
/// </summary>
public IEventAggregator EventAggregator { get; }
public ConfigService ConfigService { get; }
public CanDriveService CanDriveService { get; }
public LinDriveService LinDriveService { get; }
}
}