can修改
This commit is contained in:
@@ -636,11 +636,14 @@ namespace CANModule.ViewModels
|
||||
{
|
||||
// 提取实际 CAN ID(去掉扩展帧标志位)
|
||||
int actualId = (int)(canId & 0x1FFFFFFF);
|
||||
// 原始字节转为 [0x00, 0x01, ...] 格式,供监视表格直接显示
|
||||
string hexData = 十六进制字符串转换(data);
|
||||
var find = CanMessageList.FirstOrDefault(s => s.报文ID == actualId && s.通道 == channel);
|
||||
if (find != null)
|
||||
{
|
||||
find.时间戳 = (ulong)DateTimeOffset.Now.ToUnixTimeMilliseconds();
|
||||
find.长度 = dlcLength;
|
||||
find.数据 = hexData;
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -649,7 +652,8 @@ namespace CANModule.ViewModels
|
||||
通道 = (byte)channel,
|
||||
报文ID = actualId,
|
||||
时间戳 = (ulong)DateTimeOffset.Now.ToUnixTimeMilliseconds(),
|
||||
长度 = dlcLength
|
||||
长度 = dlcLength,
|
||||
数据 = hexData
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
@@ -79,16 +79,17 @@
|
||||
<!-- 监视选项 -->
|
||||
<TreeViewItem Header="监视">
|
||||
<DataGrid x:Name="表格"
|
||||
Width="550"
|
||||
Width="Auto"
|
||||
Height="350"
|
||||
VirtualizingPanel.IsVirtualizing="True"
|
||||
IsReadOnly="True"
|
||||
AutoGenerateColumns="False"
|
||||
ItemsSource="{Binding CanMessageList, Mode=OneWay}">
|
||||
<DataGrid.Columns>
|
||||
<DataGridTextColumn Header="通道" Binding="{Binding 通道}" Width="90" />
|
||||
<DataGridTextColumn Header="报文ID" Binding="{Binding 报文ID, Converter={StaticResource HexConverter}}" Width="150" />
|
||||
<DataGridTextColumn Header="长度" Binding="{Binding 长度}" Width="90" />
|
||||
<DataGridTextColumn Header="通道" Binding="{Binding 通道}" Width="60" />
|
||||
<DataGridTextColumn Header="报文ID" Binding="{Binding 报文ID, Converter={StaticResource HexConverter}}" Width="110" />
|
||||
<DataGridTextColumn Header="长度" Binding="{Binding 长度}" Width="50" />
|
||||
<DataGridTextColumn Header="数据" Binding="{Binding 数据}" Width="Auto" />
|
||||
<DataGridTextColumn Header="时间戳" Binding="{Binding 时间戳}" Width="Auto" />
|
||||
</DataGrid.Columns>
|
||||
</DataGrid>
|
||||
|
||||
Reference in New Issue
Block a user