diff --git a/CANModule/ViewModels/ZLGCANFDViewModel.cs b/CANModule/ViewModels/ZLGCANFDViewModel.cs index 67ec38c..130f6a6 100644 --- a/CANModule/ViewModels/ZLGCANFDViewModel.cs +++ b/CANModule/ViewModels/ZLGCANFDViewModel.cs @@ -606,7 +606,7 @@ namespace CANModule.ViewModels Application.Current.Dispatcher.Invoke(() => { var msgName = System.Text.Encoding.Default.GetString(msg.strName).TrimEnd('\0'); - var find = CanMessageList.FirstOrDefault(s => s.报文ID == (int)msg.nID); + var find = CanMessageList.FirstOrDefault(s => s.报文ID == (int)msg.nID&& s.通道==channel); if (find != null) { find.通道 = (byte)channel; diff --git a/ZLGUSBCANFD/USBCANFD.cs b/ZLGUSBCANFD/USBCANFD.cs index 1265b9a..c038b91 100644 --- a/ZLGUSBCANFD/USBCANFD.cs +++ b/ZLGUSBCANFD/USBCANFD.cs @@ -151,18 +151,18 @@ namespace ZLGUSBCANFD _receiveThreads.Clear(); // 动态复位所有通道并释放DBC - for (uint i = 0; i < _maxChannels; i++) - { - lock (_channelLocks[i]) - { - if (_channelHandles[i] != IntPtr.Zero) - { - ZLGCAN.ZCAN_ResetCAN(_channelHandles[i]); - _channelHandles[i] = IntPtr.Zero; - } - 释放通道DBC(i); - } - } + //for (uint i = 0; i < _maxChannels; i++) + //{ + // lock (_channelLocks[i]) + // { + // if (_channelHandles[i] != IntPtr.Zero) + // { + // ZLGCAN.ZCAN_ResetCAN(_channelHandles[i]); + // _channelHandles[i] = IntPtr.Zero; + // } + // 释放通道DBC(i); + // } + //} // 关闭设备主句柄 if (_deviceHandle != IntPtr.Zero)