From d04736dbe9b8d9dfcdee83e8d724f6938ee4dce5 Mon Sep 17 00:00:00 2001 From: "SmallChi(Koike)" <564952747@qq.com> Date: Sat, 23 Nov 2019 09:08:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=BD=93=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=B6=88=E6=81=AFId=E5=B1=9E=E6=80=A7=E7=9A=84=E4=BE=9D?= =?UTF-8?q?=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MessageBody/JT808_0x0001Test.cs | 8 ++++---- .../MessageBody/JT808_0x0201Test.cs | 4 ++-- .../MessageBody/JT808_0x0805Test.cs | 4 ++-- .../MessageBody/JT808_0x8001Test.cs | 4 ++-- .../MessageBody/JT808_0x8100Test.cs | 12 ++++++------ .../MessageBody/JT808_0x9999.cs | 3 +++ src/JT808.Protocol.Test/Simples/Demo6.cs | 4 ++++ src/JT808.Protocol/JT808.Protocol.xml | 12 ++++++------ src/JT808.Protocol/JT808Bodies.cs | 2 ++ src/JT808.Protocol/JT808SplitPackageBodies.cs | 3 +++ src/JT808.Protocol/MessageBody/JT808_0x0001.cs | 14 ++++++++------ src/JT808.Protocol/MessageBody/JT808_0x0002.cs | 1 + src/JT808.Protocol/MessageBody/JT808_0x0003.cs | 2 ++ src/JT808.Protocol/MessageBody/JT808_0x0100.cs | 1 + src/JT808.Protocol/MessageBody/JT808_0x0102.cs | 1 + src/JT808.Protocol/MessageBody/JT808_0x0104.cs | 1 + src/JT808.Protocol/MessageBody/JT808_0x0107.cs | 1 + src/JT808.Protocol/MessageBody/JT808_0x0108.cs | 1 + src/JT808.Protocol/MessageBody/JT808_0x0200.cs | 1 + src/JT808.Protocol/MessageBody/JT808_0x0201.cs | 7 ++++--- src/JT808.Protocol/MessageBody/JT808_0x0301.cs | 1 + src/JT808.Protocol/MessageBody/JT808_0x0302.cs | 1 + src/JT808.Protocol/MessageBody/JT808_0x0303.cs | 1 + src/JT808.Protocol/MessageBody/JT808_0x0500.cs | 1 + src/JT808.Protocol/MessageBody/JT808_0x0701.cs | 1 + src/JT808.Protocol/MessageBody/JT808_0x0702.cs | 1 + src/JT808.Protocol/MessageBody/JT808_0x0704.cs | 1 + src/JT808.Protocol/MessageBody/JT808_0x0705.cs | 1 + src/JT808.Protocol/MessageBody/JT808_0x0800.cs | 1 + src/JT808.Protocol/MessageBody/JT808_0x0801.cs | 1 + src/JT808.Protocol/MessageBody/JT808_0x0802.cs | 1 + src/JT808.Protocol/MessageBody/JT808_0x0805.cs | 7 ++++--- src/JT808.Protocol/MessageBody/JT808_0x0900.cs | 1 + src/JT808.Protocol/MessageBody/JT808_0x0901.cs | 1 + src/JT808.Protocol/MessageBody/JT808_0x0A00.cs | 1 + src/JT808.Protocol/MessageBody/JT808_0x8001.cs | 7 ++++--- src/JT808.Protocol/MessageBody/JT808_0x8003.cs | 1 + src/JT808.Protocol/MessageBody/JT808_0x8100.cs | 7 ++++--- src/JT808.Protocol/MessageBody/JT808_0x8103.cs | 1 + src/JT808.Protocol/MessageBody/JT808_0x8104.cs | 1 + src/JT808.Protocol/MessageBody/JT808_0x8105.cs | 1 + src/JT808.Protocol/MessageBody/JT808_0x8106.cs | 1 + src/JT808.Protocol/MessageBody/JT808_0x8107.cs | 1 + src/JT808.Protocol/MessageBody/JT808_0x8108.cs | 1 + src/JT808.Protocol/MessageBody/JT808_0x8201.cs | 1 + src/JT808.Protocol/MessageBody/JT808_0x8202.cs | 1 + src/JT808.Protocol/MessageBody/JT808_0x8203.cs | 1 + src/JT808.Protocol/MessageBody/JT808_0x8300.cs | 1 + src/JT808.Protocol/MessageBody/JT808_0x8301.cs | 1 + src/JT808.Protocol/MessageBody/JT808_0x8302.cs | 1 + src/JT808.Protocol/MessageBody/JT808_0x8303.cs | 1 + src/JT808.Protocol/MessageBody/JT808_0x8304.cs | 1 + src/JT808.Protocol/MessageBody/JT808_0x8400.cs | 1 + src/JT808.Protocol/MessageBody/JT808_0x8401.cs | 1 + src/JT808.Protocol/MessageBody/JT808_0x8500.cs | 1 + src/JT808.Protocol/MessageBody/JT808_0x8600.cs | 1 + src/JT808.Protocol/MessageBody/JT808_0x8601.cs | 1 + src/JT808.Protocol/MessageBody/JT808_0x8602.cs | 1 + src/JT808.Protocol/MessageBody/JT808_0x8603.cs | 1 + src/JT808.Protocol/MessageBody/JT808_0x8604.cs | 1 + src/JT808.Protocol/MessageBody/JT808_0x8605.cs | 1 + src/JT808.Protocol/MessageBody/JT808_0x8606.cs | 1 + src/JT808.Protocol/MessageBody/JT808_0x8607.cs | 1 + src/JT808.Protocol/MessageBody/JT808_0x8702.cs | 1 + src/JT808.Protocol/MessageBody/JT808_0x8800.cs | 1 + src/JT808.Protocol/MessageBody/JT808_0x8801.cs | 1 + src/JT808.Protocol/MessageBody/JT808_0x8802.cs | 1 + src/JT808.Protocol/MessageBody/JT808_0x8803.cs | 1 + src/JT808.Protocol/MessageBody/JT808_0x8804.cs | 1 + src/JT808.Protocol/MessageBody/JT808_0x8805.cs | 1 + src/JT808.Protocol/MessageBody/JT808_0x8900.cs | 1 + src/JT808.Protocol/MessageBody/JT808_0x8A00.cs | 1 + 72 files changed, 116 insertions(+), 40 deletions(-) diff --git a/src/JT808.Protocol.Test/MessageBody/JT808_0x0001Test.cs b/src/JT808.Protocol.Test/MessageBody/JT808_0x0001Test.cs index 7f3c3c1..34cb64e 100644 --- a/src/JT808.Protocol.Test/MessageBody/JT808_0x0001Test.cs +++ b/src/JT808.Protocol.Test/MessageBody/JT808_0x0001Test.cs @@ -21,8 +21,8 @@ namespace JT808.Protocol.Test.MessageBody }, Bodies = new JT808_0x0001 { - MsgId = Enums.JT808MsgId.终端心跳.ToUInt16Value(), - MsgNum = 1000, + ReplyMsgId = Enums.JT808MsgId.终端心跳.ToUInt16Value(), + ReplyMsgNum = 1000, JT808TerminalResult = Enums.JT808TerminalResult.Success } }; @@ -40,8 +40,8 @@ namespace JT808.Protocol.Test.MessageBody Assert.Equal(1203, jT808Package.Header.MsgNum); JT808_0x0001 JT808Bodies = (JT808_0x0001)jT808Package.Bodies; - Assert.Equal(Enums.JT808MsgId.终端心跳.ToUInt16Value(), JT808Bodies.MsgId); - Assert.Equal(1000, JT808Bodies.MsgNum); + Assert.Equal(Enums.JT808MsgId.终端心跳.ToUInt16Value(), JT808Bodies.ReplyMsgId); + Assert.Equal(1000, JT808Bodies.ReplyMsgNum); Assert.Equal(Enums.JT808TerminalResult.Success, JT808Bodies.JT808TerminalResult); } } diff --git a/src/JT808.Protocol.Test/MessageBody/JT808_0x0201Test.cs b/src/JT808.Protocol.Test/MessageBody/JT808_0x0201Test.cs index bcac222..58b1f7f 100644 --- a/src/JT808.Protocol.Test/MessageBody/JT808_0x0201Test.cs +++ b/src/JT808.Protocol.Test/MessageBody/JT808_0x0201Test.cs @@ -23,7 +23,7 @@ namespace JT808.Protocol.Test.MessageBody }; JT808_0x0201 jT808_0X0201 = new JT808_0x0201 { - MsgNum = 12345 + ReplyMsgNum = 12345 }; JT808_0x0200 jT808UploadLocationRequest = new JT808_0x0200 { @@ -58,7 +58,7 @@ namespace JT808.Protocol.Test.MessageBody byte[] bytes = "7E0201002811223344556622B83039000000010000000200BA7F0E07E4F11C0028003C000018071510101001040000006402020037517E".ToHexBytes(); JT808Package jT808Package = JT808Serializer.Deserialize(bytes); JT808_0x0201 jT808_0X0201 = (JT808_0x0201) jT808Package.Bodies; - Assert.Equal(12345, jT808_0X0201.MsgNum); + Assert.Equal(12345, jT808_0X0201.ReplyMsgNum); Assert.Equal((uint)1, jT808_0X0201.Position.AlarmFlag); Assert.Equal(DateTime.Parse("2018-07-15 10:10:10"), jT808_0X0201.Position.GPSTime); Assert.Equal(12222222, jT808_0X0201.Position.Lat); diff --git a/src/JT808.Protocol.Test/MessageBody/JT808_0x0805Test.cs b/src/JT808.Protocol.Test/MessageBody/JT808_0x0805Test.cs index 10cd73a..c32bd81 100644 --- a/src/JT808.Protocol.Test/MessageBody/JT808_0x0805Test.cs +++ b/src/JT808.Protocol.Test/MessageBody/JT808_0x0805Test.cs @@ -12,7 +12,7 @@ namespace JT808.Protocol.Test.MessageBody public void Test1() { JT808_0x0805 jT808_0X0805 = new JT808_0x0805(); - jT808_0X0805.MsgNum = 12456; + jT808_0X0805.ReplyMsgNum = 12456; jT808_0X0805.Result = 1; jT808_0X0805.MultimediaIds = new List() { @@ -28,7 +28,7 @@ namespace JT808.Protocol.Test.MessageBody { byte[] bytes = "30A80100020000301200003124".ToHexBytes(); JT808_0x0805 jT808_0X0805 = JT808Serializer.Deserialize(bytes); - Assert.Equal(12456, jT808_0X0805.MsgNum); + Assert.Equal(12456, jT808_0X0805.ReplyMsgNum); Assert.Equal(1, jT808_0X0805.Result); Assert.Equal(2, jT808_0X0805.MultimediaIdCount); Assert.Equal(new List() diff --git a/src/JT808.Protocol.Test/MessageBody/JT808_0x8001Test.cs b/src/JT808.Protocol.Test/MessageBody/JT808_0x8001Test.cs index d70e843..581cef2 100644 --- a/src/JT808.Protocol.Test/MessageBody/JT808_0x8001Test.cs +++ b/src/JT808.Protocol.Test/MessageBody/JT808_0x8001Test.cs @@ -20,7 +20,7 @@ namespace JT808.Protocol.Test.MessageBody }, Bodies = new JT808_0x8001 { - MsgId = Enums.JT808MsgId.位置信息汇报.ToUInt16Value(), + AckMsgId = Enums.JT808MsgId.位置信息汇报.ToUInt16Value(), JT808PlatformResult = Enums.JT808PlatformResult.成功, MsgNum = 100 } @@ -49,7 +49,7 @@ namespace JT808.Protocol.Test.MessageBody Assert.Equal("12345678900", jT808Package.Header.TerminalPhoneNo); JT808_0x8001 JT808Bodies = (JT808_0x8001)jT808Package.Bodies; - Assert.Equal(Enums.JT808MsgId.位置信息汇报.ToUInt16Value(), JT808Bodies.MsgId); + Assert.Equal(Enums.JT808MsgId.位置信息汇报.ToUInt16Value(), JT808Bodies.AckMsgId); Assert.Equal(100, JT808Bodies.MsgNum); Assert.Equal(Enums.JT808PlatformResult.成功, JT808Bodies.JT808PlatformResult); } diff --git a/src/JT808.Protocol.Test/MessageBody/JT808_0x8100Test.cs b/src/JT808.Protocol.Test/MessageBody/JT808_0x8100Test.cs index ee84b62..4cc0576 100644 --- a/src/JT808.Protocol.Test/MessageBody/JT808_0x8100Test.cs +++ b/src/JT808.Protocol.Test/MessageBody/JT808_0x8100Test.cs @@ -22,7 +22,7 @@ namespace JT808.Protocol.Test.MessageBody { Code = "123456", JT808TerminalRegisterResult = Enums.JT808TerminalRegisterResult.成功, - MsgNum = 100 + AckMsgNum = 100 } }; //"7E @@ -50,7 +50,7 @@ namespace JT808.Protocol.Test.MessageBody JT808_0x8100 JT808Bodies = (JT808_0x8100)jT808Package.Bodies; Assert.Equal("123456", JT808Bodies.Code); - Assert.Equal(100, JT808Bodies.MsgNum); + Assert.Equal(100, JT808Bodies.AckMsgNum); Assert.Equal(Enums.JT808TerminalRegisterResult.成功, JT808Bodies.JT808TerminalRegisterResult); } @@ -69,7 +69,7 @@ namespace JT808.Protocol.Test.MessageBody { Code = "123456", JT808TerminalRegisterResult = Enums.JT808TerminalRegisterResult.数据库中无该终端, - MsgNum = 100 + AckMsgNum = 100 } }; //"7E @@ -96,7 +96,7 @@ namespace JT808.Protocol.Test.MessageBody JT808_0x8100 JT808Bodies = (JT808_0x8100)jT808Package.Bodies; Assert.Null(JT808Bodies.Code); - Assert.Equal(100, JT808Bodies.MsgNum); + Assert.Equal(100, JT808Bodies.AckMsgNum); Assert.Equal(Enums.JT808TerminalRegisterResult.数据库中无该终端, JT808Bodies.JT808TerminalRegisterResult); } @@ -116,7 +116,7 @@ namespace JT808.Protocol.Test.MessageBody { Code = "zssdaf23124sfdsc", JT808TerminalRegisterResult = Enums.JT808TerminalRegisterResult.成功, - MsgNum = 100 + AckMsgNum = 100 } }; //"7E 81 00 00 13 01 23 45 67 89 00 00 0A 00 64 00 7A 73 73 64 61 66 32 33 31 32 34 73 66 64 73 63 3B 7E" @@ -135,7 +135,7 @@ namespace JT808.Protocol.Test.MessageBody JT808_0x8100 JT808Bodies = (JT808_0x8100)jT808Package.Bodies; Assert.Equal("zssdaf23124sfdsc", JT808Bodies.Code); - Assert.Equal(100, JT808Bodies.MsgNum); + Assert.Equal(100, JT808Bodies.AckMsgNum); Assert.Equal(Enums.JT808TerminalRegisterResult.成功, JT808Bodies.JT808TerminalRegisterResult); } } diff --git a/src/JT808.Protocol.Test/MessageBody/JT808_0x9999.cs b/src/JT808.Protocol.Test/MessageBody/JT808_0x9999.cs index a982f9c..5e819b6 100644 --- a/src/JT808.Protocol.Test/MessageBody/JT808_0x9999.cs +++ b/src/JT808.Protocol.Test/MessageBody/JT808_0x9999.cs @@ -9,6 +9,9 @@ namespace JT808.Protocol.Test.MessageBody public class JT808_0x9999 : JT808Bodies, IJT808MessagePackFormatter { public byte Sex { get; set; } + + public override ushort MsgId => 0x9999; + public JT808_0x9999 Deserialize(ref JT808MessagePackReader reader, IJT808Config config) { JT808_0x9999 jT808_0X9999 = new JT808_0x9999(); diff --git a/src/JT808.Protocol.Test/Simples/Demo6.cs b/src/JT808.Protocol.Test/Simples/Demo6.cs index a12fa38..7d6dcc5 100644 --- a/src/JT808.Protocol.Test/Simples/Demo6.cs +++ b/src/JT808.Protocol.Test/Simples/Demo6.cs @@ -88,6 +88,9 @@ namespace JT808.Protocol.Test.Simples public byte Sex1 { get; set; } public ushort Age1 { get; set; } + + public override ushort MsgId => 0x91; + public DT1Demo6 Deserialize(ref JT808MessagePackReader reader, IJT808Config config) { DT1Demo6 dT1Demo6 = new DT1Demo6(); @@ -105,6 +108,7 @@ namespace JT808.Protocol.Test.Simples public class DT2Demo6 : JT808Bodies, IJT808MessagePackFormatter { + public override ushort MsgId => 0x91; public byte Sex2 { get; set; } public ushort Age2 { get; set; } diff --git a/src/JT808.Protocol/JT808.Protocol.xml b/src/JT808.Protocol/JT808.Protocol.xml index a6559ec..00528c6 100644 --- a/src/JT808.Protocol/JT808.Protocol.xml +++ b/src/JT808.Protocol/JT808.Protocol.xml @@ -2331,13 +2331,13 @@ 终端通用应答 - + 应答流水号 对应的平台消息的流水号 - + 应答 ID 对应的平台消息的 ID @@ -2774,7 +2774,7 @@ 位置信息查询应答 - + 应答流水号 对应的终端注册消息的流水号 @@ -3097,7 +3097,7 @@ 0x0805 - + 应答流水号 对应平台摄像头立即拍摄命令的消息流水号 @@ -3186,7 +3186,7 @@ 平台通用应答 - + @@ -3221,7 +3221,7 @@ 终端注册应答 - + 应答流水号 对应的终端注册消息的流水号 diff --git a/src/JT808.Protocol/JT808Bodies.cs b/src/JT808.Protocol/JT808Bodies.cs index 612020b..1f6499d 100644 --- a/src/JT808.Protocol/JT808Bodies.cs +++ b/src/JT808.Protocol/JT808Bodies.cs @@ -8,5 +8,7 @@ /// 当数据体为空的时候,使用null作为空包感觉不适合,所以就算使用空包也需要new一下来表达意思。 /// public virtual bool SkipSerialization { get; set; } = false; + + public abstract ushort MsgId { get;} } } diff --git a/src/JT808.Protocol/JT808SplitPackageBodies.cs b/src/JT808.Protocol/JT808SplitPackageBodies.cs index bc32e8e..fb05c0c 100644 --- a/src/JT808.Protocol/JT808SplitPackageBodies.cs +++ b/src/JT808.Protocol/JT808SplitPackageBodies.cs @@ -9,8 +9,11 @@ namespace JT808.Protocol /// public class JT808SplitPackageBodies : JT808Bodies, IJT808MessagePackFormatter { + public byte[] Data { get; set; } + public override ushort MsgId => throw new System.NotImplementedException(); + public JT808SplitPackageBodies Deserialize(ref JT808MessagePackReader reader, IJT808Config config) { JT808SplitPackageBodies jT808SplitPackageBodies = new JT808SplitPackageBodies diff --git a/src/JT808.Protocol/MessageBody/JT808_0x0001.cs b/src/JT808.Protocol/MessageBody/JT808_0x0001.cs index 674ec91..e30733b 100644 --- a/src/JT808.Protocol/MessageBody/JT808_0x0001.cs +++ b/src/JT808.Protocol/MessageBody/JT808_0x0001.cs @@ -9,17 +9,19 @@ namespace JT808.Protocol.MessageBody /// public class JT808_0x0001 : JT808Bodies,IJT808MessagePackFormatter { + public override ushort MsgId { get; } = 0x0001; /// /// 应答流水号 /// 对应的平台消息的流水号 /// - public ushort MsgNum { get; set; } + public ushort ReplyMsgNum { get; set; } /// /// 应答 ID /// 对应的平台消息的 ID /// /// - public ushort MsgId { get; set; } + public ushort ReplyMsgId { get; set; } + /// /// 结果 /// 0:成功/确认;1:失败;2:消息有误;3:不支持 @@ -29,16 +31,16 @@ namespace JT808.Protocol.MessageBody public JT808_0x0001 Deserialize(ref JT808MessagePackReader reader, IJT808Config config) { JT808_0x0001 jT808_0X0001 = new JT808_0x0001(); - jT808_0X0001.MsgNum = reader.ReadUInt16(); - jT808_0X0001.MsgId = reader.ReadUInt16(); + jT808_0X0001.ReplyMsgNum = reader.ReadUInt16(); + jT808_0X0001.ReplyMsgId = reader.ReadUInt16(); jT808_0X0001.JT808TerminalResult = (JT808TerminalResult)reader.ReadByte(); return jT808_0X0001; } public void Serialize(ref JT808MessagePackWriter writer, JT808_0x0001 value, IJT808Config config) { - writer.WriteUInt16(value.MsgNum); - writer.WriteUInt16(value.MsgId); + writer.WriteUInt16(value.ReplyMsgNum); + writer.WriteUInt16(value.ReplyMsgId); writer.WriteByte((byte)value.JT808TerminalResult); } } diff --git a/src/JT808.Protocol/MessageBody/JT808_0x0002.cs b/src/JT808.Protocol/MessageBody/JT808_0x0002.cs index 02edcbc..5c3897d 100644 --- a/src/JT808.Protocol/MessageBody/JT808_0x0002.cs +++ b/src/JT808.Protocol/MessageBody/JT808_0x0002.cs @@ -6,5 +6,6 @@ public class JT808_0x0002 : JT808Bodies { public override bool SkipSerialization { get; set; } = true; + public override ushort MsgId { get; } = 0x0002; } } diff --git a/src/JT808.Protocol/MessageBody/JT808_0x0003.cs b/src/JT808.Protocol/MessageBody/JT808_0x0003.cs index fd5d91b..c40c6de 100644 --- a/src/JT808.Protocol/MessageBody/JT808_0x0003.cs +++ b/src/JT808.Protocol/MessageBody/JT808_0x0003.cs @@ -9,5 +9,7 @@ /// 跳过数据体序列化 /// public override bool SkipSerialization { get; set; } = true; + + public override ushort MsgId { get; } = 0x0003; } } diff --git a/src/JT808.Protocol/MessageBody/JT808_0x0100.cs b/src/JT808.Protocol/MessageBody/JT808_0x0100.cs index 4586aae..6e8320b 100644 --- a/src/JT808.Protocol/MessageBody/JT808_0x0100.cs +++ b/src/JT808.Protocol/MessageBody/JT808_0x0100.cs @@ -8,6 +8,7 @@ namespace JT808.Protocol.MessageBody /// public class JT808_0x0100 : JT808Bodies, IJT808MessagePackFormatter { + public override ushort MsgId { get; } = 0x0100; /// /// 省域 ID /// 标示终端安装车辆所在的省域,0 保留,由平台取默 diff --git a/src/JT808.Protocol/MessageBody/JT808_0x0102.cs b/src/JT808.Protocol/MessageBody/JT808_0x0102.cs index 5599795..189829e 100644 --- a/src/JT808.Protocol/MessageBody/JT808_0x0102.cs +++ b/src/JT808.Protocol/MessageBody/JT808_0x0102.cs @@ -8,6 +8,7 @@ namespace JT808.Protocol.MessageBody /// public class JT808_0x0102 : JT808Bodies, IJT808MessagePackFormatter { + public override ushort MsgId { get; } = 0x0102; /// /// 鉴权码 /// diff --git a/src/JT808.Protocol/MessageBody/JT808_0x0104.cs b/src/JT808.Protocol/MessageBody/JT808_0x0104.cs index 7d9bead..1e1bf37 100644 --- a/src/JT808.Protocol/MessageBody/JT808_0x0104.cs +++ b/src/JT808.Protocol/MessageBody/JT808_0x0104.cs @@ -11,6 +11,7 @@ namespace JT808.Protocol.MessageBody /// public class JT808_0x0104 : JT808Bodies, IJT808MessagePackFormatter { + public override ushort MsgId { get; } = 0x0104; /// /// 应答流水号 /// 查询指定终端参数的流水号 diff --git a/src/JT808.Protocol/MessageBody/JT808_0x0107.cs b/src/JT808.Protocol/MessageBody/JT808_0x0107.cs index bc55eba..2dfbc64 100644 --- a/src/JT808.Protocol/MessageBody/JT808_0x0107.cs +++ b/src/JT808.Protocol/MessageBody/JT808_0x0107.cs @@ -8,6 +8,7 @@ namespace JT808.Protocol.MessageBody /// public class JT808_0x0107 : JT808Bodies,IJT808MessagePackFormatter { + public override ushort MsgId { get; } = 0x0107; /// /// 终端类型 /// bit0,0:不适用客运车辆,1:适用客运车辆; diff --git a/src/JT808.Protocol/MessageBody/JT808_0x0108.cs b/src/JT808.Protocol/MessageBody/JT808_0x0108.cs index 4792831..139b742 100644 --- a/src/JT808.Protocol/MessageBody/JT808_0x0108.cs +++ b/src/JT808.Protocol/MessageBody/JT808_0x0108.cs @@ -9,6 +9,7 @@ namespace JT808.Protocol.MessageBody /// public class JT808_0x0108 : JT808Bodies, IJT808MessagePackFormatter { + public override ushort MsgId { get; } = 0x0108; /// /// 升级类型 /// 0:终端,12:道路运输证 IC 卡读卡器,52:北斗卫星定位模块 diff --git a/src/JT808.Protocol/MessageBody/JT808_0x0200.cs b/src/JT808.Protocol/MessageBody/JT808_0x0200.cs index ec4d21c..40142f1 100644 --- a/src/JT808.Protocol/MessageBody/JT808_0x0200.cs +++ b/src/JT808.Protocol/MessageBody/JT808_0x0200.cs @@ -13,6 +13,7 @@ namespace JT808.Protocol.MessageBody /// public class JT808_0x0200 : JT808Bodies, IJT808MessagePackFormatter { + public override ushort MsgId { get; } = 0x0200; /// /// 报警标志 /// diff --git a/src/JT808.Protocol/MessageBody/JT808_0x0201.cs b/src/JT808.Protocol/MessageBody/JT808_0x0201.cs index 7f2dfe2..978e140 100644 --- a/src/JT808.Protocol/MessageBody/JT808_0x0201.cs +++ b/src/JT808.Protocol/MessageBody/JT808_0x0201.cs @@ -8,11 +8,12 @@ namespace JT808.Protocol.MessageBody /// public class JT808_0x0201 : JT808Bodies, IJT808MessagePackFormatter { + public override ushort MsgId { get; } = 0x0201; /// /// 应答流水号 /// 对应的终端注册消息的流水号 /// - public ushort MsgNum { get; set; } + public ushort ReplyMsgNum { get; set; } /// /// 位置信息汇报见 8.12 @@ -21,14 +22,14 @@ namespace JT808.Protocol.MessageBody public JT808_0x0201 Deserialize(ref JT808MessagePackReader reader, IJT808Config config) { JT808_0x0201 jT808_0X0201 = new JT808_0x0201(); - jT808_0X0201.MsgNum = reader.ReadUInt16(); + jT808_0X0201.ReplyMsgNum = reader.ReadUInt16(); jT808_0X0201.Position = config.GetMessagePackFormatter().Deserialize(ref reader, config); return jT808_0X0201; } public void Serialize(ref JT808MessagePackWriter writer, JT808_0x0201 value, IJT808Config config) { - writer.WriteUInt16(value.MsgNum); + writer.WriteUInt16(value.ReplyMsgNum); config.GetMessagePackFormatter().Serialize(ref writer, value.Position, config); } } diff --git a/src/JT808.Protocol/MessageBody/JT808_0x0301.cs b/src/JT808.Protocol/MessageBody/JT808_0x0301.cs index c00758e..3986f87 100644 --- a/src/JT808.Protocol/MessageBody/JT808_0x0301.cs +++ b/src/JT808.Protocol/MessageBody/JT808_0x0301.cs @@ -9,6 +9,7 @@ namespace JT808.Protocol.MessageBody /// public class JT808_0x0301 : JT808Bodies, IJT808MessagePackFormatter { + public override ushort MsgId { get; } = 0x0301; /// /// 事件 ID /// diff --git a/src/JT808.Protocol/MessageBody/JT808_0x0302.cs b/src/JT808.Protocol/MessageBody/JT808_0x0302.cs index 8c2a6e8..58cc27c 100644 --- a/src/JT808.Protocol/MessageBody/JT808_0x0302.cs +++ b/src/JT808.Protocol/MessageBody/JT808_0x0302.cs @@ -10,6 +10,7 @@ namespace JT808.Protocol.MessageBody /// public class JT808_0x0302 : JT808Bodies, IJT808MessagePackFormatter { + public override ushort MsgId { get; } = 0x0302; /// /// 应答流水号 /// 对应的提问下发消息的流水号 diff --git a/src/JT808.Protocol/MessageBody/JT808_0x0303.cs b/src/JT808.Protocol/MessageBody/JT808_0x0303.cs index 36c165f..1f194c9 100644 --- a/src/JT808.Protocol/MessageBody/JT808_0x0303.cs +++ b/src/JT808.Protocol/MessageBody/JT808_0x0303.cs @@ -9,6 +9,7 @@ namespace JT808.Protocol.MessageBody /// public class JT808_0x0303 : JT808Bodies, IJT808MessagePackFormatter { + public override ushort MsgId { get; } = 0x0303; /// /// 信息类型 /// diff --git a/src/JT808.Protocol/MessageBody/JT808_0x0500.cs b/src/JT808.Protocol/MessageBody/JT808_0x0500.cs index 3ab7162..fd17390 100644 --- a/src/JT808.Protocol/MessageBody/JT808_0x0500.cs +++ b/src/JT808.Protocol/MessageBody/JT808_0x0500.cs @@ -8,6 +8,7 @@ namespace JT808.Protocol.MessageBody /// public class JT808_0x0500 : JT808Bodies, IJT808MessagePackFormatter { + public override ushort MsgId { get; } = 0x0500; /// /// 应答流水号 /// 对应的终端注册消息的流水号 diff --git a/src/JT808.Protocol/MessageBody/JT808_0x0701.cs b/src/JT808.Protocol/MessageBody/JT808_0x0701.cs index ebfa239..ec12c91 100644 --- a/src/JT808.Protocol/MessageBody/JT808_0x0701.cs +++ b/src/JT808.Protocol/MessageBody/JT808_0x0701.cs @@ -11,6 +11,7 @@ namespace JT808.Protocol.MessageBody /// public class JT808_0x0701 : JT808Bodies, IJT808MessagePackFormatter { + public override ushort MsgId { get; } = 0x0701; /// /// 电子运单长度 /// diff --git a/src/JT808.Protocol/MessageBody/JT808_0x0702.cs b/src/JT808.Protocol/MessageBody/JT808_0x0702.cs index a9f73e8..a11f3c9 100644 --- a/src/JT808.Protocol/MessageBody/JT808_0x0702.cs +++ b/src/JT808.Protocol/MessageBody/JT808_0x0702.cs @@ -10,6 +10,7 @@ namespace JT808.Protocol.MessageBody /// public class JT808_0x0702 : JT808Bodies, IJT808MessagePackFormatter { + public override ushort MsgId { get; } = 0x0702; /// /// 状态 /// 0x01:从业资格证 IC 卡插入(驾驶员上班); diff --git a/src/JT808.Protocol/MessageBody/JT808_0x0704.cs b/src/JT808.Protocol/MessageBody/JT808_0x0704.cs index 01f1a59..6b96b59 100644 --- a/src/JT808.Protocol/MessageBody/JT808_0x0704.cs +++ b/src/JT808.Protocol/MessageBody/JT808_0x0704.cs @@ -10,6 +10,7 @@ namespace JT808.Protocol.MessageBody /// public class JT808_0x0704 : JT808Bodies, IJT808MessagePackFormatter { + public override ushort MsgId { get; } = 0x0704; /// /// 数据项个数 /// diff --git a/src/JT808.Protocol/MessageBody/JT808_0x0705.cs b/src/JT808.Protocol/MessageBody/JT808_0x0705.cs index 1a0c859..de67494 100644 --- a/src/JT808.Protocol/MessageBody/JT808_0x0705.cs +++ b/src/JT808.Protocol/MessageBody/JT808_0x0705.cs @@ -13,6 +13,7 @@ namespace JT808.Protocol.MessageBody /// public class JT808_0x0705 : JT808Bodies, IJT808MessagePackFormatter { + public override ushort MsgId { get; } = 0x0705; /// /// 数据项个数 /// 包含的 CAN 总线数据项个数,>0 diff --git a/src/JT808.Protocol/MessageBody/JT808_0x0800.cs b/src/JT808.Protocol/MessageBody/JT808_0x0800.cs index 4026768..6fc48aa 100644 --- a/src/JT808.Protocol/MessageBody/JT808_0x0800.cs +++ b/src/JT808.Protocol/MessageBody/JT808_0x0800.cs @@ -10,6 +10,7 @@ namespace JT808.Protocol.MessageBody /// public class JT808_0x0800 : JT808Bodies, IJT808MessagePackFormatter { + public override ushort MsgId { get; } = 0x0800; /// /// 多媒体数据 ID /// diff --git a/src/JT808.Protocol/MessageBody/JT808_0x0801.cs b/src/JT808.Protocol/MessageBody/JT808_0x0801.cs index c8b6f4d..4711c0e 100644 --- a/src/JT808.Protocol/MessageBody/JT808_0x0801.cs +++ b/src/JT808.Protocol/MessageBody/JT808_0x0801.cs @@ -10,6 +10,7 @@ namespace JT808.Protocol.MessageBody /// public class JT808_0x0801 : JT808Bodies, IJT808MessagePackFormatter { + public override ushort MsgId { get; } = 0x0801; /// /// 多媒体 ID /// diff --git a/src/JT808.Protocol/MessageBody/JT808_0x0802.cs b/src/JT808.Protocol/MessageBody/JT808_0x0802.cs index cf77c14..997ed18 100644 --- a/src/JT808.Protocol/MessageBody/JT808_0x0802.cs +++ b/src/JT808.Protocol/MessageBody/JT808_0x0802.cs @@ -11,6 +11,7 @@ namespace JT808.Protocol.MessageBody /// public class JT808_0x0802 : JT808Bodies, IJT808MessagePackFormatter { + public override ushort MsgId { get; } = 0x0802; /// /// 应答流水号 /// 对应的多媒体数据检索消息的流水号 diff --git a/src/JT808.Protocol/MessageBody/JT808_0x0805.cs b/src/JT808.Protocol/MessageBody/JT808_0x0805.cs index b2ec91d..1f34698 100644 --- a/src/JT808.Protocol/MessageBody/JT808_0x0805.cs +++ b/src/JT808.Protocol/MessageBody/JT808_0x0805.cs @@ -10,11 +10,12 @@ namespace JT808.Protocol.MessageBody /// public class JT808_0x0805 : JT808Bodies, IJT808MessagePackFormatter { + public override ushort MsgId { get; } = 0x0805; /// /// 应答流水号 /// 对应平台摄像头立即拍摄命令的消息流水号 /// - public ushort MsgNum { get; set; } + public ushort ReplyMsgNum { get; set; } /// /// 结果 /// 0:成功;1:失败;2:通道不支持。以下字段在结果=0 时才有效。 @@ -33,7 +34,7 @@ namespace JT808.Protocol.MessageBody public JT808_0x0805 Deserialize(ref JT808MessagePackReader reader, IJT808Config config) { JT808_0x0805 jT808_0X0805 = new JT808_0x0805(); - jT808_0X0805.MsgNum = reader.ReadUInt16(); + jT808_0X0805.ReplyMsgNum = reader.ReadUInt16(); jT808_0X0805.Result = reader.ReadByte(); jT808_0X0805.MultimediaIdCount = reader.ReadUInt16(); jT808_0X0805.MultimediaIds = new List(); @@ -47,7 +48,7 @@ namespace JT808.Protocol.MessageBody public void Serialize(ref JT808MessagePackWriter writer, JT808_0x0805 value, IJT808Config config) { - writer.WriteUInt16(value.MsgNum); + writer.WriteUInt16(value.ReplyMsgNum); writer.WriteByte(value.Result); writer.WriteUInt16((ushort)value.MultimediaIds.Count); foreach (var item in value.MultimediaIds) diff --git a/src/JT808.Protocol/MessageBody/JT808_0x0900.cs b/src/JT808.Protocol/MessageBody/JT808_0x0900.cs index 2456b66..c32f0d9 100644 --- a/src/JT808.Protocol/MessageBody/JT808_0x0900.cs +++ b/src/JT808.Protocol/MessageBody/JT808_0x0900.cs @@ -10,6 +10,7 @@ namespace JT808.Protocol.MessageBody /// public class JT808_0x0900 : JT808Bodies, IJT808MessagePackFormatter { + public override ushort MsgId { get; } = 0x0900; /// /// 透传消息类型 /// diff --git a/src/JT808.Protocol/MessageBody/JT808_0x0901.cs b/src/JT808.Protocol/MessageBody/JT808_0x0901.cs index c332d97..cf0d10a 100644 --- a/src/JT808.Protocol/MessageBody/JT808_0x0901.cs +++ b/src/JT808.Protocol/MessageBody/JT808_0x0901.cs @@ -10,6 +10,7 @@ namespace JT808.Protocol.MessageBody /// public class JT808_0x0901 : JT808Bodies, IJT808MessagePackFormatter { + public override ushort MsgId { get; } = 0x0901; /// /// 未压缩消息长度 /// diff --git a/src/JT808.Protocol/MessageBody/JT808_0x0A00.cs b/src/JT808.Protocol/MessageBody/JT808_0x0A00.cs index a071093..4382b70 100644 --- a/src/JT808.Protocol/MessageBody/JT808_0x0A00.cs +++ b/src/JT808.Protocol/MessageBody/JT808_0x0A00.cs @@ -10,6 +10,7 @@ namespace JT808.Protocol.MessageBody /// public class JT808_0x0A00 : JT808Bodies, IJT808MessagePackFormatter { + public override ushort MsgId { get; } = 0x0A00; /// /// e /// 终端 RSA 公钥{e,n}中的 e diff --git a/src/JT808.Protocol/MessageBody/JT808_0x8001.cs b/src/JT808.Protocol/MessageBody/JT808_0x8001.cs index 5fc9d33..a44069e 100644 --- a/src/JT808.Protocol/MessageBody/JT808_0x8001.cs +++ b/src/JT808.Protocol/MessageBody/JT808_0x8001.cs @@ -10,17 +10,18 @@ namespace JT808.Protocol.MessageBody /// public class JT808_0x8001 : JT808Bodies, IJT808MessagePackFormatter { + public override ushort MsgId { get; } = 0x8001; public ushort MsgNum { get; set; } /// /// /// - public ushort MsgId { get; set; } + public ushort AckMsgId { get; set; } public JT808PlatformResult JT808PlatformResult { get; set; } public JT808_0x8001 Deserialize(ref JT808MessagePackReader reader, IJT808Config config) { JT808_0x8001 jT808_0X8001 = new JT808_0x8001(); jT808_0X8001.MsgNum = reader.ReadUInt16(); - jT808_0X8001.MsgId = reader.ReadUInt16(); + jT808_0X8001.AckMsgId = reader.ReadUInt16(); jT808_0X8001.JT808PlatformResult = (JT808PlatformResult)reader.ReadByte(); return jT808_0X8001; } @@ -28,7 +29,7 @@ namespace JT808.Protocol.MessageBody public void Serialize(ref JT808MessagePackWriter writer, JT808_0x8001 value, IJT808Config config) { writer.WriteUInt16(value.MsgNum); - writer.WriteUInt16(value.MsgId); + writer.WriteUInt16(value.AckMsgId); writer.WriteByte((byte)value.JT808PlatformResult); } } diff --git a/src/JT808.Protocol/MessageBody/JT808_0x8003.cs b/src/JT808.Protocol/MessageBody/JT808_0x8003.cs index 487d043..7d8edae 100644 --- a/src/JT808.Protocol/MessageBody/JT808_0x8003.cs +++ b/src/JT808.Protocol/MessageBody/JT808_0x8003.cs @@ -9,6 +9,7 @@ namespace JT808.Protocol.MessageBody /// public class JT808_0x8003 : JT808Bodies, IJT808MessagePackFormatter { + public override ushort MsgId { get; } = 0x8003; /// /// 原始消息流水号 /// 对应要求补传的原始消息第一包的消息流水号 diff --git a/src/JT808.Protocol/MessageBody/JT808_0x8100.cs b/src/JT808.Protocol/MessageBody/JT808_0x8100.cs index 0e3ff3e..8b3b6a6 100644 --- a/src/JT808.Protocol/MessageBody/JT808_0x8100.cs +++ b/src/JT808.Protocol/MessageBody/JT808_0x8100.cs @@ -9,11 +9,12 @@ namespace JT808.Protocol.MessageBody /// public class JT808_0x8100 : JT808Bodies, IJT808MessagePackFormatter { + public override ushort MsgId { get; } = 0x8100; /// /// 应答流水号 /// 对应的终端注册消息的流水号 /// - public ushort MsgNum { get; set; } + public ushort AckMsgNum { get; set; } /// /// 结果 @@ -29,7 +30,7 @@ namespace JT808.Protocol.MessageBody public JT808_0x8100 Deserialize(ref JT808MessagePackReader reader, IJT808Config config) { JT808_0x8100 jT808_0X8100 = new JT808_0x8100(); - jT808_0X8100.MsgNum = reader.ReadUInt16(); + jT808_0X8100.AckMsgNum = reader.ReadUInt16(); jT808_0X8100.JT808TerminalRegisterResult = (JT808TerminalRegisterResult)reader.ReadByte(); // 只有在成功后才有该字段 if (jT808_0X8100.JT808TerminalRegisterResult == JT808TerminalRegisterResult.成功) @@ -41,7 +42,7 @@ namespace JT808.Protocol.MessageBody public void Serialize(ref JT808MessagePackWriter writer, JT808_0x8100 value, IJT808Config config) { - writer.WriteUInt16(value.MsgNum); + writer.WriteUInt16(value.AckMsgNum); writer.WriteByte((byte)value.JT808TerminalRegisterResult); // 只有在成功后才有该字段 if (value.JT808TerminalRegisterResult == JT808TerminalRegisterResult.成功) diff --git a/src/JT808.Protocol/MessageBody/JT808_0x8103.cs b/src/JT808.Protocol/MessageBody/JT808_0x8103.cs index 8a371a7..3eb6f6c 100644 --- a/src/JT808.Protocol/MessageBody/JT808_0x8103.cs +++ b/src/JT808.Protocol/MessageBody/JT808_0x8103.cs @@ -13,6 +13,7 @@ namespace JT808.Protocol.MessageBody /// public class JT808_0x8103 : JT808Bodies, IJT808MessagePackFormatter { + public override ushort MsgId { get; } = 0x8103; /// /// 参数总数 /// diff --git a/src/JT808.Protocol/MessageBody/JT808_0x8104.cs b/src/JT808.Protocol/MessageBody/JT808_0x8104.cs index 5057bc9..2123de2 100644 --- a/src/JT808.Protocol/MessageBody/JT808_0x8104.cs +++ b/src/JT808.Protocol/MessageBody/JT808_0x8104.cs @@ -5,6 +5,7 @@ /// public class JT808_0x8104 : JT808Bodies { + public override ushort MsgId { get; } = 0x8104; /// /// 跳过数据体序列化 /// diff --git a/src/JT808.Protocol/MessageBody/JT808_0x8105.cs b/src/JT808.Protocol/MessageBody/JT808_0x8105.cs index 673315d..682846c 100644 --- a/src/JT808.Protocol/MessageBody/JT808_0x8105.cs +++ b/src/JT808.Protocol/MessageBody/JT808_0x8105.cs @@ -9,6 +9,7 @@ namespace JT808.Protocol.MessageBody /// public class JT808_0x8105 : JT808Bodies, IJT808MessagePackFormatter { + public override ushort MsgId { get; } = 0x8105; /// /// 命令字 /// diff --git a/src/JT808.Protocol/MessageBody/JT808_0x8106.cs b/src/JT808.Protocol/MessageBody/JT808_0x8106.cs index c183f03..d255aa9 100644 --- a/src/JT808.Protocol/MessageBody/JT808_0x8106.cs +++ b/src/JT808.Protocol/MessageBody/JT808_0x8106.cs @@ -10,6 +10,7 @@ namespace JT808.Protocol.MessageBody /// public class JT808_0x8106 : JT808Bodies, IJT808MessagePackFormatter { + public override ushort MsgId { get; } = 0x8106; /// /// 参数总数 /// 参数总数为 n diff --git a/src/JT808.Protocol/MessageBody/JT808_0x8107.cs b/src/JT808.Protocol/MessageBody/JT808_0x8107.cs index 7664602..e15f167 100644 --- a/src/JT808.Protocol/MessageBody/JT808_0x8107.cs +++ b/src/JT808.Protocol/MessageBody/JT808_0x8107.cs @@ -5,6 +5,7 @@ /// public class JT808_0x8107 : JT808Bodies { + public override ushort MsgId { get; } = 0x8107; /// /// 跳过数据体序列化 /// diff --git a/src/JT808.Protocol/MessageBody/JT808_0x8108.cs b/src/JT808.Protocol/MessageBody/JT808_0x8108.cs index b664b98..0662dfc 100644 --- a/src/JT808.Protocol/MessageBody/JT808_0x8108.cs +++ b/src/JT808.Protocol/MessageBody/JT808_0x8108.cs @@ -9,6 +9,7 @@ namespace JT808.Protocol.MessageBody /// public class JT808_0x8108 : JT808Bodies, IJT808MessagePackFormatter { + public override ushort MsgId { get; } = 0x8108; /// /// 升级类型 /// diff --git a/src/JT808.Protocol/MessageBody/JT808_0x8201.cs b/src/JT808.Protocol/MessageBody/JT808_0x8201.cs index 201f00e..87877d2 100644 --- a/src/JT808.Protocol/MessageBody/JT808_0x8201.cs +++ b/src/JT808.Protocol/MessageBody/JT808_0x8201.cs @@ -5,6 +5,7 @@ /// public class JT808_0x8201: JT808Bodies { + public override ushort MsgId { get; } = 0x8201; /// /// 跳过数据体序列化 /// diff --git a/src/JT808.Protocol/MessageBody/JT808_0x8202.cs b/src/JT808.Protocol/MessageBody/JT808_0x8202.cs index 12ff628..d1439f3 100644 --- a/src/JT808.Protocol/MessageBody/JT808_0x8202.cs +++ b/src/JT808.Protocol/MessageBody/JT808_0x8202.cs @@ -8,6 +8,7 @@ namespace JT808.Protocol.MessageBody /// public class JT808_0x8202 : JT808Bodies, IJT808MessagePackFormatter { + public override ushort MsgId { get; } = 0x8202; /// /// 时间间隔 /// 单位为秒(s),0 则停止跟踪。停止跟踪无需带后继字段 diff --git a/src/JT808.Protocol/MessageBody/JT808_0x8203.cs b/src/JT808.Protocol/MessageBody/JT808_0x8203.cs index 1d54a67..733d842 100644 --- a/src/JT808.Protocol/MessageBody/JT808_0x8203.cs +++ b/src/JT808.Protocol/MessageBody/JT808_0x8203.cs @@ -9,6 +9,7 @@ namespace JT808.Protocol.MessageBody /// public class JT808_0x8203 : JT808Bodies, IJT808MessagePackFormatter { + public override ushort MsgId { get; } = 0x8203; /// /// 报警消息流水号 /// 需人工确认的报警消息流水号,0 表示该报警类型所有消息 diff --git a/src/JT808.Protocol/MessageBody/JT808_0x8300.cs b/src/JT808.Protocol/MessageBody/JT808_0x8300.cs index 0dcbbf6..16825b1 100644 --- a/src/JT808.Protocol/MessageBody/JT808_0x8300.cs +++ b/src/JT808.Protocol/MessageBody/JT808_0x8300.cs @@ -9,6 +9,7 @@ namespace JT808.Protocol.MessageBody /// public class JT808_0x8300 : JT808Bodies, IJT808MessagePackFormatter { + public override ushort MsgId { get; } = 0x8300; /// /// 文本信息标志位含义见 表 38 /// diff --git a/src/JT808.Protocol/MessageBody/JT808_0x8301.cs b/src/JT808.Protocol/MessageBody/JT808_0x8301.cs index 74cbe57..7be097e 100644 --- a/src/JT808.Protocol/MessageBody/JT808_0x8301.cs +++ b/src/JT808.Protocol/MessageBody/JT808_0x8301.cs @@ -11,6 +11,7 @@ namespace JT808.Protocol.MessageBody /// public class JT808_0x8301 : JT808Bodies, IJT808MessagePackFormatter { + public override ushort MsgId { get; } = 0x8301; /// /// 设置类型 /// diff --git a/src/JT808.Protocol/MessageBody/JT808_0x8302.cs b/src/JT808.Protocol/MessageBody/JT808_0x8302.cs index c2097bf..158a1a2 100644 --- a/src/JT808.Protocol/MessageBody/JT808_0x8302.cs +++ b/src/JT808.Protocol/MessageBody/JT808_0x8302.cs @@ -11,6 +11,7 @@ namespace JT808.Protocol.MessageBody /// public class JT808_0x8302 : JT808Bodies, IJT808MessagePackFormatter { + public override ushort MsgId { get; } = 0x8302; /// /// 标志 /// 提问下发标志位定义 diff --git a/src/JT808.Protocol/MessageBody/JT808_0x8303.cs b/src/JT808.Protocol/MessageBody/JT808_0x8303.cs index 6cd992e..6fb81f7 100644 --- a/src/JT808.Protocol/MessageBody/JT808_0x8303.cs +++ b/src/JT808.Protocol/MessageBody/JT808_0x8303.cs @@ -11,6 +11,7 @@ namespace JT808.Protocol.MessageBody /// public class JT808_0x8303 : JT808Bodies, IJT808MessagePackFormatter { + public override ushort MsgId { get; } = 0x8303; /// /// 设置类型 /// diff --git a/src/JT808.Protocol/MessageBody/JT808_0x8304.cs b/src/JT808.Protocol/MessageBody/JT808_0x8304.cs index 19f7a88..ca613ee 100644 --- a/src/JT808.Protocol/MessageBody/JT808_0x8304.cs +++ b/src/JT808.Protocol/MessageBody/JT808_0x8304.cs @@ -9,6 +9,7 @@ namespace JT808.Protocol.MessageBody /// public class JT808_0x8304 : JT808Bodies, IJT808MessagePackFormatter { + public override ushort MsgId { get; } = 0x8304; /// /// 信息类型 /// diff --git a/src/JT808.Protocol/MessageBody/JT808_0x8400.cs b/src/JT808.Protocol/MessageBody/JT808_0x8400.cs index d71b070..2795e2e 100644 --- a/src/JT808.Protocol/MessageBody/JT808_0x8400.cs +++ b/src/JT808.Protocol/MessageBody/JT808_0x8400.cs @@ -9,6 +9,7 @@ namespace JT808.Protocol.MessageBody /// public class JT808_0x8400 : JT808Bodies, IJT808MessagePackFormatter { + public override ushort MsgId { get; } = 0x8400; /// /// 0:普通通话;1:监听 /// diff --git a/src/JT808.Protocol/MessageBody/JT808_0x8401.cs b/src/JT808.Protocol/MessageBody/JT808_0x8401.cs index 9e4b5e8..4905e6f 100644 --- a/src/JT808.Protocol/MessageBody/JT808_0x8401.cs +++ b/src/JT808.Protocol/MessageBody/JT808_0x8401.cs @@ -11,6 +11,7 @@ namespace JT808.Protocol.MessageBody /// public class JT808_0x8401 : JT808Bodies, IJT808MessagePackFormatter { + public override ushort MsgId { get; } = 0x8401; /// /// 设置类型 /// diff --git a/src/JT808.Protocol/MessageBody/JT808_0x8500.cs b/src/JT808.Protocol/MessageBody/JT808_0x8500.cs index 76d08bb..551fb70 100644 --- a/src/JT808.Protocol/MessageBody/JT808_0x8500.cs +++ b/src/JT808.Protocol/MessageBody/JT808_0x8500.cs @@ -8,6 +8,7 @@ namespace JT808.Protocol.MessageBody /// public class JT808_0x8500 : JT808Bodies, IJT808MessagePackFormatter { + public override ushort MsgId { get; } = 0x8500; /// /// 控制标志 /// 控制指令标志位数据格式 diff --git a/src/JT808.Protocol/MessageBody/JT808_0x8600.cs b/src/JT808.Protocol/MessageBody/JT808_0x8600.cs index 8693df6..fd805d2 100644 --- a/src/JT808.Protocol/MessageBody/JT808_0x8600.cs +++ b/src/JT808.Protocol/MessageBody/JT808_0x8600.cs @@ -13,6 +13,7 @@ namespace JT808.Protocol.MessageBody /// public class JT808_0x8600 : JT808Bodies, IJT808MessagePackFormatter { + public override ushort MsgId { get; } = 0x8600; /// /// 设置属性 /// diff --git a/src/JT808.Protocol/MessageBody/JT808_0x8601.cs b/src/JT808.Protocol/MessageBody/JT808_0x8601.cs index 4cc160a..c130bed 100644 --- a/src/JT808.Protocol/MessageBody/JT808_0x8601.cs +++ b/src/JT808.Protocol/MessageBody/JT808_0x8601.cs @@ -10,6 +10,7 @@ namespace JT808.Protocol.MessageBody /// public class JT808_0x8601 : JT808Bodies, IJT808MessagePackFormatter { + public override ushort MsgId { get; } = 0x8601; /// /// 区域数 /// 本条消息中包含的区域数,不超过 125 个,多于 125个建议用多条消息,0 为删除所有圆形区域 diff --git a/src/JT808.Protocol/MessageBody/JT808_0x8602.cs b/src/JT808.Protocol/MessageBody/JT808_0x8602.cs index 85ad2e3..cb27459 100644 --- a/src/JT808.Protocol/MessageBody/JT808_0x8602.cs +++ b/src/JT808.Protocol/MessageBody/JT808_0x8602.cs @@ -12,6 +12,7 @@ namespace JT808.Protocol.MessageBody /// public class JT808_0x8602 : JT808Bodies, IJT808MessagePackFormatter { + public override ushort MsgId { get; } = 0x8602; /// /// 设置属性 /// diff --git a/src/JT808.Protocol/MessageBody/JT808_0x8603.cs b/src/JT808.Protocol/MessageBody/JT808_0x8603.cs index e714765..5c5e2dc 100644 --- a/src/JT808.Protocol/MessageBody/JT808_0x8603.cs +++ b/src/JT808.Protocol/MessageBody/JT808_0x8603.cs @@ -10,6 +10,7 @@ namespace JT808.Protocol.MessageBody /// public class JT808_0x8603 : JT808Bodies, IJT808MessagePackFormatter { + public override ushort MsgId { get; } = 0x8603; /// /// 区域数 /// 本条消息中包含的区域数,不超过 125 个,多于 125个建议用多条消息,0 为删除所有圆形区域 diff --git a/src/JT808.Protocol/MessageBody/JT808_0x8604.cs b/src/JT808.Protocol/MessageBody/JT808_0x8604.cs index a23c872..509697a 100644 --- a/src/JT808.Protocol/MessageBody/JT808_0x8604.cs +++ b/src/JT808.Protocol/MessageBody/JT808_0x8604.cs @@ -12,6 +12,7 @@ namespace JT808.Protocol.MessageBody /// public class JT808_0x8604 : JT808Bodies, IJT808MessagePackFormatter { + public override ushort MsgId { get; } = 0x8604; /// /// 区域 ID /// diff --git a/src/JT808.Protocol/MessageBody/JT808_0x8605.cs b/src/JT808.Protocol/MessageBody/JT808_0x8605.cs index e231cf4..9c92201 100644 --- a/src/JT808.Protocol/MessageBody/JT808_0x8605.cs +++ b/src/JT808.Protocol/MessageBody/JT808_0x8605.cs @@ -10,6 +10,7 @@ namespace JT808.Protocol.MessageBody /// public class JT808_0x8605 : JT808Bodies, IJT808MessagePackFormatter { + public override ushort MsgId { get; } = 0x8605; /// /// 区域数 /// 本条消息中包含的区域数,不超过 125 个,多于 125个建议用多条消息,0 为删除所有圆形区域 diff --git a/src/JT808.Protocol/MessageBody/JT808_0x8606.cs b/src/JT808.Protocol/MessageBody/JT808_0x8606.cs index 6d4480d..faa96e6 100644 --- a/src/JT808.Protocol/MessageBody/JT808_0x8606.cs +++ b/src/JT808.Protocol/MessageBody/JT808_0x8606.cs @@ -12,6 +12,7 @@ namespace JT808.Protocol.MessageBody /// public class JT808_0x8606 : JT808Bodies, IJT808MessagePackFormatter { + public override ushort MsgId { get; } = 0x8606; /// /// 路线 ID /// diff --git a/src/JT808.Protocol/MessageBody/JT808_0x8607.cs b/src/JT808.Protocol/MessageBody/JT808_0x8607.cs index 1cc9c54..466e727 100644 --- a/src/JT808.Protocol/MessageBody/JT808_0x8607.cs +++ b/src/JT808.Protocol/MessageBody/JT808_0x8607.cs @@ -10,6 +10,7 @@ namespace JT808.Protocol.MessageBody /// public class JT808_0x8607 : JT808Bodies, IJT808MessagePackFormatter { + public override ushort MsgId { get; } = 0x8607; /// /// 区域数 /// 本条消息中包含的区域数,不超过 125 个,多于 125个建议用多条消息,0 为删除所有圆形区域 diff --git a/src/JT808.Protocol/MessageBody/JT808_0x8702.cs b/src/JT808.Protocol/MessageBody/JT808_0x8702.cs index df6eb07..e7b1d9f 100644 --- a/src/JT808.Protocol/MessageBody/JT808_0x8702.cs +++ b/src/JT808.Protocol/MessageBody/JT808_0x8702.cs @@ -5,6 +5,7 @@ /// public class JT808_0x8702 : JT808Bodies { + public override ushort MsgId { get; } = 0x8702; /// /// 跳过数据体序列化 /// diff --git a/src/JT808.Protocol/MessageBody/JT808_0x8800.cs b/src/JT808.Protocol/MessageBody/JT808_0x8800.cs index da5c7b4..c6e17ee 100644 --- a/src/JT808.Protocol/MessageBody/JT808_0x8800.cs +++ b/src/JT808.Protocol/MessageBody/JT808_0x8800.cs @@ -9,6 +9,7 @@ namespace JT808.Protocol.MessageBody /// public class JT808_0x8800 : JT808Bodies, IJT808MessagePackFormatter { + public override ushort MsgId { get; } = 0x8800; /// /// 多媒体ID /// diff --git a/src/JT808.Protocol/MessageBody/JT808_0x8801.cs b/src/JT808.Protocol/MessageBody/JT808_0x8801.cs index 3ddfed7..c13122a 100644 --- a/src/JT808.Protocol/MessageBody/JT808_0x8801.cs +++ b/src/JT808.Protocol/MessageBody/JT808_0x8801.cs @@ -9,6 +9,7 @@ namespace JT808.Protocol.MessageBody /// public class JT808_0x8801 : JT808Bodies, IJT808MessagePackFormatter { + public override ushort MsgId { get; } = 0x8801; /// /// 通道 ID /// diff --git a/src/JT808.Protocol/MessageBody/JT808_0x8802.cs b/src/JT808.Protocol/MessageBody/JT808_0x8802.cs index aa5d1fb..6664739 100644 --- a/src/JT808.Protocol/MessageBody/JT808_0x8802.cs +++ b/src/JT808.Protocol/MessageBody/JT808_0x8802.cs @@ -10,6 +10,7 @@ namespace JT808.Protocol.MessageBody /// public class JT808_0x8802 : JT808Bodies, IJT808MessagePackFormatter { + public override ushort MsgId { get; } = 0x8802; /// /// 多媒体类型 /// diff --git a/src/JT808.Protocol/MessageBody/JT808_0x8803.cs b/src/JT808.Protocol/MessageBody/JT808_0x8803.cs index 43af07c..8a2d851 100644 --- a/src/JT808.Protocol/MessageBody/JT808_0x8803.cs +++ b/src/JT808.Protocol/MessageBody/JT808_0x8803.cs @@ -10,6 +10,7 @@ namespace JT808.Protocol.MessageBody /// public class JT808_0x8803 : JT808Bodies, IJT808MessagePackFormatter { + public override ushort MsgId { get; } = 0x8803; /// /// 多媒体类型 /// diff --git a/src/JT808.Protocol/MessageBody/JT808_0x8804.cs b/src/JT808.Protocol/MessageBody/JT808_0x8804.cs index 71829ba..ea044a9 100644 --- a/src/JT808.Protocol/MessageBody/JT808_0x8804.cs +++ b/src/JT808.Protocol/MessageBody/JT808_0x8804.cs @@ -9,6 +9,7 @@ namespace JT808.Protocol.MessageBody /// public class JT808_0x8804 : JT808Bodies, IJT808MessagePackFormatter { + public override ushort MsgId { get; } = 0x8804; /// /// 录音命令 /// 0:停止录音;0x01:开始录音; diff --git a/src/JT808.Protocol/MessageBody/JT808_0x8805.cs b/src/JT808.Protocol/MessageBody/JT808_0x8805.cs index d4b344b..11486ce 100644 --- a/src/JT808.Protocol/MessageBody/JT808_0x8805.cs +++ b/src/JT808.Protocol/MessageBody/JT808_0x8805.cs @@ -8,6 +8,7 @@ namespace JT808.Protocol.MessageBody /// public class JT808_0x8805 : JT808Bodies, IJT808MessagePackFormatter { + public override ushort MsgId { get; } = 0x8805; /// /// 多媒体ID /// diff --git a/src/JT808.Protocol/MessageBody/JT808_0x8900.cs b/src/JT808.Protocol/MessageBody/JT808_0x8900.cs index 1624603..25854e9 100644 --- a/src/JT808.Protocol/MessageBody/JT808_0x8900.cs +++ b/src/JT808.Protocol/MessageBody/JT808_0x8900.cs @@ -9,6 +9,7 @@ namespace JT808.Protocol.MessageBody /// public class JT808_0x8900 : JT808Bodies, IJT808MessagePackFormatter { + public override ushort MsgId { get; } = 0x8900; /// /// 透传消息类型 /// 透传消息类型定义见 表 93 diff --git a/src/JT808.Protocol/MessageBody/JT808_0x8A00.cs b/src/JT808.Protocol/MessageBody/JT808_0x8A00.cs index f5e6b65..5cf4d2f 100644 --- a/src/JT808.Protocol/MessageBody/JT808_0x8A00.cs +++ b/src/JT808.Protocol/MessageBody/JT808_0x8A00.cs @@ -10,6 +10,7 @@ namespace JT808.Protocol.MessageBody /// public class JT808_0x8A00 : JT808Bodies, IJT808MessagePackFormatter { + public override ushort MsgId { get; } = 0x8A00; /// /// e /// 平台 RSA 公钥{e,n}中的 e