From f998bed5120b51c8cb29046c6cffc631a26290d8 Mon Sep 17 00:00:00 2001 From: zqm Date: Tue, 4 Nov 2025 14:46:42 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E4=B8=8D=E5=86=8D=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E7=9A=84OnTemperatureReceived=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E5=92=8CTemperatureReceived=E4=BA=8B=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Toprie/Toprie/DeviceManager.cs | 49 +------------------ 1 file changed, 2 insertions(+), 47 deletions(-) diff --git a/Windows/CS/Framework4.0/Toprie/Toprie/DeviceManager.cs b/Windows/CS/Framework4.0/Toprie/Toprie/DeviceManager.cs index 6fb2b1b..7616adc 100644 --- a/Windows/CS/Framework4.0/Toprie/Toprie/DeviceManager.cs +++ b/Windows/CS/Framework4.0/Toprie/Toprie/DeviceManager.cs @@ -1788,49 +1788,7 @@ namespace JoyD.Windows.CS.Toprie // private int CalculateDataLength(byte[] headerData) // 新的实现使用了CombineDataArrays和IsValidHeaderMarker方法 - /// - /// 触发温度数据接收事件 - /// - /// 事件参数 - protected virtual void OnTemperatureReceived(TemperatureReceivedEventArgs e) - { - Log($"[{DateTime.Now:HH:mm:ss.fff}] [线程:{Thread.CurrentThread.ManagedThreadId}] OnTemperatureReceived() - 开始执行"); - - // 检查参数有效性 - if (e == null) - { - Log($"[{DateTime.Now:HH:mm:ss.fff}] [线程:{Thread.CurrentThread.ManagedThreadId}] OnTemperatureReceived() - 参数为空,跳过事件触发"); - return; - } - - // 获取事件处理程序的快照,避免在多线程环境中出现竞态条件 - EventHandler handler = TemperatureReceived; - - // 检查是否有订阅者 - if (handler != null) - { - // 获取所有订阅的委托,单独处理每个处理器 - Delegate[] invocationList = handler.GetInvocationList(); - - foreach (Delegate d in invocationList) - { - try - { - // 安全地转换并调用每个处理器 - EventHandler invoker = (EventHandler)d; - invoker(this, e); - Log($"[{DateTime.Now:HH:mm:ss.fff}] [线程:{Thread.CurrentThread.ManagedThreadId}] OnTemperatureReceived() - 成功触发一个事件处理器: {d.Method.Name}"); - } - catch (Exception ex) - { - // 捕获单个事件处理器的异常,确保其他处理器仍能被调用 - Log($"[{DateTime.Now:HH:mm:ss.fff}] [线程:{Thread.CurrentThread.ManagedThreadId}] OnTemperatureReceived() - 事件处理器异常: {ex.Message}"); - } - } - } - - Log($"[{DateTime.Now:HH:mm:ss.fff}] [线程:{Thread.CurrentThread.ManagedThreadId}] OnTemperatureReceived() - 执行完成"); - } + // 不再需要温度数据实时通知机制,已移除OnTemperatureReceived方法 #endregion 温度数据处理方法 @@ -1851,10 +1809,7 @@ namespace JoyD.Windows.CS.Toprie /// public event EventHandler ImageReceived; - /// - /// 温度数据接收事件 - /// - public event EventHandler TemperatureReceived; + // 不再需要温度数据实时通知机制,已移除TemperatureReceived事件 #endregion 公共事件