From 77e26818aeca6ea6a28087d6deecfd6bf7fb6ac0 Mon Sep 17 00:00:00 2001 From: yedajiang44 <602830483@qq.com> Date: Tue, 1 Sep 2020 16:10:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9F=A5=E5=B2=97=E5=AF=B9?= =?UTF-8?q?=E8=B1=A1id=E8=AF=BB=E5=8F=96=E9=95=BF=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../JT809SubMessageBody/JT809_0x9300_0x9301Test.cs | 4 ++-- src/JT809.Protocol/SubMessageBody/JT809_0x9300_0x9301.cs | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x9300_0x9301Test.cs b/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x9300_0x9301Test.cs index e88abec..29b3733 100644 --- a/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x9300_0x9301Test.cs +++ b/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x9300_0x9301Test.cs @@ -63,13 +63,13 @@ namespace JT809.Protocol.Test.JT809SubMessageBody }; var hex = JT809_2019_Serializer.Serialize(jT809_0x9300_0x9301).ToHexString(); testOutput.WriteLine(hex); - Assert.Equal("02736D616C6C636869000000000000000D10000000057265706C79", hex); + Assert.Equal("02736D616C6C6368690000000000000000000000000000000D10000000057265706C79", hex); } [Fact(DisplayName = "2019版反序化")] public void Test4() { - var bytes = "02736D616C6C636869000000000000000D10000000057265706C79".ToHexBytes(); + var bytes = "02736D616C6C6368690000000000000000000000000000000D10000000057265706C79".ToHexBytes(); JT809_0x9300_0x9301 jT809_0x9300_0x9301 = JT809_2019_Serializer.Deserialize(bytes); Assert.Equal(JT809_0x9301_ObjectType.下级平台所属单一业户, jT809_0x9300_0x9301.ObjectType); Assert.Equal((uint)3344, jT809_0x9300_0x9301.InfoID); diff --git a/src/JT809.Protocol/SubMessageBody/JT809_0x9300_0x9301.cs b/src/JT809.Protocol/SubMessageBody/JT809_0x9300_0x9301.cs index 71c1bb9..01711d2 100644 --- a/src/JT809.Protocol/SubMessageBody/JT809_0x9300_0x9301.cs +++ b/src/JT809.Protocol/SubMessageBody/JT809_0x9300_0x9301.cs @@ -51,8 +51,8 @@ namespace JT809.Protocol.SubMessageBody { value.ObjectType = (JT809_0x9301_ObjectType)reader.ReadByte(); writer.WriteString($"[{value.ObjectType.ToByteValue()}]查岗对象的类型", value.ObjectType.ToString()); - virtualHex = reader.ReadVirtualArray(12); - value.ObjectID = reader.ReadString(12); + virtualHex = reader.ReadVirtualArray(20); + value.ObjectID = reader.ReadString(20); writer.WriteString($"[{virtualHex.ToArray().ToHexString()}]查岗对象的ID", value.ObjectID); writer.WriteNumber($"[{value.AnswerTime.ReadNumber()}]查岗应答时限", value.AnswerTime); } @@ -71,7 +71,7 @@ namespace JT809.Protocol.SubMessageBody if (config.Version == JT809Version.JTT2019) { value.ObjectType = (JT809_0x9301_ObjectType)reader.ReadByte(); - value.ObjectID = reader.ReadString(12); + value.ObjectID = reader.ReadString(20); value.AnswerTime = reader.ReadByte(); } value.InfoID = reader.ReadUInt32(); @@ -86,7 +86,7 @@ namespace JT809.Protocol.SubMessageBody if (config.Version == JT809Version.JTT2019) { writer.WriteByte((byte)value.ObjectType); - writer.WriteStringPadRight(value.ObjectID, 12); + writer.WriteStringPadRight(value.ObjectID, 20); writer.WriteByte(value.AnswerTime); } writer.WriteUInt32(value.InfoID);