瀏覽代碼

增加2019兼容

tags/v2.2.0
waterliu99 5 年之前
父節點
當前提交
aaa8307901
共有 6 個文件被更改,包括 44 次插入6 次删除
  1. +1
    -1
      src/JT809.Protocol/Enums/JT809SubBusinessType.cs
  2. +12
    -0
      src/JT809.Protocol/Enums/JT809_0x920A_UploadFlag.cs
  3. +1
    -0
      src/JT809.Protocol/JT809.Protocol.csproj
  4. +1
    -1
      src/JT809.Protocol/SubMessageBody/JT809_0x1400_0x1402.cs
  5. +1
    -1
      src/JT809.Protocol/SubMessageBody/JT809_0x1400_0x1413.cs
  6. +28
    -3
      src/JT809.Protocol/SubMessageBody/JT809_0x9200_0x920A.cs

+ 1
- 1
src/JT809.Protocol/Enums/JT809SubBusinessType.cs 查看文件

@@ -214,7 +214,7 @@ namespace JT809.Protocol.Enums
[Description("车辆行驶线路请求应答")]
[JT809BodiesType(typeof(JT809_0x9200_0x920D))]
[JT809SubBusinessTypeDescription("DOWN_BASE_MSG_DRVLINE_ACK", "车辆行驶线路请求应答", JT809BusinessType.从链路车辆动态信息交换业务)]
车辆行驶线路请求应答 = 0x920B,
车辆行驶线路请求应答 = 0x920D,
#endregion

#region 主链路平台信息交互消息 UP_PLATFORM_MSG


+ 12
- 0
src/JT809.Protocol/Enums/JT809_0x920A_UploadFlag.cs 查看文件

@@ -0,0 +1,12 @@
using System;
using System.Collections.Generic;
using System.Text;

namespace JT809.Protocol.Enums
{
public enum JT809_0x920A_UploadFlag:byte
{
最近收到的消息=0x00,
从终端获取=0x01
}
}

+ 1
- 0
src/JT809.Protocol/JT809.Protocol.csproj 查看文件

@@ -78,6 +78,7 @@
<Compile Include="Enums\JT809_0x1401_Result.cs" />
<Compile Include="Enums\JT809_0x1002_Result.cs" />
<Compile Include="Enums\JT809_0x1007_ErrorCode.cs" />
<Compile Include="Enums\JT809_0x920A_UploadFlag.cs" />
<Compile Include="Enums\JT809_0x9302_ObjectType.cs" />
<Compile Include="Enums\JT809_0x9301_ObjectType.cs" />
<Compile Include="Enums\JT809_0x1301_ObjectType.cs" />


+ 1
- 1
src/JT809.Protocol/SubMessageBody/JT809_0x1400_0x1402.cs 查看文件

@@ -82,7 +82,7 @@ namespace JT809.Protocol.SubMessageBody
}
value.WarnType = (JT809WarnType)reader.ReadUInt16();
value.WarnTime = reader.ReadUTCDateTime();
if (config.Version != JT809Version.JTT2013)
if (config.Version == JT809Version.JTT2013)
{
value.InfoID = reader.ReadUInt32();
}


+ 1
- 1
src/JT809.Protocol/SubMessageBody/JT809_0x1400_0x1413.cs 查看文件

@@ -15,7 +15,7 @@ namespace JT809.Protocol.SubMessageBody
/// </summary>
public class JT809_0x1400_0x1413 : JT809SubBodies, IJT809MessagePackFormatter<JT809_0x1400_0x1413>, IJT809_2019_Version
{
public override ushort SubMsgId => JT809SubBusinessType.主动上报报警处理结果消息.ToUInt16Value();
public override ushort SubMsgId => JT809SubBusinessType.上报报警督办请求消息.ToUInt16Value();

public override string Description => "上报报警督办请求消息";
/// <summary>


+ 28
- 3
src/JT809.Protocol/SubMessageBody/JT809_0x9200_0x920A.cs 查看文件

@@ -1,5 +1,8 @@
using JT809.Protocol.Enums;
using JT809.Protocol.Extensions;
using JT809.Protocol.Formatters;
using JT809.Protocol.Interfaces;
using JT809.Protocol.MessagePack;
using System;
using System.Collections.Generic;
using System.Text;
@@ -10,12 +13,34 @@ namespace JT809.Protocol.SubMessageBody
/// 上报车辆驾驶员身份识别信息请求
/// <para>子业务类型标识:DOWN_EXG_MSG_REPORT_DRIVER_INFO</para>
/// </summary>
public class JT809_0x9200_0x920A:JT809SubBodies
{
public class JT809_0x9200_0x920A:JT809SubBodies, IJT809MessagePackFormatter<JT809_0x9200_0x920A>, IJT809_2019_Version
{
public override ushort SubMsgId => JT809SubBusinessType.上报车辆驾驶员身份识别信息请求.ToUInt16Value();

public override string Description => "上报车辆驾驶员身份识别信息请求";

public override bool SkipSerialization => true;
public override bool SkipSerialization => false;
/// <summary>
/// 上传标志
/// </summary>
public JT809_0x920A_UploadFlag Flag { get; set; }

public void Serialize(ref JT809MessagePackWriter writer, JT809_0x9200_0x920A value, IJT809Config config)
{
if (config.Version == JT809Version.JTT2019)
{
writer.WriteByte((byte)value.Flag);
}
}

public JT809_0x9200_0x920A Deserialize(ref JT809MessagePackReader reader, IJT809Config config)
{
var value = new JT809_0x9200_0x920A();
if (config.Version == JT809Version.JTT2019)
{
value.Flag = (JT809_0x920A_UploadFlag)reader.ReadByte();
}
return value;
}
}
}

Loading…
取消
儲存