From 03ac0020cec36c5625b110fa98dca46f9c7a93fd Mon Sep 17 00:00:00 2001
From: "SmallChi(Koike)" <564952747@qq.com>
Date: Tue, 26 Apr 2022 19:52:24 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=B0=83=E6=95=B40x200=E4=BD=8D=E7=BD=AE?=
=?UTF-8?q?=E9=99=84=E5=8A=A0=E4=BF=A1=E6=81=AF=E6=89=A9=E5=B1=95=EF=BC=8C?=
=?UTF-8?q?=E9=80=9A=E8=BF=87=E5=8D=8F=E8=AE=AE=E7=89=88=E6=9C=AC=E5=8F=B7?=
=?UTF-8?q?=E7=BA=A6=E6=9D=9F=E5=90=84=E4=B8=AA=E7=89=88=E6=9C=AC=E7=9A=84?=
=?UTF-8?q?=E4=BD=8D=E7=BD=AE=E9=99=84=E5=8A=A0=E4=BF=A1=E6=81=AF=E4=BF=9D?=
=?UTF-8?q?=E7=95=99=E8=A7=A3=E6=9E=90=202.=E4=BF=AE=E6=94=B9=E9=99=A4808?=
=?UTF-8?q?=E6=9C=AC=E8=BA=AB=E7=9A=84=E4=BD=8D=E7=BD=AE=E9=99=84=E5=8A=A0?=
=?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=BD=BF=E7=94=A8JT808=5F0x0200=5FBodyBase?=
=?UTF-8?q?=E7=BB=A7=E6=89=BF=EF=BC=8C=E5=85=B6=E4=BD=99=E5=A4=96=E9=83=A8?=
=?UTF-8?q?=E4=BE=9D=E8=B5=96=E7=BB=9F=E4=B8=80=E4=BD=BF=E7=94=A8JT808=5F0?=
=?UTF-8?q?x0200=5FCustomBodyBase=E6=9D=A5=E5=A4=84=E7=90=86=EF=BC=8C?=
=?UTF-8?q?=E8=BF=99=E6=A0=B7=E5=8F=AF=E4=BB=A5=E4=BF=9D=E7=95=99=E8=87=AA?=
=?UTF-8?q?=E8=BA=AB808=E5=8D=8F=E8=AE=AE=E7=9A=84=E4=BF=9D=E7=95=99?=
=?UTF-8?q?=E7=BA=A6=E6=9D=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/Info.props | 2 +-
.../JT808_0x0200_0x64_Test.cs | 6 +++---
.../JT808_0x0200_0x65_Test.cs | 6 +++---
.../JT808_0x0200_0x66_Test.cs | 6 +++---
.../JT808_0x0200_0x67_Test.cs | 6 +++---
.../MessageBody/JT808_0x0200_0x64.cs | 2 +-
.../MessageBody/JT808_0x0200_0x65.cs | 2 +-
.../MessageBody/JT808_0x0200_0x66.cs | 2 +-
.../MessageBody/JT808_0x0200_0x67.cs | 2 +-
.../MessageBody/JT808_0x0200_0xF1.cs | 2 +-
.../MessageBody/JT808_0x0200_0xF2.cs | 2 +-
11 files changed, 19 insertions(+), 19 deletions(-)
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 @@
<PackageProjectUrl>https://github.com/SmallChi/JT808</PackageProjectUrl>
<licenseUrl>https://github.com/SmallChi/JT808/blob/master/LICENSE</licenseUrl>
<license>https://github.com/SmallChi/JT808/blob/master/LICENSE</license>
- <Version>2.4.6-preview1</Version>
+ <Version>2.4.6-preview2</Version>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<AnalysisLevel>latest</AnalysisLevel>
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<byte, JT808_0x0200_BodyBase>()
+ CustomLocationAttachData = new Dictionary<byte, JT808_0x0200_CustomBodyBase>()
};
- 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<JT808_0x0200>("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<byte, JT808_0x0200_BodyBase>()
+ CustomLocationAttachData = new Dictionary<byte, JT808_0x0200_CustomBodyBase>()
};
- 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<JT808_0x0200>("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<byte, JT808_0x0200_BodyBase>()
+ CustomLocationAttachData =new Dictionary<byte, JT808_0x0200_CustomBodyBase>()
};
- 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<JT808_0x0200>("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<byte, JT808_0x0200_BodyBase>()
+ CustomLocationAttachData =new Dictionary<byte, JT808_0x0200_CustomBodyBase>()
};
- 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<JT808_0x0200>("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
/// <summary>
/// 高级驾驶辅助系统报警信息
/// </summary>
- public class JT808_0x0200_0x64 : JT808_0x0200_BodyBase, IJT808MessagePackFormatter<JT808_0x0200_0x64>, IJT808Analyze,IJT808_2019_Version
+ public class JT808_0x0200_0x64 : JT808_0x0200_CustomBodyBase, IJT808MessagePackFormatter<JT808_0x0200_0x64>, IJT808Analyze,IJT808_2019_Version
{
/// <summary>
/// 高级驾驶辅助系统报警信息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
/// <summary>
/// 驾驶员状态监测系统报警信息
/// </summary>
- public class JT808_0x0200_0x65 : JT808_0x0200_BodyBase, IJT808MessagePackFormatter<JT808_0x0200_0x65>, IJT808Analyze, IJT808_2019_Version
+ public class JT808_0x0200_0x65 : JT808_0x0200_CustomBodyBase, IJT808MessagePackFormatter<JT808_0x0200_0x65>, IJT808Analyze, IJT808_2019_Version
{
/// <summary>
/// 驾驶员状态监测系统报警信息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
/// <summary>
/// 胎压监测系统报警信息
/// </summary>
- public class JT808_0x0200_0x66 : JT808_0x0200_BodyBase, IJT808MessagePackFormatter<JT808_0x0200_0x66>, IJT808Analyze, IJT808_2019_Version
+ public class JT808_0x0200_0x66 : JT808_0x0200_CustomBodyBase, IJT808MessagePackFormatter<JT808_0x0200_0x66>, IJT808Analyze, IJT808_2019_Version
{
/// <summary>
/// 胎压监测系统报警信息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
/// <summary>
/// 盲区监测系统报警信息
/// </summary>
- public class JT808_0x0200_0x67 : JT808_0x0200_BodyBase, IJT808MessagePackFormatter<JT808_0x0200_0x67>, IJT808Analyze, IJT808_2019_Version
+ public class JT808_0x0200_0x67 : JT808_0x0200_CustomBodyBase, IJT808MessagePackFormatter<JT808_0x0200_0x67>, IJT808Analyze, IJT808_2019_Version
{
/// <summary>
/// 盲区监测系统报警信息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
/// <summary>
/// 安装异常信息
/// </summary>
- public class JT808_0x0200_0xF1 : JT808_0x0200_BodyBase, IJT808MessagePackFormatter<JT808_0x0200_0xF1>, IJT808Analyze, IJT808_2019_Version
+ public class JT808_0x0200_0xF1 : JT808_0x0200_CustomBodyBase, IJT808MessagePackFormatter<JT808_0x0200_0xF1>, IJT808Analyze, IJT808_2019_Version
{
/// <summary>
/// 安装异常信息附件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
/// <summary>
/// 算法异常信息
/// </summary>
- public class JT808_0x0200_0xF2 : JT808_0x0200_BodyBase, IJT808MessagePackFormatter<JT808_0x0200_0xF2>, IJT808Analyze, IJT808_2019_Version
+ public class JT808_0x0200_0xF2 : JT808_0x0200_CustomBodyBase, IJT808MessagePackFormatter<JT808_0x0200_0xF2>, IJT808Analyze, IJT808_2019_Version
{
/// <summary>
/// 算法异常信息附件ID