From 11b2d1b0da1562acfa3d8048df5ff99765d7d791 Mon Sep 17 00:00:00 2001
From: yedajiang44 <602830483@qq.com>
Date: Fri, 18 Jun 2021 17:41:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BA=8F=E5=88=97=E5=8C=96?=
 =?UTF-8?q?=E5=99=A8=E6=8C=87=E5=AE=9A=E5=8D=8F=E8=AE=AE=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E6=97=A0=E6=95=88=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/JT808.Protocol/JT808Package.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/JT808.Protocol/JT808Package.cs b/src/JT808.Protocol/JT808Package.cs
index 12ca5ab..32ef8f7 100644
--- a/src/JT808.Protocol/JT808Package.cs
+++ b/src/JT808.Protocol/JT808Package.cs
@@ -104,7 +104,7 @@ namespace JT808.Protocol
             jT808Package.Header.MsgId = reader.ReadUInt16();
             //  3.2.读取消息体属性
             jT808Package.Header.MessageBodyProperty = new JT808HeaderMessageBodyProperty(reader.ReadUInt16());
-            if (jT808Package.Header.MessageBodyProperty.VersionFlag)
+            if (reader.Version == JT808Version.JTT2019 || jT808Package.Header.MessageBodyProperty.VersionFlag)
             {
                 //2019版本
                 jT808Package.Header.ProtocolVersion = reader.ReadByte();
@@ -185,7 +185,7 @@ namespace JT808.Protocol
             writer.WriteUInt16(value.Header.MsgId);
             //  2.2.消息体属性(包含消息体长度所以先跳过)
             writer.Skip(2, out int msgBodiesPropertyPosition);
-            if (value.Header.MessageBodyProperty.VersionFlag)
+            if (writer.Version == JT808Version.JTT2019 || value.Header.MessageBodyProperty.VersionFlag)
             {
                 //2019版本
                 //  2.3.协议版本号
@@ -279,7 +279,7 @@ namespace JT808.Protocol
             writer.WriteStartObject("消息体属性对象");
             ReadOnlySpan<char> messageBodyPropertyReadOnlySpan = messageBodyPropertyValue.ReadBinary();
             writer.WriteNumber($"[{messageBodyPropertyReadOnlySpan.ToString()}]消息体属性", messageBodyPropertyValue);
-            if (headerMessageBodyProperty.VersionFlag)
+            if (reader.Version == JT808Version.JTT2019 || headerMessageBodyProperty.VersionFlag)
             {
                 reader.Version = JT808Version.JTT2019;
                 writer.WriteNumber("[bit15]保留", 0);
@@ -294,7 +294,7 @@ namespace JT808.Protocol
                 writer.WriteNumber($"[{protocolVersion.ReadNumber()}]协议版本号(2019)", protocolVersion);
                 //  3.4.读取终端手机号 
                 var terminalPhoneNo = reader.ReadBCD(20, config.Trim);
-                writer.WriteString($"[{terminalPhoneNo.PadLeft(20,'0')}]终端手机号", terminalPhoneNo);
+                writer.WriteString($"[{terminalPhoneNo.PadLeft(20, '0')}]终端手机号", terminalPhoneNo);
             }
             else
             {