diff --git a/src/JT808.Protocol.Test/MessageBody/JT808_0x0700Test.cs b/src/JT808.Protocol.Test/MessageBody/JT808_0x0700Test.cs index 2babe78..50eafb4 100644 --- a/src/JT808.Protocol.Test/MessageBody/JT808_0x0700Test.cs +++ b/src/JT808.Protocol.Test/MessageBody/JT808_0x0700Test.cs @@ -249,13 +249,13 @@ namespace JT808.Protocol.Test.MessageBody }; var hex = JT808Serializer.Serialize(value).ToHexString(); - Assert.Equal("000105557A050027003132333435363738393132333435363738D4C142313233343500000000D6D8D0CDBBF5B3B5000009", hex); + Assert.Equal("000105557A050029003132333435363738393132333435363738D4C142313233343500000000D6D8D0CDBBF5B3B50000000007", hex); } [Fact] public void Test_Deserilize_0x05() { - byte[] bytes = "000105557A050027003132333435363738393132333435363738D4C142313233343500000000D6D8D0CDBBF5B3B5000009".ToHexBytes(); + byte[] bytes = "000105557A050029003132333435363738393132333435363738D4C142313233343500000000D6D8D0CDBBF5B3B50000000007".ToHexBytes(); JT808_0x0700 value = JT808Serializer.Deserialize(bytes); Assert.Equal(1, value.ReplyMsgNum); var body = value.JT808CarDVRUpPackage.Bodies as JT808_CarDVR_Up_0x05; diff --git a/src/JT808.Protocol/MessageBody/CarDVR/JT808_CarDVR_Up_0x05.cs b/src/JT808.Protocol/MessageBody/CarDVR/JT808_CarDVR_Up_0x05.cs index 2380465..dddf320 100644 --- a/src/JT808.Protocol/MessageBody/CarDVR/JT808_CarDVR_Up_0x05.cs +++ b/src/JT808.Protocol/MessageBody/CarDVR/JT808_CarDVR_Up_0x05.cs @@ -54,8 +54,8 @@ namespace JT808.Protocol.MessageBody.CarDVR hex = reader.ReadVirtualArray(12); value.VehicleNo = reader.ReadString(12); writer.WriteString($"[{hex.ToArray().ToHexString()}]机动车号牌号码", value.VehicleNo); - hex = reader.ReadVirtualArray(10); - value.VehicleType = reader.ReadString(10); + hex = reader.ReadVirtualArray(12); + value.VehicleType = reader.ReadString(12); writer.WriteString($"[{hex.ToArray().ToHexString()}]机动车号牌分类", value.VehicleType); } /// @@ -74,7 +74,7 @@ namespace JT808.Protocol.MessageBody.CarDVR writer.Skip(12 - (writer.GetCurrentPosition() - currentPosition), out var _); currentPosition = writer.GetCurrentPosition(); writer.WriteString(value.VehicleType); - writer.Skip(10 - (writer.GetCurrentPosition() - currentPosition), out var _); + writer.Skip(12 - (writer.GetCurrentPosition() - currentPosition), out var _); } /// ///