diff --git a/src/Info.props b/src/Info.props index 810f778..63bfe52 100644 --- a/src/Info.props +++ b/src/Info.props @@ -8,7 +8,7 @@ https://github.com/SmallChi/JT808 https://github.com/SmallChi/JT808/blob/master/LICENSE https://github.com/SmallChi/JT808/blob/master/LICENSE - 2.4.6-preview1 + 2.4.6-preview2 LICENSE true latest diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.YueBiao.Test/JT808_0x0200_0x64_Test.cs b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.YueBiao.Test/JT808_0x0200_0x64_Test.cs index f79de26..feb5a57 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.YueBiao.Test/JT808_0x0200_0x64_Test.cs +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.YueBiao.Test/JT808_0x0200_0x64_Test.cs @@ -31,9 +31,9 @@ namespace JT808.Protocol.Extensions.YueBiao.Test Speed = 60, Direction = 0, StatusFlag = 2, - BasicLocationAttachData = new Dictionary() + CustomLocationAttachData = new Dictionary() }; - jT808UploadLocationRequest.BasicLocationAttachData.Add(JT808_YueBiao_Constants.JT808_0X0200_0x64, new JT808_0x0200_0x64 + jT808UploadLocationRequest.CustomLocationAttachData.Add(JT808_YueBiao_Constants.JT808_0X0200_0x64, new JT808_0x0200_0x64 { AlarmId = 1, AlarmIdentification = new Metadata.AlarmIdentificationProperty @@ -67,7 +67,7 @@ namespace JT808.Protocol.Extensions.YueBiao.Test public void Deserialize() { var jT808UploadLocationRequest = JT808Serializer.Deserialize("000000010000000200BA7F0E07E4F11C0028003C00001807151010106447000000010C0605120A0B100F1100070000000D0000000E191211183100001334343434343434000000000000000000000000000000000000000000000019121018310003020506".ToHexBytes()); - jT808UploadLocationRequest.BasicLocationAttachData.TryGetValue(JT808_YueBiao_Constants.JT808_0X0200_0x64, out var value); + jT808UploadLocationRequest.CustomLocationAttachData.TryGetValue(JT808_YueBiao_Constants.JT808_0X0200_0x64, out var value); JT808_0x0200_0x64 jT808_0X0200_0X64 = value as JT808_0x0200_0x64; Assert.Equal(1u, jT808_0X0200_0X64.AlarmId); Assert.Equal(2, jT808_0X0200_0X64.AlarmIdentification.AttachCount); diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.YueBiao.Test/JT808_0x0200_0x65_Test.cs b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.YueBiao.Test/JT808_0x0200_0x65_Test.cs index ae98bb6..162d14a 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.YueBiao.Test/JT808_0x0200_0x65_Test.cs +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.YueBiao.Test/JT808_0x0200_0x65_Test.cs @@ -31,9 +31,9 @@ namespace JT808.Protocol.Extensions.YueBiao.Test Speed = 60, Direction = 0, StatusFlag = 2, - BasicLocationAttachData = new Dictionary() + CustomLocationAttachData = new Dictionary() }; - jT808UploadLocationRequest.BasicLocationAttachData.Add(JT808_YueBiao_Constants.JT808_0X0200_0x65, new JT808_0x0200_0x65 + jT808UploadLocationRequest.CustomLocationAttachData.Add(JT808_YueBiao_Constants.JT808_0X0200_0x65, new JT808_0x0200_0x65 { AlarmId = 1, AlarmIdentification = new Metadata.AlarmIdentificationProperty @@ -64,7 +64,7 @@ namespace JT808.Protocol.Extensions.YueBiao.Test public void Deserialize() { var jT808UploadLocationRequest = JT808Serializer.Deserialize("000000010000000200BA7F0E07E4F11C0028003C00001807151010106547000000010C060512010203041100070000000D0000000E191211183100001334343434343434000000000000000000000000000000000000000000000019121018310003020506".ToHexBytes()); - jT808UploadLocationRequest.BasicLocationAttachData.TryGetValue(JT808_YueBiao_Constants.JT808_0X0200_0x65, out var value); + jT808UploadLocationRequest.CustomLocationAttachData.TryGetValue(JT808_YueBiao_Constants.JT808_0X0200_0x65, out var value); JT808_0x0200_0x65 jT808_0X0200_0X65 = value as JT808_0x0200_0x65; Assert.Equal(1u, jT808_0X0200_0X65.AlarmId); Assert.Equal(2, jT808_0X0200_0X65.AlarmIdentification.AttachCount); diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.YueBiao.Test/JT808_0x0200_0x66_Test.cs b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.YueBiao.Test/JT808_0x0200_0x66_Test.cs index 3460b25..b22958a 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.YueBiao.Test/JT808_0x0200_0x66_Test.cs +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.YueBiao.Test/JT808_0x0200_0x66_Test.cs @@ -31,9 +31,9 @@ namespace JT808.Protocol.Extensions.YueBiao.Test Speed = 60, Direction = 0, StatusFlag = 2, - BasicLocationAttachData = new Dictionary() + CustomLocationAttachData =new Dictionary() }; - jT808UploadLocationRequest.BasicLocationAttachData.Add(JT808_YueBiao_Constants.JT808_0X0200_0x66, new JT808_0x0200_0x66 + jT808UploadLocationRequest.CustomLocationAttachData.Add(JT808_YueBiao_Constants.JT808_0X0200_0x66, new JT808_0x0200_0x66 { AlarmId = 1, AlarmIdentification = new Metadata.AlarmIdentificationProperty @@ -78,7 +78,7 @@ namespace JT808.Protocol.Extensions.YueBiao.Test public void Deserialize() { var jT808UploadLocationRequest = JT808Serializer.Deserialize("000000010000000200BA7F0E07E4F11C0028003C00001807151010106655000000010C1100070000000D0000000E1912111831000013343434343434340000000000000000000000000000000000000000000000191210183100030205060200040001000300050002000900060008000A0007".ToHexBytes()); - jT808UploadLocationRequest.BasicLocationAttachData.TryGetValue(JT808_YueBiao_Constants.JT808_0X0200_0x66, out var value); + jT808UploadLocationRequest.CustomLocationAttachData.TryGetValue(JT808_YueBiao_Constants.JT808_0X0200_0x66, out var value); JT808_0x0200_0x66 jT808_0X0200_0X66 = value as JT808_0x0200_0x66; Assert.Equal(1u, jT808_0X0200_0X66.AlarmId); Assert.Equal(2, jT808_0X0200_0X66.AlarmIdentification.AttachCount); diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.YueBiao.Test/JT808_0x0200_0x67_Test.cs b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.YueBiao.Test/JT808_0x0200_0x67_Test.cs index b9b7049..dba713b 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.YueBiao.Test/JT808_0x0200_0x67_Test.cs +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.YueBiao.Test/JT808_0x0200_0x67_Test.cs @@ -31,9 +31,9 @@ namespace JT808.Protocol.Extensions.YueBiao.Test Speed = 60, Direction = 0, StatusFlag = 2, - BasicLocationAttachData = new Dictionary() + CustomLocationAttachData =new Dictionary() }; - jT808UploadLocationRequest.BasicLocationAttachData.Add(JT808_YueBiao_Constants.JT808_0X0200_0x67, new JT808_0x0200_0x67 + jT808UploadLocationRequest.CustomLocationAttachData.Add(JT808_YueBiao_Constants.JT808_0X0200_0x67, new JT808_0x0200_0x67 { AlarmId = 1, AlarmIdentification = new Metadata.AlarmIdentificationProperty @@ -61,7 +61,7 @@ namespace JT808.Protocol.Extensions.YueBiao.Test public void Deserialize() { var jT808UploadLocationRequest = JT808Serializer.Deserialize("000000010000000200BA7F0E07E4F11C0028003C00001807151010106741000000010C091100070000000D0000000E191211183100001334343434343434000000000000000000000000000000000000000000000019121018310003020506".ToHexBytes()); - jT808UploadLocationRequest.BasicLocationAttachData.TryGetValue(JT808_YueBiao_Constants.JT808_0X0200_0x67, out var value); + jT808UploadLocationRequest.CustomLocationAttachData.TryGetValue(JT808_YueBiao_Constants.JT808_0X0200_0x67, out var value); JT808_0x0200_0x67 jT808_0X0200_0X67 = value as JT808_0x0200_0x67; Assert.Equal(1u, jT808_0X0200_0X67.AlarmId); Assert.Equal(2, jT808_0X0200_0X67.AlarmIdentification.AttachCount); diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.YueBiao/MessageBody/JT808_0x0200_0x64.cs b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.YueBiao/MessageBody/JT808_0x0200_0x64.cs index 2507feb..dcb8f98 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.YueBiao/MessageBody/JT808_0x0200_0x64.cs +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.YueBiao/MessageBody/JT808_0x0200_0x64.cs @@ -13,7 +13,7 @@ namespace JT808.Protocol.Extensions.YueBiao.MessageBody /// /// 高级驾驶辅助系统报警信息 /// - public class JT808_0x0200_0x64 : JT808_0x0200_BodyBase, IJT808MessagePackFormatter, IJT808Analyze,IJT808_2019_Version + public class JT808_0x0200_0x64 : JT808_0x0200_CustomBodyBase, IJT808MessagePackFormatter, IJT808Analyze,IJT808_2019_Version { /// /// 高级驾驶辅助系统报警信息Id diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.YueBiao/MessageBody/JT808_0x0200_0x65.cs b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.YueBiao/MessageBody/JT808_0x0200_0x65.cs index d323e51..a761738 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.YueBiao/MessageBody/JT808_0x0200_0x65.cs +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.YueBiao/MessageBody/JT808_0x0200_0x65.cs @@ -13,7 +13,7 @@ namespace JT808.Protocol.Extensions.YueBiao.MessageBody /// /// 驾驶员状态监测系统报警信息 /// - public class JT808_0x0200_0x65 : JT808_0x0200_BodyBase, IJT808MessagePackFormatter, IJT808Analyze, IJT808_2019_Version + public class JT808_0x0200_0x65 : JT808_0x0200_CustomBodyBase, IJT808MessagePackFormatter, IJT808Analyze, IJT808_2019_Version { /// /// 驾驶员状态监测系统报警信息Id diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.YueBiao/MessageBody/JT808_0x0200_0x66.cs b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.YueBiao/MessageBody/JT808_0x0200_0x66.cs index 1701125..0a335c1 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.YueBiao/MessageBody/JT808_0x0200_0x66.cs +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.YueBiao/MessageBody/JT808_0x0200_0x66.cs @@ -13,7 +13,7 @@ namespace JT808.Protocol.Extensions.YueBiao.MessageBody /// /// 胎压监测系统报警信息 /// - public class JT808_0x0200_0x66 : JT808_0x0200_BodyBase, IJT808MessagePackFormatter, IJT808Analyze, IJT808_2019_Version + public class JT808_0x0200_0x66 : JT808_0x0200_CustomBodyBase, IJT808MessagePackFormatter, IJT808Analyze, IJT808_2019_Version { /// /// 胎压监测系统报警信息Id diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.YueBiao/MessageBody/JT808_0x0200_0x67.cs b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.YueBiao/MessageBody/JT808_0x0200_0x67.cs index 25e990e..7f2007c 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.YueBiao/MessageBody/JT808_0x0200_0x67.cs +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.YueBiao/MessageBody/JT808_0x0200_0x67.cs @@ -13,7 +13,7 @@ namespace JT808.Protocol.Extensions.YueBiao.MessageBody /// /// 盲区监测系统报警信息 /// - public class JT808_0x0200_0x67 : JT808_0x0200_BodyBase, IJT808MessagePackFormatter, IJT808Analyze, IJT808_2019_Version + public class JT808_0x0200_0x67 : JT808_0x0200_CustomBodyBase, IJT808MessagePackFormatter, IJT808Analyze, IJT808_2019_Version { /// /// 盲区监测系统报警信息Id diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.YueBiao/MessageBody/JT808_0x0200_0xF1.cs b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.YueBiao/MessageBody/JT808_0x0200_0xF1.cs index 2582c97..0eb9311 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.YueBiao/MessageBody/JT808_0x0200_0xF1.cs +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.YueBiao/MessageBody/JT808_0x0200_0xF1.cs @@ -13,7 +13,7 @@ namespace JT808.Protocol.Extensions.YueBiao.MessageBody /// /// 安装异常信息 /// - public class JT808_0x0200_0xF1 : JT808_0x0200_BodyBase, IJT808MessagePackFormatter, IJT808Analyze, IJT808_2019_Version + public class JT808_0x0200_0xF1 : JT808_0x0200_CustomBodyBase, IJT808MessagePackFormatter, IJT808Analyze, IJT808_2019_Version { /// /// 安装异常信息附件ID diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.YueBiao/MessageBody/JT808_0x0200_0xF2.cs b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.YueBiao/MessageBody/JT808_0x0200_0xF2.cs index 43c4263..4764c3f 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.YueBiao/MessageBody/JT808_0x0200_0xF2.cs +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.YueBiao/MessageBody/JT808_0x0200_0xF2.cs @@ -13,7 +13,7 @@ namespace JT808.Protocol.Extensions.YueBiao.MessageBody /// /// 算法异常信息 /// - public class JT808_0x0200_0xF2 : JT808_0x0200_BodyBase, IJT808MessagePackFormatter, IJT808Analyze, IJT808_2019_Version + public class JT808_0x0200_0xF2 : JT808_0x0200_CustomBodyBase, IJT808MessagePackFormatter, IJT808Analyze, IJT808_2019_Version { /// /// 算法异常信息附件ID