Bläddra i källkod

修复根据2019协议 MarkId 字节和22013版本一样都是5个字节

tags/v2.7.1
SmallChi(Koike) 5 månader sedan
förälder
incheckning
381eccec64
2 ändrade filer med 8 tillägg och 28 borttagningar
  1. +1
    -2
      src/JT808.Protocol/JT808.Protocol.xml
  2. +7
    -26
      src/JT808.Protocol/MessageBody/JT808_0x0107.cs

+ 1
- 2
src/JT808.Protocol/JT808.Protocol.xml Visa fil

@@ -9443,8 +9443,7 @@
<member name="P:JT808.Protocol.MessageBody.JT808_0x0107.MakerId"> <member name="P:JT808.Protocol.MessageBody.JT808_0x0107.MakerId">
<summary> <summary>
制造商 ID 制造商 ID
2013版本 5 个字节,终端制造商编码
2019版本 11 个字节,终端制造商编码
2013版本 5 个字节,终端制造商编码
</summary> </summary>
</member> </member>
<member name="P:JT808.Protocol.MessageBody.JT808_0x0107.TerminalModel"> <member name="P:JT808.Protocol.MessageBody.JT808_0x0107.TerminalModel">


+ 7
- 26
src/JT808.Protocol/MessageBody/JT808_0x0107.cs Visa fil

@@ -39,8 +39,7 @@ namespace JT808.Protocol.MessageBody
public ushort TerminalType { get; set; } public ushort TerminalType { get; set; }
/// <summary> /// <summary>
/// 制造商 ID /// 制造商 ID
/// 2013版本 5 个字节,终端制造商编码
/// 2019版本 11 个字节,终端制造商编码
/// 2013版本 5 个字节,终端制造商编码
/// </summary> /// </summary>
public string MakerId { get; set; } public string MakerId { get; set; }
/// <summary> /// <summary>
@@ -107,18 +106,9 @@ namespace JT808.Protocol.MessageBody
{ {
JT808_0x0107 jT808_0X0107 = new JT808_0x0107(); JT808_0x0107 jT808_0X0107 = new JT808_0x0107();
jT808_0X0107.TerminalType = reader.ReadUInt16(); jT808_0X0107.TerminalType = reader.ReadUInt16();
if(reader.Version== JT808Version.JTT2019)
{
jT808_0X0107.MakerId = reader.ReadString(11);
jT808_0X0107.TerminalModel = reader.ReadString(30);
jT808_0X0107.TerminalId = reader.ReadString(30);
}
else
{
jT808_0X0107.MakerId = reader.ReadString(5);
jT808_0X0107.TerminalModel = reader.ReadString(20);
jT808_0X0107.TerminalId = reader.ReadString(7);
}
jT808_0X0107.MakerId = reader.ReadString(5);
jT808_0X0107.TerminalModel = reader.ReadString(20);
jT808_0X0107.TerminalId = reader.ReadString(7);
jT808_0X0107.Terminal_SIM_ICCID = reader.ReadBCD(20, config.Trim); jT808_0X0107.Terminal_SIM_ICCID = reader.ReadBCD(20, config.Trim);
jT808_0X0107.Terminal_Hardware_Version_Length = reader.ReadByte(); jT808_0X0107.Terminal_Hardware_Version_Length = reader.ReadByte();
jT808_0X0107.Terminal_Hardware_Version_Num = reader.ReadString(jT808_0X0107.Terminal_Hardware_Version_Length); jT808_0X0107.Terminal_Hardware_Version_Num = reader.ReadString(jT808_0X0107.Terminal_Hardware_Version_Length);
@@ -137,18 +127,9 @@ namespace JT808.Protocol.MessageBody
public override void Serialize(ref JT808MessagePackWriter writer, JT808_0x0107 value, IJT808Config config) public override void Serialize(ref JT808MessagePackWriter writer, JT808_0x0107 value, IJT808Config config)
{ {
writer.WriteUInt16(value.TerminalType); writer.WriteUInt16(value.TerminalType);
if (writer.Version == JT808Version.JTT2019)
{
writer.WriteString(value.MakerId.PadRight(11, '\0').ValiString(nameof(value.MakerId),11));
writer.WriteString(value.TerminalModel.PadRight(30, '\0').ValiString(nameof(value.TerminalModel), 30));
writer.WriteString(value.TerminalId.PadRight(30, '\0').ValiString(nameof(value.TerminalId), 30));
}
else
{
writer.WriteString(value.MakerId.PadRight(5, '\0').ValiString(nameof(value.MakerId), 5));
writer.WriteString(value.TerminalModel.PadRight(20, '\0').ValiString(nameof(value.TerminalModel), 20));
writer.WriteString(value.TerminalId.PadRight(7, '\0').ValiString(nameof(value.TerminalId), 7));
}
writer.WriteString(value.MakerId.PadRight(5, '\0').ValiString(nameof(value.MakerId), 5));
writer.WriteString(value.TerminalModel.PadRight(20, '\0').ValiString(nameof(value.TerminalModel), 20));
writer.WriteString(value.TerminalId.PadRight(7, '\0').ValiString(nameof(value.TerminalId), 7));
writer.WriteBCD(value.Terminal_SIM_ICCID.ValiString(nameof(value.Terminal_SIM_ICCID), 20), 20); writer.WriteBCD(value.Terminal_SIM_ICCID.ValiString(nameof(value.Terminal_SIM_ICCID), 20), 20);
writer.WriteByte((byte)value.Terminal_Hardware_Version_Num.Length); writer.WriteByte((byte)value.Terminal_Hardware_Version_Num.Length);
writer.WriteString(value.Terminal_Hardware_Version_Num); writer.WriteString(value.Terminal_Hardware_Version_Num);


Laddar…
Avbryt
Spara