主要变更:
1. 创建了 DeviceStateType 枚举来区分状态类型(激活/连接) 2. 创建了 DeviceStateChangedEventArgs 统一事件类 3. 更新了 IEventService 接口,将两个事件合并为一个 4. 更新了 EventService 实现以支持新事件 5. 更新了所有相关服务(DeviceMonitoringService, OpcUaServiceManager, S7ServiceManager, DeviceDataService, DeviceItemViewModel) 关键优点: - 减少了事件类型的数量,简化了事件系统 - 为设备状态变化提供了一致的处理方式 - 保持了向后兼容性,将旧类标记为 [Obsolete]
This commit is contained in:
@@ -224,9 +224,9 @@ namespace DMS.Infrastructure.Services.S7
|
||||
}
|
||||
finally
|
||||
{
|
||||
_eventService.RaiseDeviceConnectChanged(
|
||||
_eventService.RaiseDeviceStateChanged(
|
||||
this,
|
||||
new DeviceConnectChangedEventArgs(context.Device.Id, context.Device.Name, context.IsConnected));
|
||||
new DeviceStateChangedEventArgs(context.Device.Id, context.Device.Name, context.IsConnected, Core.Enums.DeviceStateType.Connection));
|
||||
_semaphore.Release();
|
||||
}
|
||||
}
|
||||
@@ -245,9 +245,9 @@ namespace DMS.Infrastructure.Services.S7
|
||||
await context.S7Service.DisconnectAsync();
|
||||
context.IsConnected = false;
|
||||
|
||||
_eventService.RaiseDeviceConnectChanged(
|
||||
_eventService.RaiseDeviceStateChanged(
|
||||
this,
|
||||
new DeviceConnectChangedEventArgs(context.Device.Id, context.Device.Name, context.IsConnected));
|
||||
new DeviceStateChangedEventArgs(context.Device.Id, context.Device.Name, context.IsConnected, Core.Enums.DeviceStateType.Connection));
|
||||
_logger.LogInformation("设备 {DeviceName} 连接已断开", context.Device.Name);
|
||||
}
|
||||
catch (Exception ex)
|
||||
|
||||
Reference in New Issue
Block a user