主要变更：

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

  关键优点：
   - 减少了事件类型的数量，简化了事件系统
   - 为设备状态变化提供了一致的处理方式
   - 保持了向后兼容性，将旧类标记为 [Obsolete]

DMS.Application/Interfaces/IEventService.cs

@@ -12,16 +12,16 @@ public interface IEventService
     #region 设备事件
 
     /// <summary>
-    /// 设备状态改变事件
+    /// 设备状态改变事件（统一事件，处理激活状态和连接状态变化）
     /// </summary>
-    event EventHandler<DeviceActiveChangedEventArgs> OnDeviceActiveChanged;
+    event EventHandler<DeviceStateChangedEventArgs> OnDeviceStateChanged;
 
     /// <summary>
     /// 触发设备状态改变事件
     /// </summary>
     /// <param name="sender">事件发送者</param>
     /// <param name="e">设备状态改变事件参数</param>
-    void RaiseDeviceActiveChanged(object sender, DeviceActiveChangedEventArgs e);
+    void RaiseDeviceStateChanged(object sender, DeviceStateChangedEventArgs e);
 
     /// <summary>
     /// 设备添加事件
@@ -69,17 +69,7 @@ public interface IEventService
 
     #endregion
 
-    /// <summary>
-    /// 设备运行改变事件
-    /// </summary>
-    event EventHandler<DeviceConnectChangedEventArgs> OnDeviceConnectChanged;
-
-    /// <summary>
-    /// 触发设备状态改变事件
-    /// </summary>
-    /// <param name="sender">事件发送者</param>
-    /// <param name="e">设备状态改变事件参数</param>
-    void RaiseDeviceConnectChanged(object sender, DeviceConnectChangedEventArgs e);
+    
 
     /// <summary>
     /// 变量值改变事件

DMS.Application/Services/EventService.cs

@@ -20,14 +20,9 @@ public class EventService : IEventService
     #region 设备事件
 
     /// <summary>
-    /// 设备状态改变事件
+    /// 设备状态改变事件（统一事件，处理激活状态和连接状态变化）
     /// </summary>
-    public event EventHandler<DeviceActiveChangedEventArgs> OnDeviceActiveChanged;
-    
-    /// <summary>
-    /// 设备运行改变事件
-    /// </summary>
-    public event EventHandler<DeviceConnectChangedEventArgs> OnDeviceConnectChanged;
+    public event EventHandler<DeviceStateChangedEventArgs> OnDeviceStateChanged;
 
     /// <summary>
     /// 设备添加事件
@@ -47,20 +42,33 @@ public class EventService : IEventService
             if (device.IsActive != e.NewStatus)
             {
                 device.IsActive = e.NewStatus;
-                OnDeviceActiveChanged?.Invoke(sender, e);
+                // 转发到统一的设备状态事件
+                var unifiedEvent = new DeviceStateChangedEventArgs(e.DeviceId, e.DeviceName, e.NewStatus, Core.Enums.DeviceStateType.Active);
+                OnDeviceStateChanged?.Invoke(sender, unifiedEvent);
             }
         }
     }
 
     /// <summary>
-    /// 触发设备状态改变事件
+    /// 触发设备连接状态改变事件
     /// </summary>
     /// <param name="sender">事件发送者</param>
     /// <param name="e">设备状态改变事件参数</param>
     public void RaiseDeviceConnectChanged(object sender, DeviceConnectChangedEventArgs e)
     {
-        OnDeviceConnectChanged?.Invoke(sender, e);
+        // 转发到统一的设备状态事件
+        var unifiedEvent = new DeviceStateChangedEventArgs(e.DeviceId, e.DeviceName, e.NewStatus, Core.Enums.DeviceStateType.Connection);
+        OnDeviceStateChanged?.Invoke(sender, unifiedEvent);
+    }
 
+    /// <summary>
+    /// 触发设备状态改变事件（统一事件）
+    /// </summary>
+    /// <param name="sender">事件发送者</param>
+    /// <param name="e">设备状态改变事件参数</param>
+    public void RaiseDeviceStateChanged(object sender, DeviceStateChangedEventArgs e)
+    {
+        OnDeviceStateChanged?.Invoke(sender, e);
     }
 
     /// <summary>

DMS.Application/Services/Monitoring/DeviceMonitoringService.cs

@@ -33,23 +33,27 @@ public class DeviceMonitoringService : IDeviceMonitoringService, IDisposable
         _eventService = eventService;
         _appDataStorageService = appDataStorageService;
         _appDataCenterService = appDataCenterService;
-        _eventService.OnDeviceActiveChanged += OnDeviceActiveChanged;
+        _eventService.OnDeviceStateChanged += OnDeviceStateChanged;
     }
 
-    private void OnDeviceActiveChanged(object? sender, DeviceActiveChangedEventArgs e)
+    private void OnDeviceStateChanged(object? sender, DeviceStateChangedEventArgs e)
     {
-        if (_appDataStorageService.Devices.TryGetValue(e.DeviceId, out var device))
+        // 只处理激活状态变化事件
+        if (e.StateType == Core.Enums.DeviceStateType.Active)
         {
-            // 更新设备激活状态 - 同时更新数据库和内存
-            _ = Task.Run(async () =>
+            if (_appDataStorageService.Devices.TryGetValue(e.DeviceId, out var device))
             {
-                await _appDataCenterService.DeviceManagementService.UpdateDeviceAsync(device);
-            });
+                // 更新设备激活状态 - 同时更新数据库和内存
+                _ = Task.Run(async () =>
+                {
+                    await _appDataCenterService.DeviceManagementService.UpdateDeviceAsync(device);
+                });
+            }
         }
     }
 
     public void Dispose()
     {
-        _eventService.OnDeviceActiveChanged -= OnDeviceActiveChanged;
+        _eventService.OnDeviceStateChanged -= OnDeviceStateChanged;
     }
 }