主要变更:

1. 创建了 DeviceStateType 枚举来区分状态类型(激活/连接)
   2. 创建了 DeviceStateChangedEventArgs 统一事件类
   3. 更新了 IEventService 接口,将两个事件合并为一个
   4. 更新了 EventService 实现以支持新事件
   5. 更新了所有相关服务(DeviceMonitoringService, OpcUaServiceManager, S7ServiceManager, DeviceDataService, DeviceItemViewModel)

  关键优点:
   - 减少了事件类型的数量,简化了事件系统
   - 为设备状态变化提供了一致的处理方式
   - 保持了向后兼容性,将旧类标记为 [Obsolete]
This commit is contained in:
2025-10-01 18:41:05 +08:00
parent c0223b083a
commit e84a202438
11 changed files with 159 additions and 66 deletions

View File

@@ -49,28 +49,32 @@ public class DeviceDataService : IDeviceDataService
_variableDataService = variableDataService;
_uiDispatcher = Dispatcher.CurrentDispatcher;
_eventService.OnDeviceConnectChanged += OnDeviceConnectChanged;
_eventService.OnDeviceStateChanged += OnDeviceStateChanged;
}
private void OnDeviceConnectChanged(object? sender, DeviceConnectChangedEventArgs e)
private void OnDeviceStateChanged(object? sender, DeviceStateChangedEventArgs e)
{
_uiDispatcher.Invoke(() =>
// 只处理连接状态变化
if (e.StateType == Core.Enums.DeviceStateType.Connection)
{
if (_dataStorageService.Devices.TryGetValue(e.DeviceId, out DeviceItemViewModel device))
_uiDispatcher.Invoke(() =>
{
device.IsRunning = e.NewStatus;
if (device.IsRunning)
if (_dataStorageService.Devices.TryGetValue(e.DeviceId, out DeviceItemViewModel device))
{
_notificationService.ShowSuccess($"设备:{device.Name},连接成功。");
device.IsRunning = e.StateValue;
if (device.IsRunning)
{
_notificationService.ShowSuccess($"设备:{device.Name},连接成功。");
}
else
{
_notificationService.ShowSuccess($"设备:{device.Name},已断开连接。");
}
}
else
{
_notificationService.ShowSuccess($"设备:{device.Name},已断开连接。");
}
}
});
});
}
}
/// <summary>