Browse Source

优化报警类型分析错误

tags/v2.2.0
waterliu99 4 years ago
parent
commit
e17766c5fa
3 changed files with 23 additions and 5 deletions
  1. +7
    -0
      src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1400_0x1402Test.cs
  2. +15
    -4
      src/JT809.Protocol/JT809.Protocol.xml
  3. +1
    -1
      src/JT809.Protocol/SubMessageBody/JT809_0x1400_0x1402.cs

+ 7
- 0
src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1400_0x1402Test.cs View File

@@ -80,5 +80,12 @@ namespace JT809.Protocol.Test.JT809SubMessageBody
Assert.Equal(JT809VehicleColorType.蓝色, jT809_0x1400_0x1402.VehicleColor);
Assert.Equal("12345678900", jT809_0x1400_0x1402.DestinationPlatformId);
}
[Fact]
public void Test_2019_3()
{
//传说中花钱买的数据
var bytes = "5B0000007E00000002140001FEC19001020F0000000000000000005F616C491402000000564A43323032305054303838A001000000005F5F7B3E000000005F5F7B3E000000005F5F7B3EB2E2413933323238000000000000000000000000000200000000000000000000000000000000000008B3ACCAB1CDA3B3B5F77E5D".ToHexBytes();
var jT809Package = JT809_2019_Serializer.Analyze(bytes);
}
}
}

+ 15
- 4
src/JT809.Protocol/JT809.Protocol.xml View File

@@ -2527,15 +2527,26 @@
<para>描述:下级平台在接收消息时,如发现消息报文序列号不连续,则立即发送消息补传请求。上级平台收到消息补传请求后,根据请求的消息报文序列号或起始时间(当仅填写一项时。另一项全为0),重传相应的消息</para>
</summary>
</member>
<member name="P:JT809.Protocol.SubMessageBody.JT809_0x1300_0x1303.SerialCount">
<member name="P:JT809.Protocol.SubMessageBody.JT809_0x1300_0x1303.RetranDataType">
<summary>
对应需要重传消息地子业务类型标识
</summary>
</member>
<member name="P:JT809.Protocol.SubMessageBody.JT809_0x1300_0x1303.SerialList">
<member name="P:JT809.Protocol.SubMessageBody.JT809_0x1300_0x1303.SerialCount">
<summary>
需要重传消息的起始报文序列号和结束的报文序列号。如只请求重传一个消息,则起始消息报文序列号和结束消息报文序列号相同
8位
重传消息总数
</summary>
</member>
<member name="P:JT809.Protocol.SubMessageBody.JT809_0x1300_0x1303.BeginMessageNumber">
<summary>
需要重传消息的起始报文序列号
<para>如只请求重传一个消息,则起始消息报文序列号和结束消息报文序列号相同 </para>
</summary>
</member>
<member name="P:JT809.Protocol.SubMessageBody.JT809_0x1300_0x1303.EndMessageNumber">
<summary>
需要重传消息的结束的报文序列号
<para>如只请求重传一个消息,则起始消息报文序列号和结束消息报文序列号相同 </para>
</summary>
</member>
<member name="P:JT809.Protocol.SubMessageBody.JT809_0x1300_0x1303.Time">


+ 1
- 1
src/JT809.Protocol/SubMessageBody/JT809_0x1400_0x1402.cs View File

@@ -88,7 +88,7 @@ namespace JT809.Protocol.SubMessageBody
writer.WriteString($"[{virtualHex.ToArray().ToHexString()}]发起报警平台唯一编码", value.SourcePlatformId);
}
value.WarnType = (JT809WarnType)reader.ReadUInt16();
writer.WriteString($"[{value.WarnType.ToByteValue()}]报警类型", value.WarnType.ToString());
writer.WriteString($"[{value.WarnType.ToUInt16Value()}]报警类型", value.WarnType.ToString());
var hex = reader.ReadVirtualArray(8);
value.WarnTime = reader.ReadUTCDateTime();
writer.WriteString($"[{hex.ToArray().ToHexString()}]报警时间", value.WarnTime);


||||||
x
 
000:0
Loading…
Cancel
Save