From b64ed3ee37d6a4bdb1393405f9e9af4cadc9a8e2 Mon Sep 17 00:00:00 2001 From: "SmallChi(Koike)" <564952747@qq.com> Date: Wed, 6 May 2020 10:53:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E9=99=A4=E6=9C=89=E7=96=91=E9=97=AE?= =?UTF-8?q?=E7=9A=84=E8=AD=A6=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../JT809SubMessageBody/JT809_0x1200_0x1202Test.cs | 4 +++- src/JT809.Protocol/MessageBody/JT809_0x9008.cs | 2 +- src/JT809.Protocol/SubMessageBody/JT809_0x1200_0x1201.cs | 3 --- src/JT809.Protocol/SubMessageBody/JT809_0x1400_0x1402.cs | 2 -- src/JT809.Protocol/SubMessageBody/JT809_0x1400_0x1403.cs | 2 -- src/JT809.Protocol/SubMessageBody/JT809_0x9400_0x9402.cs | 2 -- src/JT809.Protocol/SubMessageBody/JT809_0x9400_0x9403.cs | 2 -- 7 files changed, 4 insertions(+), 13 deletions(-) diff --git a/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1200_0x1202Test.cs b/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1200_0x1202Test.cs index 8c1e800..a4703ed 100644 --- a/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1200_0x1202Test.cs +++ b/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1200_0x1202Test.cs @@ -112,8 +112,10 @@ namespace JT809.Protocol.Test.JT809SubMessageBody Assert.Equal("33333333333", jT809_0X1200_0X1202.GNSSData.PlatformId3); Assert.Equal(3u, jT809_0X1200_0X1202.GNSSData.Alarm3); } -#warning 此处结合808协议包解析 808中的定位信息 + /// + /// 此处结合808协议包解析 + /// [Fact] public void Test_2019_3() { diff --git a/src/JT809.Protocol/MessageBody/JT809_0x9008.cs b/src/JT809.Protocol/MessageBody/JT809_0x9008.cs index 5a6db9c..04c5ee4 100644 --- a/src/JT809.Protocol/MessageBody/JT809_0x9008.cs +++ b/src/JT809.Protocol/MessageBody/JT809_0x9008.cs @@ -15,7 +15,7 @@ namespace JT809.Protocol.MessageBody { public override ushort MsgId => JT809BusinessType.上级平台主动关闭链路通知消息.ToUInt16Value(); public override string Description => "上级平台主动关闭链路通知消息"; -#warning 待验证主从链路 + public override JT809_LinkType LinkType => JT809_LinkType.subordinate; /// /// 链路关闭原因 diff --git a/src/JT809.Protocol/SubMessageBody/JT809_0x1200_0x1201.cs b/src/JT809.Protocol/SubMessageBody/JT809_0x1200_0x1201.cs index e7a2aa6..04a480f 100644 --- a/src/JT809.Protocol/SubMessageBody/JT809_0x1200_0x1201.cs +++ b/src/JT809.Protocol/SubMessageBody/JT809_0x1200_0x1201.cs @@ -56,7 +56,6 @@ namespace JT809.Protocol.SubMessageBody virtualHex = reader.ReadVirtualArray(11); value.ProducerId = reader.ReadString(11); writer.WriteString($"[{virtualHex.ToArray().ToHexString()}]车载终端厂商唯一编码", value.ProducerId); -#warning 此处应该改成大端模式读取数据吧 virtualHex = reader.ReadVirtualArray(20); value.TerminalModelType = reader.ReadString(20); writer.WriteString($"[{virtualHex.ToArray().ToHexString()}]车载终端型号", value.TerminalModelType); @@ -99,7 +98,6 @@ namespace JT809.Protocol.SubMessageBody { value.PlateformId = reader.ReadString(11); value.ProducerId = reader.ReadString(11); -#warning 此处应该改成大端模式读取数据吧 value.TerminalModelType = reader.ReadString(20); value.TerminalId = reader.ReadString(7); value.TerminalId = value.TerminalId.ToUpper(); @@ -124,7 +122,6 @@ namespace JT809.Protocol.SubMessageBody { writer.WriteStringPadRight(value.PlateformId, 11); writer.WriteStringPadRight(value.ProducerId, 11); -#warning 此处应该改成大端模式读取数据吧 writer.WriteStringPadRight(value.TerminalModelType, 20); writer.WriteStringPadRight(value.TerminalId.ToUpper(), 7); writer.WriteStringPadLeft(value.TerminalSimCode, 12); diff --git a/src/JT809.Protocol/SubMessageBody/JT809_0x1400_0x1402.cs b/src/JT809.Protocol/SubMessageBody/JT809_0x1400_0x1402.cs index 2c38eec..8094d34 100644 --- a/src/JT809.Protocol/SubMessageBody/JT809_0x1400_0x1402.cs +++ b/src/JT809.Protocol/SubMessageBody/JT809_0x1400_0x1402.cs @@ -105,7 +105,6 @@ namespace JT809.Protocol.SubMessageBody hex = reader.ReadVirtualArray(8); value.EndTime = reader.ReadUTCDateTime(); writer.WriteString($"[{hex.ToArray().ToHexString()}]事件结束时间", value.EndTime); -#warning 此处车牌号文档长度有误，使用旧版长度21 hex = reader.ReadVirtualArray(21); value.VehicleNo = reader.ReadString(21); writer.WriteString($"[{hex.ToArray().ToHexString()}]车牌号码", value.VehicleNo); @@ -145,7 +144,6 @@ namespace JT809.Protocol.SubMessageBody { value.StartTime = reader.ReadUTCDateTime(); value.EndTime = reader.ReadUTCDateTime(); -#warning 此处车牌号文档长度有误，使用旧版长度21 value.VehicleNo = reader.ReadString(21); value.VehicleColor = (JT809VehicleColorType)reader.ReadByte(); value.DestinationPlatformId = reader.ReadString(11); diff --git a/src/JT809.Protocol/SubMessageBody/JT809_0x1400_0x1403.cs b/src/JT809.Protocol/SubMessageBody/JT809_0x1400_0x1403.cs index 396c51f..f8b706e 100644 --- a/src/JT809.Protocol/SubMessageBody/JT809_0x1400_0x1403.cs +++ b/src/JT809.Protocol/SubMessageBody/JT809_0x1400_0x1403.cs @@ -101,7 +101,6 @@ namespace JT809.Protocol.SubMessageBody virtualHex = reader.ReadVirtualArray(8); value.EndTime = reader.ReadUTCDateTime(); writer.WriteString($"[{virtualHex.ToArray().ToHexString()}]事件结束时间", value.EndTime); -#warning 此处车牌号文档长度有误，使用旧版长度21 virtualHex = reader.ReadVirtualArray(21); value.VehicleNo = reader.ReadString(21); writer.WriteString($"[{virtualHex.ToArray().ToHexString()}]车牌号码", value.VehicleNo); @@ -135,7 +134,6 @@ namespace JT809.Protocol.SubMessageBody value.WarnTime = reader.ReadUTCDateTime(); value.StartTime = reader.ReadUTCDateTime(); value.EndTime = reader.ReadUTCDateTime(); -#warning 此处车牌号文档长度有误，使用旧版长度21 value.VehicleNo = reader.ReadString(21); value.VehicleColor = (JT809VehicleColorType)reader.ReadByte(); value.DestinationPlatformId = reader.ReadBigNumber(11); diff --git a/src/JT809.Protocol/SubMessageBody/JT809_0x9400_0x9402.cs b/src/JT809.Protocol/SubMessageBody/JT809_0x9400_0x9402.cs index 9f02840..84219ac 100644 --- a/src/JT809.Protocol/SubMessageBody/JT809_0x9400_0x9402.cs +++ b/src/JT809.Protocol/SubMessageBody/JT809_0x9400_0x9402.cs @@ -96,7 +96,6 @@ namespace JT809.Protocol.SubMessageBody virtualHex = reader.ReadVirtualArray(8); value.EndTime = reader.ReadUTCDateTime(); writer.WriteString($"[{virtualHex.ToArray().ToHexString()}]事件结束时间", value.EndTime); -#warning 此处车牌号文档长度有误，使用旧版长度21 virtualHex = reader.ReadVirtualArray(21); value.VehicleNo = reader.ReadString(21); writer.WriteString($"[{virtualHex.ToArray().ToHexString()}]车牌号码", value.VehicleNo); @@ -131,7 +130,6 @@ namespace JT809.Protocol.SubMessageBody if (config.Version == JT809Version.JTT2019) { value.StartTime = reader.ReadUTCDateTime(); value.EndTime = reader.ReadUTCDateTime(); -#warning 此处车牌号文档长度有误，使用旧版长度21 value.VehicleNo = reader.ReadString(21); value.VehicleColor = (JT809VehicleColorType)reader.ReadByte(); value.DestinationPlatformId = reader.ReadBigNumber(11); diff --git a/src/JT809.Protocol/SubMessageBody/JT809_0x9400_0x9403.cs b/src/JT809.Protocol/SubMessageBody/JT809_0x9400_0x9403.cs index 735c098..5a07a2e 100644 --- a/src/JT809.Protocol/SubMessageBody/JT809_0x9400_0x9403.cs +++ b/src/JT809.Protocol/SubMessageBody/JT809_0x9400_0x9403.cs @@ -95,7 +95,6 @@ namespace JT809.Protocol.SubMessageBody virtualHex = reader.ReadVirtualArray(8); value.EndTime = reader.ReadUTCDateTime(); writer.WriteString($"[{virtualHex.ToArray().ToHexString()}]事件结束时间", value.EndTime); -#warning 此处车牌号文档长度有误，使用旧版长度21 virtualHex = reader.ReadVirtualArray(21); value.VehicleNo = reader.ReadString(21); writer.WriteString($"[{virtualHex.ToArray().ToHexString()}]车牌号码", value.VehicleNo); @@ -131,7 +130,6 @@ namespace JT809.Protocol.SubMessageBody { value.StartTime = reader.ReadUTCDateTime(); value.EndTime = reader.ReadUTCDateTime(); -#warning 此处车牌号文档长度有误，使用旧版长度21 value.VehicleNo = reader.ReadString(21); value.VehicleColor = (JT809VehicleColorType)reader.ReadByte(); value.DestinationPlatformId = reader.ReadBigNumber(11);