diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml index 09a9091..7fff783 100755 --- a/.github/workflows/dotnetcore.yml +++ b/.github/workflows/dotnetcore.yml @@ -25,10 +25,10 @@ jobs: run: dotnet build ./src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078.Test/JT808.Protocol.Extensions.JT1078.Test.csproj - name: dotnet jt808_jt1078 test run: dotnet test ./src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078.Test/JT808.Protocol.Extensions.JT1078.Test.csproj - - name: dotnet jt808_jtas build - run: dotnet build ./src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety.Test/JT808.Protocol.Extensions.JTActiveSafety.Test.csproj - - name: dotnet jt808_jtas test - run: dotnet test ./src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety.Test/JT808.Protocol.Extensions.JTActiveSafety.Test.csproj + - name: dotnet jt808_subiao build + run: dotnet build ./src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao.Test/JT808.Protocol.Extensions.SuBiao.Test.csproj + - name: dotnet jt808_subiao test + run: dotnet test ./src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao.Test/JT808.Protocol.Extensions.SuBiao.Test.csproj - name: dotnet jt808_yuebiao build run: dotnet build ./src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.YueBiao.Test/JT808.Protocol.Extensions.YueBiao.Test.csproj - name: dotnet jt808_yuebiao test diff --git a/README.md b/README.md index dbef725..689a644 100644 --- a/README.md +++ b/README.md @@ -324,10 +324,10 @@ JT808Serializer DT2JT808Serializer = new JT808Serializer(DT2JT808Config); | Package Name| Version| Preview Version |Downloads|Remark| | --- | --- | --- | ---| --- | -| Install-Package JT808 | ![JT808](https://img.shields.io/nuget/v/JT808.svg) | ![JT808](https://img.shields.io/nuget/dt/JT808.svg) |![JT808](https://img.shields.io/nuget/vpre/JT808.svg)|JT808| -| Install-Package JT808.Protocol.Extensions.JT1078 | ![JT808.Protocol.Extensions.JT1078](https://img.shields.io/nuget/v/JT808.Protocol.Extensions.JT1078.svg) | ![JT808](https://img.shields.io/nuget/dt/JT808.Protocol.Extensions.JT1078.svg) |![JT808.Protocol.Extensions.JT1078](https://img.shields.io/nuget/vpre/JT808.Protocol.Extensions.JT1078.svg)|JT1078扩展JT808| -| Install-Package JT808.Protocol.Extensions.JTActiveSafety| ![JT808.Protocol.Extensions.JTActiveSafety](https://img.shields.io/nuget/v/JT808.Protocol.Extensions.JTActiveSafety.svg) | ![JT808](https://img.shields.io/nuget/dt/JT808.Protocol.Extensions.JTActiveSafety.svg) |![JT808.Protocol.Extensions.JTActiveSafety](https://img.shields.io/nuget/vpre/JT808.Protocol.Extensions.JTActiveSafety.svg)|主动安全（苏标）扩展JT808| -| Install-Package JT808.Protocol.Extensions.YueBiao| ![JT808.Protocol.Extensions.YueBiao](https://img.shields.io/nuget/v/JT808.Protocol.Extensions.YueBiao.svg) | ![JT808](https://img.shields.io/nuget/dt/JT808.Protocol.Extensions.YueBiao.svg) |![JT808.Protocol.Extensions.YueBiao](https://img.shields.io/nuget/vpre/JT808.Protocol.Extensions.YueBiao.svg)|粤标扩展JT808| +| Install-Package JT808 | ![JT808](https://img.shields.io/nuget/v/JT808.svg) | ![JT808](https://img.shields.io/nuget/vpre/JT808.svg)|![JT808](https://img.shields.io/nuget/dt/JT808.svg) |JT808| +| Install-Package JT808.Protocol.Extensions.JT1078 | ![JT808.Protocol.Extensions.JT1078](https://img.shields.io/nuget/v/JT808.Protocol.Extensions.JT1078.svg) | ![JT808.Protocol.Extensions.JT1078](https://img.shields.io/nuget/vpre/JT808.Protocol.Extensions.JT1078.svg)|![JT808](https://img.shields.io/nuget/dt/JT808.Protocol.Extensions.JT1078.svg) |JT1078扩展JT808| +| Install-Package JT808.Protocol.Extensions.SuBiao| ![JT808.Protocol.Extensions.SuBiao](https://img.shields.io/nuget/v/JT808.Protocol.Extensions.SuBiao.svg) | ![JT808.Protocol.Extensions.SuBiao](https://img.shields.io/nuget/vpre/JT808.Protocol.Extensions.SuBiao.svg)|![JT808](https://img.shields.io/nuget/dt/JT808.Protocol.Extensions.SuBiao.svg) |主动安全（苏标）扩展JT808| +| Install-Package JT808.Protocol.Extensions.YueBiao| ![JT808.Protocol.Extensions.YueBiao](https://img.shields.io/nuget/v/JT808.Protocol.Extensions.YueBiao.svg) | ![JT808.Protocol.Extensions.YueBiao](https://img.shields.io/nuget/vpre/JT808.Protocol.Extensions.YueBiao.svg)|![JT808](https://img.shields.io/nuget/dt/JT808.Protocol.Extensions.YueBiao.svg) |主动安全（粤标）扩展JT808| ## 使用BenchmarkDotNet性能测试报告（只是玩玩，不能当真） @@ -361,7 +361,7 @@ Platform=AnyCpu Server=False Toolchain=.NET Core 5.0 ## JT808终端通讯协议消息对照表 | 序号 | 消息ID | 完成情况 | 测试情况 | 消息体名称 |2019版本| -| :---: | :-----------: | :------: | :------: | :----------------------------: |:----------------------------:| +| :---: | :-----------: | :------: | :------: | :---------------------------- |:----------------------------:| | 1 | 0x0001 | √ | √ | 终端通用应答 | | 2 | 0x8001 | √ | √ | 平台通用应答 | | 3 | 0x0002 | √ | √ | 终端心跳 | @@ -441,7 +441,7 @@ Platform=AnyCpu Server=False Toolchain=.NET Core 5.0 ## JT1078扩展JT808议消息对照表 | 序号 | 消息ID | 完成情况 | 测试情况 | 消息体名称 | -| :---: | :-----------: | :------: | :------: | :----------------------------: | +| :---: | :-----------: | :------: | :------: | :---------------------------- | | 1 | 0x0200_0x14 | √ | √ | 视频相关报警 | | 2 | 0x0200_0x15 | √ | √ | 视频信号丢失报警状态 | | 3 | 0x0200_0x16 | √ | √ | 视频信号遮挡报警状态 | @@ -485,7 +485,7 @@ serviceDescriptors1.AddJT808Configure() ## 主动安全（苏标）扩展JT808协议消息对照表 | 序号 | 消息ID | 完成情况 | 测试情况 | 消息体名称 | -| :---: | :---: | :---: | :---: | :---:| +| :---: | :---: | :---: | :---: | :---| | 1 | 0x1210 | √ | √ | 报警附件信息消息 | | 2 | 0x1211 | √ | √ | 文件信息上传 | | 3 | 0x1212 | √ | √ | 文件上传完成消息 | @@ -511,13 +511,36 @@ serviceDescriptors1.AddJT808Configure() ```dotnet IServiceCollection serviceDescriptors1 = new ServiceCollection(); serviceDescriptors1.AddJT808Configure() - .AddJTActiveSafetyConfigure(); + .AddSuBiaoConfigure(); ``` -## 粤标扩展JT808协议消息对照表 +## 主动安全（粤标）扩展JT808协议消息对照表 + +> 注意：基于JT/T808 2019版本 | 序号 | 消息ID | 完成情况 | 测试情况 | 消息体名称 | -| :---: | :---: | :---: | :---: | :---:| +| :---: | :---: | :---: | :---: | :---| +| 1 | 0x1210 | √ | × | 报警附件信息消息 | +| 2 | 0x1211 | √ | × | 文件信息上传 | +| 3 | 0x1212 | √ | × | 文件上传完成消息 | +| 4 | 0x9208 | √ | × | 报警附件上传指令 | +| 5 | 0x9212 | √ | × | 文件上传完成消息应答 | +| 6 | 0x1FC4 | √ | × | 终端升级进度上报 | +| 7 | 0x0200_0x64 | √ | × | 高级驾驶辅助系统报警信息 | +| 8 | 0x0200_0x65 | √ | × | 驾驶员状态监测系统报警信息 | +| 9 | 0x0200_0x66 | √ | × | 胎压监测系统报警信息 | +| 10 | 0x0200_0x67 | √ | × | 盲区监测系统报警信息 | +| 11 | 0x8103_0xF364 | √ | × | 高级驾驶辅助系统参数 | +| 12 | 0x8103_0xF365 | √ | × | 驾驶员状态监测系统参数 | +| 13 | 0x8103_0xF366 | √ | × | 胎压监测系统参数 | +| 14 | 0x8103_0xF367 | √ | × | 盲区监测系统参数 | +| 15 | 0x8103_0xF370 | √ | × | 智能视频协议版本信息 | +| 16 | 0x0900 | √ | × | 上传基本信息 | +| 17 | 0x0900_0xF7 | √ | × | 外设工作状态 | +| 18 | 0x0900_0xF8 | √ | × | 外设系统信息 | +| 19 | 0x8900 | √ | × | 查询基本信息 | +| 20 | 0x8900_0xF7 | √ | × | 外设工作状态 | +| 21 | 0x8900_0xF8 | √ | × | 外设系统信息 | ## 使用方法 diff --git a/publish.bat b/publish.bat index b80f4a9..0900f92 100644 --- a/publish.bat +++ b/publish.bat @@ -1,6 +1,6 @@ dotnet pack .\src\JT808.Protocol\JT808.Protocol.csproj -c Release --output nupkgs dotnet pack .\src\JT808.Protocol.Extensions\JT808.Protocol.Extensions.JT1078\JT808.Protocol.Extensions.JT1078.csproj -c Release --output nupkgs -dotnet pack .\src\JT808.Protocol.Extensions\JT808.Protocol.Extensions.JTActiveSafety\JT808.Protocol.Extensions.JTActiveSafety.csproj -c Release --output nupkgs +dotnet pack .\src\JT808.Protocol.Extensions\JT808.Protocol.Extensions.SuBiao\JT808.Protocol.Extensions.SuBiao.csproj -c Release --output nupkgs dotnet pack .\src\JT808.Protocol.Extensions\JT808.Protocol.Extensions.YueBiao\JT808.Protocol.Extensions.YueBiao.csproj -c Release --output nupkgs pause \ No newline at end of file diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/JT808.Protocol.Extensions.JT1078.xml b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/JT808.Protocol.Extensions.JT1078.xml index f0b724e..ade6f5b 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/JT808.Protocol.Extensions.JT1078.xml +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/JT808.Protocol.Extensions.JT1078.xml @@ -227,6 +227,11 @@ 0x0200_0x14 + + + + + 数据 长度 @@ -238,12 +243,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + 视频信号丢失报警状态 0x0200_0x15 + + + + + 数据 长度 @@ -254,12 +288,41 @@ 视频信号丢失报警状态 + + + + + + + + + + + + + + + + + + + + + + + + 视频信号遮挡报警状态 0x0200_0x16 + + + + + 数据 长度 @@ -270,12 +333,41 @@ 视频信号遮挡报警状态 + + + + + + + + + + + + + + + + + + + + + + + + 存储器故障报警状态 0x0200_0x17 + + + + + 数据 长度 @@ -286,12 +378,41 @@ 存储器故障报警状态 + + + + + + + + + + + + + + + + + + + + + + + + 异常驾驶行为报警详细描述 0x0200_0x18 + + + + + 数据 长度 @@ -307,6 +428,30 @@ 疲劳程度 + + + + + + + + + + + + + + + + + + + + + + + + 终端上传音视频属性 @@ -357,11 +502,55 @@ 终端支持的最大视频物理通道数量 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 终端上传乘客流量 + + + + + + + + + + 起始时间 @@ -382,11 +571,45 @@ 下车人数 + + + + + + + + + + + + + + + + + + + + + + + + 终端上传音视频资源列表 + + + + + + + + + + 流水号 @@ -402,6 +625,30 @@ 音视频资源列表 + + + + + + + + + + + + + + + + + + + + + + + + 终端上传音视频资源列表 @@ -447,11 +694,45 @@ 文件大小 + + + + + + + + + + + + + + + + + + + + + + + + 文件上传完成通知 + + + + + + + + + + 流水号 @@ -462,12 +743,41 @@ 结果 + + + + + + + + + + + + + + + + + + + + + + + + 音视频参数设置 0x8103_0x0075 + + + + + 数据 长度 @@ -539,12 +849,41 @@ 1：启用 + + + + + + + + + + + + + + + + + + + + + + + + 音视频通道列表设置 0x8103_0x0076 + + + + + 数据 长度 @@ -574,6 +913,30 @@ 4*(l+m+n) + + + + + + + + + + + + + + + + + + + + + + + + 音视频通道列表设置 @@ -600,12 +963,41 @@ 是否链接云台 + + + + + + + + + + + + + + + + + + + + + + + + 单独视频通道参数设置 0x8103_0x0077 + + + + + 数据 长度 @@ -616,6 +1008,40 @@ 需单独设置视频参数的通道数量 用n表示 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 逻辑通道号 @@ -680,12 +1106,41 @@ OSD字幕叠加设置 + + + + + + + + + + + + + + + + + + + + + + + + 特殊报警录像参数设置 0x8103_0x0079 + + + + + 数据 长度 @@ -707,12 +1162,41 @@ 分钟min + + + + + + + + + + + + + + + + + + + + + + + + 视频相关报警屏蔽字 0x8103_0x007A + + + + + 数据 长度 @@ -723,12 +1207,41 @@ 视频相关屏蔽报警字 + + + + + + + + + + + + + + + + + + + + + + + + 图像分析报警参数设置 0x8103_0x007B + + + + + 数据 长度 @@ -744,12 +1257,41 @@ 疲劳程度阈值 + + + + + + + + + + + + + + + + + + + + + + + + 终端休眠模式唤醒设置 0x8103_0x007C + + + + + 数据 长度 @@ -775,6 +1317,30 @@ 日定时唤醒参数列表 + + + + + + + + + + + + + + + + + + + + + + + + 终端休眠模式唤醒设置 @@ -834,6 +1400,30 @@ 2 + + + + + + + + + + + + + + + + + + + + + + + + 查询终端音视频属性 diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x0200_0x14.cs b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x0200_0x14.cs index b06c751..07f94de 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x0200_0x14.cs +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x0200_0x14.cs @@ -14,6 +14,9 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody /// public class JT808_0x0200_0x14 : JT808_0x0200_BodyBase, IJT808MessagePackFormatter,IJT808Analyze { + /// + /// + /// public override byte AttachInfoId { get; set; } = 0x14; /// /// 数据 长度 @@ -24,7 +27,12 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody /// /// public uint VideoRelateAlarm { get; set; } - + /// + /// + /// + /// + /// + /// public void Analyze(ref JT808MessagePackReader reader, Utf8JsonWriter writer, IJT808Config config) { JT808_0x0200_0x14 value = new JT808_0x0200_0x14(); @@ -45,7 +53,12 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody writer.WriteEndArray(); } } - + /// + /// + /// + /// + /// + /// public JT808_0x0200_0x14 Deserialize(ref JT808MessagePackReader reader, IJT808Config config) { JT808_0x0200_0x14 value = new JT808_0x0200_0x14(); @@ -54,7 +67,12 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody value.VideoRelateAlarm = reader.ReadUInt32(); return value; } - + /// + /// + /// + /// + /// + /// public void Serialize(ref JT808MessagePackWriter writer, JT808_0x0200_0x14 value, IJT808Config config) { writer.WriteByte(value.AttachInfoId); diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x0200_0x15.cs b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x0200_0x15.cs index db886b9..00e1eb0 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x0200_0x15.cs +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x0200_0x15.cs @@ -13,6 +13,9 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody /// public class JT808_0x0200_0x15 : JT808_0x0200_BodyBase, IJT808MessagePackFormatter, IJT808Analyze { + /// + /// + /// public override byte AttachInfoId { get; set; } = 0x15; /// /// 数据 长度 @@ -22,7 +25,12 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody /// 视频信号丢失报警状态 /// public uint VideoSignalLoseAlarmStatus { get; set; } - + /// + /// + /// + /// + /// + /// public void Analyze(ref JT808MessagePackReader reader, Utf8JsonWriter writer, IJT808Config config) { JT808_0x0200_0x15 value = new JT808_0x0200_0x15(); @@ -49,7 +57,12 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody } writer.WriteEndArray(); } - + /// + /// + /// + /// + /// + /// public JT808_0x0200_0x15 Deserialize(ref JT808MessagePackReader reader, IJT808Config config) { JT808_0x0200_0x15 value = new JT808_0x0200_0x15(); @@ -58,7 +71,12 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody value.VideoSignalLoseAlarmStatus = reader.ReadUInt32(); return value; } - + /// + /// + /// + /// + /// + /// public void Serialize(ref JT808MessagePackWriter writer, JT808_0x0200_0x15 value, IJT808Config config) { writer.WriteByte(value.AttachInfoId); diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x0200_0x16.cs b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x0200_0x16.cs index 5602d06..0989f42 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x0200_0x16.cs +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x0200_0x16.cs @@ -13,6 +13,9 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody /// public class JT808_0x0200_0x16 : JT808_0x0200_BodyBase, IJT808MessagePackFormatter, IJT808Analyze { + /// + /// + /// public override byte AttachInfoId { get; set; } = 0x16; /// /// 数据 长度 @@ -22,7 +25,12 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody /// 视频信号遮挡报警状态 /// public uint VideoSignalOcclusionAlarmStatus { get; set; } - + /// + /// + /// + /// + /// + /// public void Analyze(ref JT808MessagePackReader reader, Utf8JsonWriter writer, IJT808Config config) { JT808_0x0200_0x16 value = new JT808_0x0200_0x16(); @@ -49,7 +57,12 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody } writer.WriteEndArray(); } - + /// + /// + /// + /// + /// + /// public JT808_0x0200_0x16 Deserialize(ref JT808MessagePackReader reader, IJT808Config config) { JT808_0x0200_0x16 value = new JT808_0x0200_0x16(); @@ -58,7 +71,12 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody value.VideoSignalOcclusionAlarmStatus = reader.ReadUInt32(); return value; } - + /// + /// + /// + /// + /// + /// public void Serialize(ref JT808MessagePackWriter writer, JT808_0x0200_0x16 value, IJT808Config config) { writer.WriteByte(value.AttachInfoId); diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x0200_0x17.cs b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x0200_0x17.cs index 373b8b9..5183308 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x0200_0x17.cs +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x0200_0x17.cs @@ -13,6 +13,9 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody /// public class JT808_0x0200_0x17 : JT808_0x0200_BodyBase, IJT808MessagePackFormatter, IJT808Analyze { + /// + /// + /// public override byte AttachInfoId { get; set; } = 0x17; /// /// 数据 长度 @@ -22,7 +25,12 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody /// 存储器故障报警状态 /// public ushort StorageFaultAlarmStatus{ get; set; } - + /// + /// + /// + /// + /// + /// public void Analyze(ref JT808MessagePackReader reader, Utf8JsonWriter writer, IJT808Config config) { JT808_0x0200_0x17 value = new JT808_0x0200_0x17(); @@ -63,7 +71,12 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody } writer.WriteEndArray(); } - + /// + /// + /// + /// + /// + /// public JT808_0x0200_0x17 Deserialize(ref JT808MessagePackReader reader, IJT808Config config) { JT808_0x0200_0x17 value = new JT808_0x0200_0x17(); @@ -72,7 +85,12 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody value.StorageFaultAlarmStatus = reader.ReadUInt16(); return value; } - + /// + /// + /// + /// + /// + /// public void Serialize(ref JT808MessagePackWriter writer, JT808_0x0200_0x17 value, IJT808Config config) { writer.WriteByte(value.AttachInfoId); diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x0200_0x18.cs b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x0200_0x18.cs index a71c553..8a203e3 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x0200_0x18.cs +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x0200_0x18.cs @@ -13,6 +13,9 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody /// public class JT808_0x0200_0x18 : JT808_0x0200_BodyBase, IJT808MessagePackFormatter, IJT808Analyze { + /// + /// + /// public override byte AttachInfoId { get; set; } = 0x18; /// /// 数据 长度 @@ -26,7 +29,12 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody /// 疲劳程度 /// public byte FatigueLevel { get; set; } - + /// + /// + /// + /// + /// + /// public void Analyze(ref JT808MessagePackReader reader, Utf8JsonWriter writer, IJT808Config config) { JT808_0x0200_0x18 value = new JT808_0x0200_0x18(); @@ -68,7 +76,12 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody value.FatigueLevel = reader.ReadByte(); writer.WriteNumber($"[{value.FatigueLevel.ReadNumber()}]疲劳程度", value.FatigueLevel); } - + /// + /// + /// + /// + /// + /// public JT808_0x0200_0x18 Deserialize(ref JT808MessagePackReader reader, IJT808Config config) { JT808_0x0200_0x18 value = new JT808_0x0200_0x18(); @@ -78,7 +91,12 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody value.FatigueLevel = reader.ReadByte(); return value; } - + /// + /// + /// + /// + /// + /// public void Serialize(ref JT808MessagePackWriter writer, JT808_0x0200_0x18 value, IJT808Config config) { writer.WriteByte(value.AttachInfoId); diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x1003.cs b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x1003.cs index 165c6cc..5bf0731 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x1003.cs +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x1003.cs @@ -49,11 +49,20 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody /// 终端支持的最大视频物理通道数量 /// public byte TerminalSupportedMaxNumberOfVideoPhysicalChannels { get; set; } - + /// + /// + /// public override ushort MsgId => 0x1003; - + /// + /// + /// public override string Description => "终端上传音视频属性"; - + /// + /// + /// + /// + /// + /// public void Analyze(ref JT808MessagePackReader reader, Utf8JsonWriter writer, IJT808Config config) { JT808_0x1003 value = new JT808_0x1003(); @@ -127,7 +136,12 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody return "未知"; } } - + /// + /// + /// + /// + /// + /// public JT808_0x1003 Deserialize(ref JT808MessagePackReader reader, IJT808Config config) { JT808_0x1003 jT808_0x1003 = new JT808_0x1003(); @@ -142,7 +156,12 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody jT808_0x1003.TerminalSupportedMaxNumberOfVideoPhysicalChannels = reader.ReadByte(); return jT808_0x1003; } - + /// + /// + /// + /// + /// + /// public void Serialize(ref JT808MessagePackWriter writer, JT808_0x1003 value, IJT808Config config) { writer.WriteByte(value.EnterAudioEncoding); diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x1005.cs b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x1005.cs index 48bfc00..a8889ff 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x1005.cs +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x1005.cs @@ -13,7 +13,13 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody /// public class JT808_0x1005 : JT808Bodies, IJT808MessagePackFormatter, IJT808Analyze { + /// + /// + /// public override string Description => "终端上传乘客流量"; + /// + /// + /// public override ushort MsgId => 0x1005; /// /// 起始时间 @@ -31,7 +37,12 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody /// 下车人数 /// public ushort GettingOffNumber { get; set; } - + /// + /// + /// + /// + /// + /// public void Analyze(ref JT808MessagePackReader reader, Utf8JsonWriter writer, IJT808Config config) { JT808_0x1005 value = new JT808_0x1005(); @@ -44,7 +55,12 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody value.GettingOffNumber = reader.ReadUInt16(); writer.WriteNumber($"[{value.GettingOffNumber.ReadNumber()}]从开始时间到结束时间的下车人数", value.GettingOffNumber); } - + /// + /// + /// + /// + /// + /// public JT808_0x1005 Deserialize(ref JT808MessagePackReader reader, IJT808Config config) { JT808_0x1005 jT808_0x1005 = new JT808_0x1005(); @@ -54,7 +70,12 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody jT808_0x1005.GettingOffNumber = reader.ReadUInt16(); return jT808_0x1005; } - + /// + /// + /// + /// + /// + /// public void Serialize(ref JT808MessagePackWriter writer, JT808_0x1005 value, IJT808Config config) { writer.WriteDateTime6(value.BeginTime); diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x1205.cs b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x1205.cs index 47a4df5..1130fbe 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x1205.cs +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x1205.cs @@ -14,7 +14,13 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody /// public class JT808_0x1205 : JT808Bodies, IJT808MessagePackFormatter, IJT808Analyze { + /// + /// + /// public override string Description => "终端上传音视频资源列表"; + /// + /// + /// public override ushort MsgId => 0x1205; /// /// 流水号 @@ -28,7 +34,12 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody /// 音视频资源列表 /// public List AVResouces { get; set; } - + /// + /// + /// + /// + /// + /// public void Analyze(ref JT808MessagePackReader reader, Utf8JsonWriter writer, IJT808Config config) { JT808_0x1205 value = new JT808_0x1205(); @@ -46,7 +57,12 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody } writer.WriteEndArray(); } - + /// + /// + /// + /// + /// + /// public JT808_0x1205 Deserialize(ref JT808MessagePackReader reader, IJT808Config config) { JT808_0x1205 jT808_0x1205 = new JT808_0x1205(); @@ -64,7 +80,12 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody } return jT808_0x1205; } - + /// + /// + /// + /// + /// + /// public void Serialize(ref JT808MessagePackWriter writer, JT808_0x1205 value, IJT808Config config) { writer.WriteUInt16(value.MsgNum); diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x1205_AVResouce.cs b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x1205_AVResouce.cs index 9dec3df..0c7b704 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x1205_AVResouce.cs +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x1205_AVResouce.cs @@ -45,7 +45,12 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody /// 文件大小 /// public uint FileSize { get; set; } - + /// + /// + /// + /// + /// + /// public void Analyze(ref JT808MessagePackReader reader, Utf8JsonWriter writer, IJT808Config config) { JT808_0x1205_AVResouce value = new JT808_0x1205_AVResouce(); @@ -141,7 +146,12 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody } } } - + /// + /// + /// + /// + /// + /// public JT808_0x1205_AVResouce Deserialize(ref JT808MessagePackReader reader, IJT808Config config) { JT808_0x1205_AVResouce jT808_0x1205_AVResouce = new JT808_0x1205_AVResouce(); @@ -155,7 +165,12 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody jT808_0x1205_AVResouce.FileSize = reader.ReadUInt32(); return jT808_0x1205_AVResouce; } - + /// + /// + /// + /// + /// + /// public void Serialize(ref JT808MessagePackWriter writer, JT808_0x1205_AVResouce value, IJT808Config config) { writer.WriteByte(value.LogicChannelNo); diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x1206.cs b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x1206.cs index 9a761c1..b047c6b 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x1206.cs +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x1206.cs @@ -13,7 +13,13 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody /// public class JT808_0x1206 : JT808Bodies, IJT808MessagePackFormatter, IJT808Analyze { + /// + /// + /// public override string Description => "文件上传完成通知"; + /// + /// + /// public override ushort MsgId => 0x1206; /// /// 流水号 @@ -23,7 +29,12 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody /// 结果 /// public byte Result{ get; set; } - + /// + /// + /// + /// + /// + /// public void Analyze(ref JT808MessagePackReader reader, Utf8JsonWriter writer, IJT808Config config) { JT808_0x1206 value = new JT808_0x1206(); @@ -43,7 +54,12 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody } } } - + /// + /// + /// + /// + /// + /// public JT808_0x1206 Deserialize(ref JT808MessagePackReader reader, IJT808Config config) { JT808_0x1206 jT808_0x1206 = new JT808_0x1206(); @@ -51,7 +67,12 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody jT808_0x1206.Result = reader.ReadByte(); return jT808_0x1206; } - + /// + /// + /// + /// + /// + /// public void Serialize(ref JT808MessagePackWriter writer, JT808_0x1206 value, IJT808Config config) { writer.WriteUInt16(value.MsgNum); diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x8103_0x0075.cs b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x8103_0x0075.cs index 4a4633d..a3c228c 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x8103_0x0075.cs +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x8103_0x0075.cs @@ -13,6 +13,9 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody /// public class JT808_0x8103_0x0075 : JT808_0x8103_BodyBase, IJT808MessagePackFormatter, IJT808Analyze { + /// + /// + /// public override uint ParamId { get; set; } = 0x0075; /// /// 数据 长度 @@ -72,7 +75,12 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody ///1：启用 /// public byte AudioOutputEnabled { get; set; } - + /// + /// + /// + /// + /// + /// public void Analyze(ref JT808MessagePackReader reader, Utf8JsonWriter writer, IJT808Config config) { JT808_0x8103_0x0075 value = new JT808_0x8103_0x0075(); @@ -187,10 +195,15 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody obdDisplay += ((OBD >> 4 & 0x0001) == 1) ? ",行驶记录速度" : ""; obdDisplay += ((OBD >> 5 & 0x0001) == 1) ? ",卫星定位速度" : ""; obdDisplay += ((OBD >> 6 & 0x0001) == 1) ? ",连续驾驶时间" : ""; - return obdDisplay.Length>0? obdDisplay.Substring(1):""; + return obdDisplay.Length > 0 ? obdDisplay.Substring(1) : ""; } } - + /// + /// + /// + /// + /// + /// public JT808_0x8103_0x0075 Deserialize(ref JT808MessagePackReader reader, IJT808Config config) { JT808_0x8103_0x0075 jT808_0X8103_0X0075 = new JT808_0x8103_0x0075(); @@ -210,7 +223,12 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody jT808_0X8103_0X0075.AudioOutputEnabled = reader.ReadByte(); return jT808_0X8103_0X0075; } - + /// + /// + /// + /// + /// + /// public void Serialize(ref JT808MessagePackWriter writer, JT808_0x8103_0x0075 value, IJT808Config config) { writer.WriteUInt32(value.ParamId); diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x8103_0x0076.cs b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x8103_0x0076.cs index 2681c49..e92ffb5 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x8103_0x0076.cs +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x8103_0x0076.cs @@ -14,6 +14,9 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody /// public class JT808_0x8103_0x0076 : JT808_0x8103_BodyBase, IJT808MessagePackFormatter, IJT808Analyze { + /// + /// + /// public override uint ParamId { get; set; } = 0x0076; /// /// 数据 长度 @@ -39,7 +42,12 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody /// 4*(l+m+n) /// public List AVChannelRefTables { get; set; } - + /// + /// + /// + /// + /// + /// public void Analyze(ref JT808MessagePackReader reader, Utf8JsonWriter writer, IJT808Config config) { JT808_0x8103_0x0076 value = new JT808_0x8103_0x0076(); @@ -65,7 +73,12 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody } writer.WriteEndArray(); } - + /// + /// + /// + /// + /// + /// public JT808_0x8103_0x0076 Deserialize(ref JT808MessagePackReader reader, IJT808Config config) { JT808_0x8103_0x0076 jT808_0X8103_0X0076 = new JT808_0x8103_0x0076(); @@ -86,7 +99,12 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody } return jT808_0X8103_0X0076; } - + /// + /// + /// + /// + /// + /// public void Serialize(ref JT808MessagePackWriter writer, JT808_0x8103_0x0076 value, IJT808Config config) { writer.WriteUInt32(value.ParamId); diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x8103_0x0076_AVChannelRefTable.cs b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x8103_0x0076_AVChannelRefTable.cs index 92e9186..b25f1ca 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x8103_0x0076_AVChannelRefTable.cs +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x8103_0x0076_AVChannelRefTable.cs @@ -27,7 +27,12 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody /// 是否链接云台 /// public byte IsConnectCloudPlat { get; set; } - + /// + /// + /// + /// + /// + /// public void Analyze(ref JT808MessagePackReader reader, Utf8JsonWriter writer, IJT808Config config) { JT808_0x8103_0x0076_AVChannelRefTable value = new JT808_0x8103_0x0076_AVChannelRefTable(); @@ -102,7 +107,12 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody } } } - + /// + /// + /// + /// + /// + /// public JT808_0x8103_0x0076_AVChannelRefTable Deserialize(ref JT808MessagePackReader reader, IJT808Config config) { JT808_0x8103_0x0076_AVChannelRefTable jT808_0X8103_0X0076_AVChannelRefTable = new JT808_0x8103_0x0076_AVChannelRefTable(); @@ -112,7 +122,12 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody jT808_0X8103_0X0076_AVChannelRefTable.IsConnectCloudPlat = reader.ReadByte(); return jT808_0X8103_0X0076_AVChannelRefTable; } - + /// + /// + /// + /// + /// + /// public void Serialize(ref JT808MessagePackWriter writer, JT808_0x8103_0x0076_AVChannelRefTable value, IJT808Config config) { writer.WriteByte(value.PhysicalChannelNo); diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x8103_0x0077.cs b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x8103_0x0077.cs index 06ba2e8..666bb65 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x8103_0x0077.cs +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x8103_0x0077.cs @@ -14,6 +14,9 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody /// public class JT808_0x8103_0x0077 : JT808_0x8103_BodyBase, IJT808MessagePackFormatter, IJT808Analyze { + /// + /// + /// public override uint ParamId { get; set; } = 0x0077; /// /// 数据 长度 @@ -23,9 +26,16 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody /// 需单独设置视频参数的通道数量 用n表示 /// public byte NeedSetChannelTotal { get; set; } - + /// + /// + /// public List SignalChannels { get; set; } - + /// + /// + /// + /// + /// + /// public void Analyze(ref JT808MessagePackReader reader, Utf8JsonWriter writer, IJT808Config config) { JT808_0x8103_0x0077 value = new JT808_0x8103_0x0077(); @@ -45,7 +55,12 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody } writer.WriteEndArray(); } - + /// + /// + /// + /// + /// + /// public JT808_0x8103_0x0077 Deserialize(ref JT808MessagePackReader reader, IJT808Config config) { JT808_0x8103_0x0077 jT808_0X8103_0X0077 = new JT808_0x8103_0x0077(); @@ -63,7 +78,12 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody } return jT808_0X8103_0X0077; } - + /// + /// + /// + /// + /// + /// public void Serialize(ref JT808MessagePackWriter writer, JT808_0x8103_0x0077 value, IJT808Config config) { writer.WriteUInt32(value.ParamId); diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x8103_0x0077_SignalChannel.cs b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x8103_0x0077_SignalChannel.cs index a02c570..596fadd 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x8103_0x0077_SignalChannel.cs +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x8103_0x0077_SignalChannel.cs @@ -8,6 +8,9 @@ using System.Text.Json; namespace JT808.Protocol.Extensions.JT1078.MessageBody { + /// + /// + /// public class JT808_0x8103_0x0077_SignalChannel: IJT808MessagePackFormatter, IJT808Analyze { /// @@ -62,7 +65,12 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody ///OSD字幕叠加设置 /// public ushort OSD { get; set; } - + /// + /// + /// + /// + /// + /// public void Analyze(ref JT808MessagePackReader reader, Utf8JsonWriter writer, IJT808Config config) { JT808_0x8103_0x0077_SignalChannel value = new JT808_0x8103_0x0077_SignalChannel(); @@ -219,7 +227,12 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody return obdDisplay.Length > 0 ? obdDisplay.Substring(1) : ""; } } - + /// + /// + /// + /// + /// + /// public JT808_0x8103_0x0077_SignalChannel Deserialize(ref JT808MessagePackReader reader, IJT808Config config) { JT808_0x8103_0x0077_SignalChannel jT808_0X8103_0X0077_SignalChannel = new JT808_0x8103_0x0077_SignalChannel(); @@ -237,7 +250,12 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody jT808_0X8103_0X0077_SignalChannel.OSD = reader.ReadUInt16(); return jT808_0X8103_0X0077_SignalChannel; } - + /// + /// + /// + /// + /// + /// public void Serialize(ref JT808MessagePackWriter writer, JT808_0x8103_0x0077_SignalChannel value, IJT808Config config) { writer.WriteByte(value.LogicChannelNo); diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x8103_0x0079.cs b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x8103_0x0079.cs index 3df22d9..cace817 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x8103_0x0079.cs +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x8103_0x0079.cs @@ -13,6 +13,9 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody /// public class JT808_0x8103_0x0079 : JT808_0x8103_BodyBase, IJT808MessagePackFormatter, IJT808Analyze { + /// + /// + /// public override uint ParamId { get; set; } = 0x0079; /// /// 数据 长度 @@ -31,7 +34,12 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody /// 分钟min /// public byte BeginMinute { get; set; } - + /// + /// + /// + /// + /// + /// public void Analyze(ref JT808MessagePackReader reader, Utf8JsonWriter writer, IJT808Config config) { JT808_0x8103_0x0079 value = new JT808_0x8103_0x0079(); @@ -46,7 +54,12 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody value.BeginMinute = reader.ReadByte(); writer.WriteNumber($"[{value.BeginMinute.ReadNumber()}]特殊报警标识起始时间（分钟）", value.BeginMinute); } - + /// + /// + /// + /// + /// + /// public JT808_0x8103_0x0079 Deserialize(ref JT808MessagePackReader reader, IJT808Config config) { JT808_0x8103_0x0079 jT808_0x8103_0x0079 = new JT808_0x8103_0x0079(); @@ -57,7 +70,12 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody jT808_0x8103_0x0079.BeginMinute = reader.ReadByte(); return jT808_0x8103_0x0079; } - + /// + /// + /// + /// + /// + /// public void Serialize(ref JT808MessagePackWriter writer, JT808_0x8103_0x0079 value, IJT808Config config) { writer.WriteUInt32(value.ParamId); diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x8103_0x007A.cs b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x8103_0x007A.cs index 0a8884a..6af3330 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x8103_0x007A.cs +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x8103_0x007A.cs @@ -13,6 +13,9 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody /// public class JT808_0x8103_0x007A : JT808_0x8103_BodyBase, IJT808MessagePackFormatter, IJT808Analyze { + /// + /// + /// public override uint ParamId { get; set; } = 0x007A; /// /// 数据 长度 @@ -22,7 +25,12 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody /// 视频相关屏蔽报警字 /// public uint AlarmShielding { get; set; } - + /// + /// + /// + /// + /// + /// public void Analyze(ref JT808MessagePackReader reader, Utf8JsonWriter writer, IJT808Config config) { JT808_0x8103_0x007A value = new JT808_0x8103_0x007A(); @@ -52,7 +60,12 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody return "未知"; } } - + /// + /// + /// + /// + /// + /// public JT808_0x8103_0x007A Deserialize(ref JT808MessagePackReader reader, IJT808Config config) { JT808_0x8103_0x007A jT808_0x8103_0x007A = new JT808_0x8103_0x007A(); @@ -61,7 +74,12 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody jT808_0x8103_0x007A.AlarmShielding = reader.ReadUInt32(); return jT808_0x8103_0x007A; } - + /// + /// + /// + /// + /// + /// public void Serialize(ref JT808MessagePackWriter writer, JT808_0x8103_0x007A value, IJT808Config config) { writer.WriteUInt32(value.ParamId); diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x8103_0x007B.cs b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x8103_0x007B.cs index 56308e3..3a1f996 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x8103_0x007B.cs +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x8103_0x007B.cs @@ -13,6 +13,9 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody /// public class JT808_0x8103_0x007B : JT808_0x8103_BodyBase, IJT808MessagePackFormatter, IJT808Analyze { + /// + /// + /// public override uint ParamId { get; set; } = 0x007B; /// /// 数据 长度 @@ -26,7 +29,12 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody /// 疲劳程度阈值 /// public byte FatigueThreshold { get; set; } - + /// + /// + /// + /// + /// + /// public void Analyze(ref JT808MessagePackReader reader, Utf8JsonWriter writer, IJT808Config config) { JT808_0x8103_0x007B value = new JT808_0x8103_0x007B(); @@ -39,7 +47,12 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody value.FatigueThreshold = reader.ReadByte(); writer.WriteNumber($"[{value.FatigueThreshold.ReadNumber()}]疲劳程度阈值", value.FatigueThreshold); } - + /// + /// + /// + /// + /// + /// public JT808_0x8103_0x007B Deserialize(ref JT808MessagePackReader reader, IJT808Config config) { JT808_0x8103_0x007B jT808_0x8103_0x007B = new JT808_0x8103_0x007B(); @@ -49,7 +62,12 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody jT808_0x8103_0x007B.FatigueThreshold = reader.ReadByte(); return jT808_0x8103_0x007B; } - + /// + /// + /// + /// + /// + /// public void Serialize(ref JT808MessagePackWriter writer, JT808_0x8103_0x007B value, IJT808Config config) { writer.WriteUInt32(value.ParamId); diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x8103_0x007C.cs b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x8103_0x007C.cs index efd7070..676354c 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x8103_0x007C.cs +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x8103_0x007C.cs @@ -13,6 +13,9 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody /// public class JT808_0x8103_0x007C : JT808_0x8103_BodyBase, IJT808MessagePackFormatter, IJT808Analyze { + /// + /// + /// public override uint ParamId { get; set; } = 0x007C; /// /// 数据 长度 @@ -34,7 +37,12 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody /// 日定时唤醒参数列表 /// public JT808_0x8103_0x007C_TimerWakeDayParamter TimerWakeDayParamter { get; set; } - + /// + /// + /// + /// + /// + /// public void Analyze(ref JT808MessagePackReader reader, Utf8JsonWriter writer, IJT808Config config) { JT808_0x8103_0x007C value = new JT808_0x8103_0x007C(); @@ -79,7 +87,12 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody return timerWakeDaySetDisplay.Length>0? timerWakeDaySetDisplay.Substring(1):""; } } - + /// + /// + /// + /// + /// + /// public JT808_0x8103_0x007C Deserialize(ref JT808MessagePackReader reader, IJT808Config config) { JT808_0x8103_0x007C jT808_0x8103_0x007C = new JT808_0x8103_0x007C(); @@ -91,7 +104,12 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody jT808_0x8103_0x007C.TimerWakeDayParamter = config.GetMessagePackFormatter().Deserialize(ref reader, config); return jT808_0x8103_0x007C; } - + /// + /// + /// + /// + /// + /// public void Serialize(ref JT808MessagePackWriter writer, JT808_0x8103_0x007C value, IJT808Config config) { writer.WriteUInt32(value.ParamId); diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x8103_0x007C_TimerWakeDayParamter.cs b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x8103_0x007C_TimerWakeDayParamter.cs index ab60bb7..f6fdb89 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x8103_0x007C_TimerWakeDayParamter.cs +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x8103_0x007C_TimerWakeDayParamter.cs @@ -57,7 +57,12 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody /// 2 /// public string TimePeriod4CloseTime { get; set; } - + /// + /// + /// + /// + /// + /// public void Analyze(ref JT808MessagePackReader reader, Utf8JsonWriter writer, IJT808Config config) { JT808_0x8103_0x007C_TimerWakeDayParamter value = new JT808_0x8103_0x007C_TimerWakeDayParamter(); @@ -82,13 +87,18 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody string TimerWakeEnableFlagDisplay(byte TimerWakeEnableFlag) { string timerWakeEnableFlagDisplay = string.Empty; timerWakeEnableFlagDisplay += (TimerWakeEnableFlag & 0x01) == 1 ? ",时间段1唤醒时间启用" : ""; - timerWakeEnableFlagDisplay += (TimerWakeEnableFlag & 0x01) == 1 ? ",时间段2唤醒时间启用" : ""; - timerWakeEnableFlagDisplay += (TimerWakeEnableFlag & 0x01) == 1 ? ",时间段3唤醒时间启用" : ""; - timerWakeEnableFlagDisplay += (TimerWakeEnableFlag & 0x01) == 1 ? ",时间段4唤醒时间启用" : ""; + timerWakeEnableFlagDisplay += ((TimerWakeEnableFlag >> 1) & 0x01) == 1 ? ",时间段2唤醒时间启用" : ""; + timerWakeEnableFlagDisplay += ((TimerWakeEnableFlag >> 2) & 0x01) == 1 ? ",时间段3唤醒时间启用" : ""; + timerWakeEnableFlagDisplay += ((TimerWakeEnableFlag >> 3) & 0x01) == 1 ? ",时间段4唤醒时间启用" : ""; return timerWakeEnableFlagDisplay.Length > 0 ? timerWakeEnableFlagDisplay.Substring(1) : ""; } } - + /// + /// + /// + /// + /// + /// public JT808_0x8103_0x007C_TimerWakeDayParamter Deserialize(ref JT808MessagePackReader reader, IJT808Config config) { JT808_0x8103_0x007C_TimerWakeDayParamter jT808_0x8103_0x007C_TimerWakeDayParamter = new JT808_0x8103_0x007C_TimerWakeDayParamter(); @@ -103,7 +113,12 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody jT808_0x8103_0x007C_TimerWakeDayParamter.TimePeriod4CloseTime = reader.ReadBCD(4); return jT808_0x8103_0x007C_TimerWakeDayParamter; } - + /// + /// + /// + /// + /// + /// public void Serialize(ref JT808MessagePackWriter writer, JT808_0x8103_0x007C_TimerWakeDayParamter value, IJT808Config config) { writer.WriteByte(value.TimerWakeEnableFlag); diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/JT808.Protocol.Extensions.JTActiveSafety.xml b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/JT808.Protocol.Extensions.JTActiveSafety.xml deleted file mode 100644 index 9e3a4b0..0000000 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/JT808.Protocol.Extensions.JTActiveSafety.xml +++ /dev/null @@ -1,2028 +0,0 @@ - - - - JT808.Protocol.Extensions.JTActiveSafety - - - - - 主动拍照策略 - - - - - 不开启 - - - - - 定时拍照 - - - - - 定距拍照 - - - - - 保留 - - - - - 不修改参数 - - - - - 主动安全消息Id - - - - - 报警附件信息消息 - - - - - 文件信息上传 - - - - - 文件上传完成消息 - - - - - 报警附件上传指令 - - - - - 文件上传完成消息应答 - - - - - 拍照分辨率 - - - - - 352x288 - - - - - 704x288 - - - - - 704x576 - - - - - 640x480 - - - - - 1280x720 - - - - - 1920x1080 - - - - - 不修改参数 - - - - - USB编号类型 - - - - - 高级驾驶辅助系统 - - - - - 驾驶员状态监控系统 - - - - - 轮胎气压监测系统 - - - - - 盲点监测系统 - - - - - 视频录制分辨率 - - - - - CIF - - - - - HD1 - - - - - D1 - - - - - WD1 - - - - - VGA - - - - - 720P - - - - - 1080P - - - - - 不修改参数 - - - - - 工作状态 - - - - - 正常工作 - - - - - 待机状态 - - - - - 升级维护 - - - - - 设备异常 - - - - - 断开连接 - - - - - 主动安全常量 - - - - - 附加信息ID 高级驾驶辅助系统报警信息 - - - - - 附加信息ID 驾驶员状态监测系统报警信息 - - - - - 附加信息ID 胎压监测系统报警信息 - - - - - 附加信息ID 盲区监测系统报警信息 - - - - - 高级驾驶辅助系统参数设置 - - - - - 驾驶员状态监测系统参数设置 - - - - - 胎压监测系统参数设置 - - - - - 盲区监测系统参数设置 - - - - - 状态查询 - - - - - 信息查询 - - - - - 主动安全扩展 - - - - - 添加主动安全 - - - - - - - 高级驾驶辅助系统报警信息 - - - - - 高级驾驶辅助系统报警信息Id - - - - - 高级驾驶辅助系统报警信息附加长度 - - - - - 报警ID - - - - - 标志状态 - - - - - 报警/事件类型 - - - - - 报警/事件类型 - - - - - 前车车速 - - - - - 前车/行人距离 - - - - - 偏离类型 - - - - - 道路标志识别类型 - - - - - 道路标志识别类型 - - - - - 车速 - - - - - 高程 - - - - - 纬度 - - - - - 经度 - - - - - 日期时间 - YYMMDDhhmmss - BCD[6] - - - - - 车辆状态 - - - - - 报警标识号 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 驾驶员状态监测系统报警信息 - - - - - 驾驶员状态监测系统报警信息Id - - - - - 驾驶员状态监测系统报警信息长度 - - - - - 报警ID - - - - - 标志状态 - - - - - 报警/事件类型 - - - - - 报警级别 - - - - - 疲劳程度 - - - - - 预留 - - - - - 车速 - - - - - 高程 - - - - - 纬度 - - - - - 经度 - - - - - 日期时间 - YYMMDDhhmmss - BCD[6] - - - - - 车辆状态 - - - - - 报警标识号 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 胎压监测系统报警信息 - - - - - 胎压监测系统报警信息Id - - - - - 胎压监测系统报警信息长度 - - - - - 报警ID - - - - - 标志状态 - - - - - 车速 - - - - - 高程 - - - - - 纬度 - - - - - 经度 - - - - - 日期时间 - YYMMDDhhmmss - BCD[6] - - - - - 车辆状态 - - - - - 报警标识号 - - - - - 报警/事件列表总数 - - - - - 报警/事件信息列表 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 盲区监测系统报警信息 - - - - - 盲区监测系统报警信息Id - - - - - 盲区监测系统报警信息长度 - - - - - 报警ID - - - - - 标志状态 - - - - - 报警/事件类型 - - - - - 报警/事件类型 - - - - - 车速 - - - - - 高程 - - - - - 纬度 - - - - - 经度 - - - - - 日期时间 - YYMMDDhhmmss - BCD[6] - - - - - 车辆状态 - - - - - 报警标识号 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 透传数据 - - - - - 透传类型 - - - - - 消息列表总数 - - - - - 消息列表数据 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 透传数据 - - - - - 透传类型 - - - - - 消息列表总数 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 报警附件信息消息 - - - - - 终端ID - 7 个字节，由大写字母和数字组成，此终端ID 由制造商自行定义，位数不足时，后补“0x00” - - - - - 报警标识号 - - - - - 平台给报警分配的唯一编号 - 32 - - - - - 信息类型 - 0x00：正常报警文件信息 - 0x01：补传报警文件信息 - - - - - 附件数量 - - - - - 附件信息列表 - - - - - 报警附件信息消息Id - - - - - 报警附件信息消息 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 文件信息上传 - - - - - 文件信息上传 - - - - - 文件名称长度 - - - - - 文件名称 - 形如：文件类型_通道号_报警类型_序号_报警编号.后缀名 - - - - - 文件类型 - - - - - 文件大小 - - - - - 文件信息上传Id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 文件上传完成消息 - - - - - 文件上传完成消息 - - - - - 文件名称长度 - - - - - 文件名称 - 形如：文件类型_通道号_报警类型_序号_报警编号.后缀名 - - - - - 文件类型 - - - - - 文件大小 - - - - - 文件上传完成消息 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 高级驾驶辅助系统参数 - - - - - 高级驾驶辅助系统参数 - - - - - 高级驾驶辅助系统参数长度 - - - - - 报警判断速度阈值 - - - - - 报警提示音量 - - - - - 主动拍照策略 - - - - - - 主动定时拍照时间间隔 - - - - - 主动定距拍照距离间隔 - - - - - 单次主动拍照张数 - - - - - 单次主动拍照时间间隔 - - - - - 拍照分辨率 - - - - - - 视频录制分辨率 - - - - - 报警使能 - - - - - 事件使能 - - - - - 预留字段 - - - - - 障碍物报警距离阈值 - - - - - 障碍物报警分级速度阈值 - - - - - 障碍物报警前后视频录制时间 - - - - - 障碍物报警拍照张数 - - - - - 障碍物报警拍照间隔 - - - - - 频繁变道报警判断时间段 - - - - - 频繁变道报警判断次数 - - - - - 频繁变道报警分级速度阈值 - - - - - 频繁变道报警前后视频录制时间 - - - - - 频繁变道报警拍照张数 - - - - - 频繁变道报警拍照间隔 - - - - - 车道偏离报警分级速度阈值 - - - - - 车道偏离报警前后视频录制时间 - - - - - 车道偏离报警拍照张数 - - - - - 车道偏离报警拍照间隔 - - - - - 前向碰撞报警时间阈值 - - - - - 前向碰撞报警分级速度阈值 - - - - - 前向碰撞报警前后视频录制时间 - - - - - 前向碰撞报警拍照张数 - - - - - 前向碰撞报警拍照间隔 - - - - - 行人碰撞报警时间阈值 - - - - - 行人碰撞报警使能速度阈值 - - - - - 行人碰撞报警前后视频录制时间 - - - - - 行人碰撞报警拍照张数 - - - - - 行人碰撞报警拍照间隔 - - - - - 车距监控报警距离阈值 - - - - - 车距监控报警分级速度阈值 - - - - - 车距过近报警前后视频录制时间 - - - - - 车距过近报警拍照张数 - - - - - 车距过近报警拍照间隔 - - - - - 道路标志识别拍照张数 - - - - - 道路标志识别拍照间隔 - - - - - 保留字段 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 驾驶员状态监测系统参数 - - - - - 驾驶员状态监测系统参数 - - - - - 驾驶员状态监测系统参数长度 - - - - - 报警判断速度阈值 - - - - - 报警提示音量 - - - - - 主动拍照策略 - - - - - 主动定时拍照时间间隔 - - - - - 主动定距拍照距离间隔 - - - - - 单次主动拍照张数 - - - - - 单次主动拍照时间间隔 - - - - - 拍照分辨率 - - - - - 视频录制分辨率 - - - - - 报警使能 - - - - - 事件使能 - - - - - 吸烟报警判断时间间隔 - - - - - 接打电话报警判断时间间隔 - - - - - 预留字段 - - - - - 疲劳驾驶报警分级速度阈值 - - - - - 疲劳驾驶报警前后视频录制时间 - - - - - 疲劳驾驶报警拍照张数 - - - - - 疲劳驾驶报警拍照间隔时间 - - - - - 接打电话报警分级速度阈值 - - - - - 接打电话报警前后视频录制时间 - - - - - 接打电话报警拍驾驶员面部特征照片张数 - - - - - 接打电话报警拍驾驶员面部特征照片间隔时间 - - - - - 抽烟报警分级车速阈值 - - - - - 抽烟报警前后视频录制时间 - - - - - 抽烟报警拍驾驶员面部特征照片张数 - - - - - 抽烟报警拍驾驶员面部特征照片间隔时间 - - - - - 分神驾驶报警分级车速阈值 - - - - - 分神驾驶报警拍照张数 - - - - - 分神驾驶报警拍照间隔时间 - - - - - 驾驶行为异常视频录制时间 - - - - - 驾驶行为异常抓拍照片张数 - - - - - 驾驶行为异常拍照间隔 - - - - - 驾驶员身份识别触发 - - - - - 保留字段 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 胎压监测系统参数 - - - - - 胎压监测系统参数Id - - - - - 胎压监测系统参数长度 - - - - - 轮胎规格型号 12位 - - - - - 胎压单位 - - - - - 正常胎压值 - - - - - 胎压不平衡门限 - - - - - 慢漏气门限 - - - - - 低压阈值 - - - - - 高压阈值 - - - - - 高温阈值 - - - - - 电压阈值 - - - - - 定时上报时间间隔 - - - - - 保留项 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 盲区监测系统参数 - - - - - 盲区监测系统参数Id - - - - - 盲区监测系统参数长度 - - - - - 后方接近报警时间阈值 - - - - - 侧后方接近报警时间阈值 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 查询基本信息 - - - - - 查询基本信息类型 - - - - - 外设ID列表总数 - - - - - 外设ID - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 查询基本信息 - - - - - 查询基本信息透传类型 - - - - - 外设ID列表总数 - - - - - 外设ID - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 报警附件上传指令 - - - - - Description - - - - - 服务IP地址长度 - - - - - 服务IP地址 - - - - - TCP端口 - - - - - UDP端口 - - - - - 报警标识号 - - - - - 平台给报警分配的唯一编号 - 32 - - - - - 预留 - - - - - 报警附件上传指令Id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 文件上传完成消息应答 - - - - - 文件上传完成消息应答 - - - - - 文件名称长度 - - - - - 文件名称 - - - - - 文件类型 - - - - - 上传结果 - - - - - 补传数据包数量 - 需要补传的数据包数量，无补传时该值为0 - - - - - 补传数据包列表 - - - - - 文件上传完成消息应答Id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 报警标识号 - - - - - 终端ID - - - - - YY-MM-DD-hh-mm-ss - BCD[6] - - - - - 序号 - - - - - 附件数量 - - - - - 预留 - - - - - 胎压监测系统报警/事件信息 - - - - - 胎压报警位置 - - - - - 报警/事件类型 - - - - - 胎压 - - - - - 胎温 - - - - - 电池电量 - - - - - 附件信息 - - - - - 文件名称长度 - - - - - 文件名称 - 形如：文件类型_通道号_报警类型_序号_报警编号.后缀名 - - - - - 文件大小 - - - - - 补传数据包信息 - - - - - 数据偏移量 - - - - - 数据长度 - - - - - - - - - - 外设ID - - - - - - 消息长度 - - - - - 工作状态 - - - - - - 报警状态 - - - - - - - - - - 外设ID - - - - - - 消息长度 - - - - - 公司名称长度 - - - - - 公司名称 - - - - - 产品型号长度 - - - - - 产品型号 - - - - - 硬件版本号长度 - - - - - 硬件版本号 - ASCII - - - - - 软件版本号长度 - - - - - 软件版本号 - ASCII - - - - - 设备ID长度 - - - - - 设备ID - - - - - 客户代码长度 - - - - - 客户代码 - - - - diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety.Test/JT808.Protocol.Extensions.JTActiveSafety.Test.csproj b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao.Test/JT808.Protocol.Extensions.SuBiao.Test.csproj similarity index 84% rename from src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety.Test/JT808.Protocol.Extensions.JTActiveSafety.Test.csproj rename to src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao.Test/JT808.Protocol.Extensions.SuBiao.Test.csproj index 43ff6eb..e435dcb 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety.Test/JT808.Protocol.Extensions.JTActiveSafety.Test.csproj +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao.Test/JT808.Protocol.Extensions.SuBiao.Test.csproj @@ -17,7 +17,7 @@ - + diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety.Test/JT808_0x0200_0x64_Test.cs b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao.Test/JT808_0x0200_0x64_Test.cs similarity index 93% rename from src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety.Test/JT808_0x0200_0x64_Test.cs rename to src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao.Test/JT808_0x0200_0x64_Test.cs index cedcf44..f32a712 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety.Test/JT808_0x0200_0x64_Test.cs +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao.Test/JT808_0x0200_0x64_Test.cs @@ -1,4 +1,4 @@ -using JT808.Protocol.Extensions.JTActiveSafety.MessageBody; +using JT808.Protocol.Extensions.SuBiao.MessageBody; using JT808.Protocol.MessageBody; using Microsoft.Extensions.DependencyInjection; using System; @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.Text; using Xunit; -namespace JT808.Protocol.Extensions.JTActiveSafety.Test +namespace JT808.Protocol.Extensions.SuBiao.Test { public class JT808_0x0200_0x64_Test { @@ -15,7 +15,7 @@ namespace JT808.Protocol.Extensions.JTActiveSafety.Test { ServiceCollection serviceDescriptors = new ServiceCollection(); serviceDescriptors.AddJT808Configure() - .AddJTActiveSafetyConfigure(); + .AddSuBiaoConfigure(); IJT808Config jT808Config = serviceDescriptors.BuildServiceProvider().GetRequiredService(); JT808Serializer = new JT808Serializer(jT808Config); } @@ -34,7 +34,7 @@ namespace JT808.Protocol.Extensions.JTActiveSafety.Test StatusFlag = 2, JT808LocationAttachData = new Dictionary() }; - jT808UploadLocationRequest.JT808LocationAttachData.Add(JT808_JTActiveSafety_Constants.JT808_0X0200_0x64, new JT808_0x0200_0x64 + jT808UploadLocationRequest.JT808LocationAttachData.Add(JT808_SuBiao_Constants.JT808_0X0200_0x64, new JT808_0x0200_0x64 { AlarmId = 1, AlarmIdentification = new Metadata.AlarmIdentificationProperty @@ -66,7 +66,7 @@ namespace JT808.Protocol.Extensions.JTActiveSafety.Test public void Deserialize() { var jT808UploadLocationRequest = JT808Serializer.Deserialize("000000010000000200BA7F0E07E4F11C0028003C00001807151010106420000000010C0605120A0B100F1100070000000D0000000E191211183100001334343434343434191210183100030200".ToHexBytes()); - jT808UploadLocationRequest.JT808LocationAttachData.TryGetValue(JT808_JTActiveSafety_Constants.JT808_0X0200_0x64, out var value); + jT808UploadLocationRequest.JT808LocationAttachData.TryGetValue(JT808_SuBiao_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.JTActiveSafety.Test/JT808_0x0200_0x65_Test.cs b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao.Test/JT808_0x0200_0x65_Test.cs similarity index 92% rename from src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety.Test/JT808_0x0200_0x65_Test.cs rename to src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao.Test/JT808_0x0200_0x65_Test.cs index ccef77b..d395ab0 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety.Test/JT808_0x0200_0x65_Test.cs +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao.Test/JT808_0x0200_0x65_Test.cs @@ -1,4 +1,4 @@ -using JT808.Protocol.Extensions.JTActiveSafety.MessageBody; +using JT808.Protocol.Extensions.SuBiao.MessageBody; using JT808.Protocol.MessageBody; using Microsoft.Extensions.DependencyInjection; using System; @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.Text; using Xunit; -namespace JT808.Protocol.Extensions.JTActiveSafety.Test +namespace JT808.Protocol.Extensions.SuBiao.Test { public class JT808_0x0200_0x65_Test { @@ -15,7 +15,7 @@ namespace JT808.Protocol.Extensions.JTActiveSafety.Test { ServiceCollection serviceDescriptors = new ServiceCollection(); serviceDescriptors.AddJT808Configure() - .AddJTActiveSafetyConfigure(); + .AddSuBiaoConfigure(); IJT808Config jT808Config = serviceDescriptors.BuildServiceProvider().GetRequiredService(); JT808Serializer = new JT808Serializer(jT808Config); } @@ -34,7 +34,7 @@ namespace JT808.Protocol.Extensions.JTActiveSafety.Test StatusFlag = 2, JT808LocationAttachData = new Dictionary() }; - jT808UploadLocationRequest.JT808LocationAttachData.Add(JT808_JTActiveSafety_Constants.JT808_0X0200_0x65, new JT808_0x0200_0x65 + jT808UploadLocationRequest.JT808LocationAttachData.Add(JT808_SuBiao_Constants.JT808_0X0200_0x65, new JT808_0x0200_0x65 { AlarmId = 1, AlarmIdentification = new Metadata.AlarmIdentificationProperty @@ -63,7 +63,7 @@ namespace JT808.Protocol.Extensions.JTActiveSafety.Test public void Deserialize() { var jT808UploadLocationRequest = JT808Serializer.Deserialize("000000010000000200BA7F0E07E4F11C0028003C00001807151010106520000000010C060512010203041100070000000D0000000E191211183100001334343434343434191210183100030200".ToHexBytes()); - jT808UploadLocationRequest.JT808LocationAttachData.TryGetValue(JT808_JTActiveSafety_Constants.JT808_0X0200_0x65, out var value); + jT808UploadLocationRequest.JT808LocationAttachData.TryGetValue(JT808_SuBiao_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.JTActiveSafety.Test/JT808_0x0200_0x66_Test.cs b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao.Test/JT808_0x0200_0x66_Test.cs similarity index 94% rename from src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety.Test/JT808_0x0200_0x66_Test.cs rename to src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao.Test/JT808_0x0200_0x66_Test.cs index 76cb5ca..3168be4 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety.Test/JT808_0x0200_0x66_Test.cs +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao.Test/JT808_0x0200_0x66_Test.cs @@ -1,4 +1,4 @@ -using JT808.Protocol.Extensions.JTActiveSafety.MessageBody; +using JT808.Protocol.Extensions.SuBiao.MessageBody; using JT808.Protocol.MessageBody; using Microsoft.Extensions.DependencyInjection; using System; @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.Text; using Xunit; -namespace JT808.Protocol.Extensions.JTActiveSafety.Test +namespace JT808.Protocol.Extensions.SuBiao.Test { public class JT808_0x0200_0x66_Test { @@ -15,7 +15,7 @@ namespace JT808.Protocol.Extensions.JTActiveSafety.Test { ServiceCollection serviceDescriptors = new ServiceCollection(); serviceDescriptors.AddJT808Configure() - .AddJTActiveSafetyConfigure(); + .AddSuBiaoConfigure(); IJT808Config jT808Config = serviceDescriptors.BuildServiceProvider().GetRequiredService(); JT808Serializer = new JT808Serializer(jT808Config); } @@ -34,7 +34,7 @@ namespace JT808.Protocol.Extensions.JTActiveSafety.Test StatusFlag = 2, JT808LocationAttachData = new Dictionary() }; - jT808UploadLocationRequest.JT808LocationAttachData.Add(JT808_JTActiveSafety_Constants.JT808_0X0200_0x66, new JT808_0x0200_0x66 + jT808UploadLocationRequest.JT808LocationAttachData.Add(JT808_SuBiao_Constants.JT808_0X0200_0x66, new JT808_0x0200_0x66 { AlarmId = 1, AlarmIdentification = new Metadata.AlarmIdentificationProperty @@ -77,7 +77,7 @@ namespace JT808.Protocol.Extensions.JTActiveSafety.Test public void Deserialize() { var jT808UploadLocationRequest = JT808Serializer.Deserialize("000000010000000200BA7F0E07E4F11C0028003C0000180715101010663B000000010C1100070000000D0000000E191211183100001334343434343434191210183100030200020400010003000500020900060008000A0007".ToHexBytes()); - jT808UploadLocationRequest.JT808LocationAttachData.TryGetValue(JT808_JTActiveSafety_Constants.JT808_0X0200_0x66, out var value); + jT808UploadLocationRequest.JT808LocationAttachData.TryGetValue(JT808_SuBiao_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.JTActiveSafety.Test/JT808_0x0200_0x67_Test.cs b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao.Test/JT808_0x0200_0x67_Test.cs similarity index 92% rename from src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety.Test/JT808_0x0200_0x67_Test.cs rename to src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao.Test/JT808_0x0200_0x67_Test.cs index a81c53e..081b1f0 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety.Test/JT808_0x0200_0x67_Test.cs +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao.Test/JT808_0x0200_0x67_Test.cs @@ -1,4 +1,4 @@ -using JT808.Protocol.Extensions.JTActiveSafety.MessageBody; +using JT808.Protocol.Extensions.SuBiao.MessageBody; using JT808.Protocol.MessageBody; using Microsoft.Extensions.DependencyInjection; using System; @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.Text; using Xunit; -namespace JT808.Protocol.Extensions.JTActiveSafety.Test +namespace JT808.Protocol.Extensions.SuBiao.Test { public class JT808_0x0200_0x67_Test { @@ -15,7 +15,7 @@ namespace JT808.Protocol.Extensions.JTActiveSafety.Test { ServiceCollection serviceDescriptors = new ServiceCollection(); serviceDescriptors.AddJT808Configure() - .AddJTActiveSafetyConfigure(); + .AddSuBiaoConfigure(); IJT808Config jT808Config = serviceDescriptors.BuildServiceProvider().GetRequiredService(); JT808Serializer = new JT808Serializer(jT808Config); } @@ -34,7 +34,7 @@ namespace JT808.Protocol.Extensions.JTActiveSafety.Test StatusFlag = 2, JT808LocationAttachData = new Dictionary() }; - jT808UploadLocationRequest.JT808LocationAttachData.Add(JT808_JTActiveSafety_Constants.JT808_0X0200_0x67, new JT808_0x0200_0x67 + jT808UploadLocationRequest.JT808LocationAttachData.Add(JT808_SuBiao_Constants.JT808_0X0200_0x67, new JT808_0x0200_0x67 { AlarmId = 1, AlarmIdentification = new Metadata.AlarmIdentificationProperty @@ -61,7 +61,7 @@ namespace JT808.Protocol.Extensions.JTActiveSafety.Test public void Deserialize() { var jT808UploadLocationRequest = JT808Serializer.Deserialize("000000010000000200BA7F0E07E4F11C0028003C0000180715101010672A000000010C09081100070000000D0000000E191211183100001334343434343434191210183100030200".ToHexBytes()); - jT808UploadLocationRequest.JT808LocationAttachData.TryGetValue(JT808_JTActiveSafety_Constants.JT808_0X0200_0x67, out var value); + jT808UploadLocationRequest.JT808LocationAttachData.TryGetValue(JT808_SuBiao_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.JTActiveSafety.Test/JT808_0x0900_Test.cs b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao.Test/JT808_0x0900_Test.cs similarity index 92% rename from src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety.Test/JT808_0x0900_Test.cs rename to src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao.Test/JT808_0x0900_Test.cs index 1cffc5e..11a5ff4 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety.Test/JT808_0x0900_Test.cs +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao.Test/JT808_0x0900_Test.cs @@ -1,5 +1,5 @@ -using JT808.Protocol.Extensions.JTActiveSafety.MessageBody; -using JT808.Protocol.Extensions.JTActiveSafety.Metadata; +using JT808.Protocol.Extensions.SuBiao.MessageBody; +using JT808.Protocol.Extensions.SuBiao.Metadata; using JT808.Protocol.MessageBody; using Microsoft.Extensions.DependencyInjection; using System; @@ -7,7 +7,7 @@ using System.Collections.Generic; using System.Text; using Xunit; -namespace JT808.Protocol.Extensions.JTActiveSafety.Test +namespace JT808.Protocol.Extensions.SuBiao.Test { public class JT808_0x0900_Test { @@ -16,7 +16,7 @@ namespace JT808.Protocol.Extensions.JTActiveSafety.Test { ServiceCollection serviceDescriptors = new ServiceCollection(); serviceDescriptors.AddJT808Configure() - .AddJTActiveSafetyConfigure(); + .AddSuBiaoConfigure(); IJT808Config jT808Config = serviceDescriptors.BuildServiceProvider().GetRequiredService(); JT808Serializer = new JT808Serializer(jT808Config); } @@ -49,7 +49,7 @@ namespace JT808.Protocol.Extensions.JTActiveSafety.Test { var jT808_0x0900_0xF7 = JT808Serializer.Deserialize("020105020000000102050200000001".ToHexBytes()); - Assert.Equal(JT808_JTActiveSafety_Constants.JT808_0X0900_0xF7, jT808_0x0900_0xF7.PassthroughType); + Assert.Equal(JT808_SuBiao_Constants.JT808_0X0900_0xF7, jT808_0x0900_0xF7.PassthroughType); Assert.Equal(2, jT808_0x0900_0xF7.USBMessageCount); Assert.Equal(1, jT808_0x0900_0xF7.USBMessages[0].USBID); Assert.Equal(5, jT808_0x0900_0xF7.USBMessages[0].MessageLength); @@ -94,7 +94,7 @@ namespace JT808.Protocol.Extensions.JTActiveSafety.Test public void Test_0xF8_2() { var jT808_0x0900_0xF8 = JT808Serializer.Deserialize("01015C0B436F6D70616E744E616D650C50726F647563744D6F64656C15486172647761726556657273696F6E4E756D62657215536F66747761726556657273696F6E4E756D626572094465766963657349440C437573746F6D6572436F6465".ToHexBytes()); - Assert.Equal(JT808_JTActiveSafety_Constants.JT808_0X0900_0xF8, jT808_0x0900_0xF8.PassthroughType); + Assert.Equal(JT808_SuBiao_Constants.JT808_0X0900_0xF8, jT808_0x0900_0xF8.PassthroughType); Assert.Equal(1, jT808_0x0900_0xF8.USBMessageCount); Assert.Equal(1, jT808_0x0900_0xF8.USBMessages[0].USBID); Assert.Equal("CompantName", jT808_0x0900_0xF8.USBMessages[0].CompantName); diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety.Test/JT808_0x1210_Test.cs b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao.Test/JT808_0x1210_Test.cs similarity index 95% rename from src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety.Test/JT808_0x1210_Test.cs rename to src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao.Test/JT808_0x1210_Test.cs index 3558cd4..9fc22f3 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety.Test/JT808_0x1210_Test.cs +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao.Test/JT808_0x1210_Test.cs @@ -1,4 +1,4 @@ -using JT808.Protocol.Extensions.JTActiveSafety.MessageBody; +using JT808.Protocol.Extensions.SuBiao.MessageBody; using JT808.Protocol.MessageBody; using Microsoft.Extensions.DependencyInjection; using System; @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.Text; using Xunit; -namespace JT808.Protocol.Extensions.JTActiveSafety.Test +namespace JT808.Protocol.Extensions.SuBiao.Test { public class JT808_0x1210_Test { @@ -15,7 +15,7 @@ namespace JT808.Protocol.Extensions.JTActiveSafety.Test { ServiceCollection serviceDescriptors = new ServiceCollection(); serviceDescriptors.AddJT808Configure() - .AddJTActiveSafetyConfigure(); + .AddSuBiaoConfigure(); IJT808Config jT808Config = serviceDescriptors.BuildServiceProvider().GetRequiredService(); JT808Serializer = new JT808Serializer(jT808Config); } diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety.Test/JT808_0x1211_Test.cs b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao.Test/JT808_0x1211_Test.cs similarity index 90% rename from src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety.Test/JT808_0x1211_Test.cs rename to src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao.Test/JT808_0x1211_Test.cs index 96f24a0..9388767 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety.Test/JT808_0x1211_Test.cs +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao.Test/JT808_0x1211_Test.cs @@ -1,4 +1,4 @@ -using JT808.Protocol.Extensions.JTActiveSafety.MessageBody; +using JT808.Protocol.Extensions.SuBiao.MessageBody; using JT808.Protocol.MessageBody; using Microsoft.Extensions.DependencyInjection; using System; @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.Text; using Xunit; -namespace JT808.Protocol.Extensions.JTActiveSafety.Test +namespace JT808.Protocol.Extensions.SuBiao.Test { public class JT808_0x1211_Test { @@ -15,7 +15,7 @@ namespace JT808.Protocol.Extensions.JTActiveSafety.Test { ServiceCollection serviceDescriptors = new ServiceCollection(); serviceDescriptors.AddJT808Configure() - .AddJTActiveSafetyConfigure(); + .AddSuBiaoConfigure(); IJT808Config jT808Config = serviceDescriptors.BuildServiceProvider().GetRequiredService(); JT808Serializer = new JT808Serializer(jT808Config); } diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety.Test/JT808_0x1212_Test.cs b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao.Test/JT808_0x1212_Test.cs similarity index 88% rename from src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety.Test/JT808_0x1212_Test.cs rename to src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao.Test/JT808_0x1212_Test.cs index f91515f..ee54dcb 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety.Test/JT808_0x1212_Test.cs +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao.Test/JT808_0x1212_Test.cs @@ -1,4 +1,4 @@ -using JT808.Protocol.Extensions.JTActiveSafety.MessageBody; +using JT808.Protocol.Extensions.SuBiao.MessageBody; using JT808.Protocol.MessageBody; using Microsoft.Extensions.DependencyInjection; using System; @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.Text; using Xunit; -namespace JT808.Protocol.Extensions.JTActiveSafety.Test +namespace JT808.Protocol.Extensions.SuBiao.Test { public class JT808_0x1212_Test { @@ -15,7 +15,7 @@ namespace JT808.Protocol.Extensions.JTActiveSafety.Test { ServiceCollection serviceDescriptors = new ServiceCollection(); serviceDescriptors.AddJT808Configure() - .AddJTActiveSafetyConfigure(); + .AddSuBiaoConfigure(); IJT808Config jT808Config = serviceDescriptors.BuildServiceProvider().GetRequiredService(); JT808Serializer = new JT808Serializer(jT808Config); } diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety.Test/JT808_0x8103_0xF364_Test.cs b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao.Test/JT808_0x8103_0xF364_Test.cs similarity index 96% rename from src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety.Test/JT808_0x8103_0xF364_Test.cs rename to src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao.Test/JT808_0x8103_0xF364_Test.cs index d00b610..f253935 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety.Test/JT808_0x8103_0xF364_Test.cs +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao.Test/JT808_0x8103_0xF364_Test.cs @@ -1,4 +1,4 @@ -using JT808.Protocol.Extensions.JTActiveSafety.MessageBody; +using JT808.Protocol.Extensions.SuBiao.MessageBody; using JT808.Protocol.MessageBody; using Microsoft.Extensions.DependencyInjection; using System; @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.Text; using Xunit; -namespace JT808.Protocol.Extensions.JTActiveSafety.Test +namespace JT808.Protocol.Extensions.SuBiao.Test { public class JT808_0x8103_0xF364_Test { @@ -15,7 +15,7 @@ namespace JT808.Protocol.Extensions.JTActiveSafety.Test { ServiceCollection serviceDescriptors = new ServiceCollection(); serviceDescriptors.AddJT808Configure() - .AddJTActiveSafetyConfigure(); + .AddSuBiaoConfigure(); IJT808Config jT808Config = serviceDescriptors.BuildServiceProvider().GetRequiredService(); JT808Serializer = new JT808Serializer(jT808Config); } @@ -127,7 +127,7 @@ namespace JT808.Protocol.Extensions.JTActiveSafety.Test Assert.Equal(43, jT808_0X8103_0XF364.VideoRecordingTimeBeforeAndAfterObstacleAlarm); Assert.Equal(44, jT808_0X8103_0XF364.VideoRecordingTimeBeforeAndAfterPedestrianCollisionAlarm); Assert.Equal(45, jT808_0X8103_0XF364.WarningVolume); - Assert.Equal(JT808_JTActiveSafety_Constants.JT808_0X8103_0xF364, jT808_0X8103_0XF364.ParamId); + Assert.Equal(JT808_SuBiao_Constants.JT808_0X8103_0xF364, jT808_0X8103_0XF364.ParamId); } [Fact] diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety.Test/JT808_0x8103_0xF365_Test.cs b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao.Test/JT808_0x8103_0xF365_Test.cs similarity index 95% rename from src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety.Test/JT808_0x8103_0xF365_Test.cs rename to src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao.Test/JT808_0x8103_0xF365_Test.cs index 9e1e511..390200b 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety.Test/JT808_0x8103_0xF365_Test.cs +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao.Test/JT808_0x8103_0xF365_Test.cs @@ -1,4 +1,4 @@ -using JT808.Protocol.Extensions.JTActiveSafety.MessageBody; +using JT808.Protocol.Extensions.SuBiao.MessageBody; using JT808.Protocol.MessageBody; using Microsoft.Extensions.DependencyInjection; using System; @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.Text; using Xunit; -namespace JT808.Protocol.Extensions.JTActiveSafety.Test +namespace JT808.Protocol.Extensions.SuBiao.Test { public class JT808_0x8103_0xF365_Test { @@ -15,7 +15,7 @@ namespace JT808.Protocol.Extensions.JTActiveSafety.Test { ServiceCollection serviceDescriptors = new ServiceCollection(); serviceDescriptors.AddJT808Configure() - .AddJTActiveSafetyConfigure(); + .AddSuBiaoConfigure(); IJT808Config jT808Config = serviceDescriptors.BuildServiceProvider().GetRequiredService(); JT808Serializer = new JT808Serializer(jT808Config); } @@ -105,7 +105,7 @@ namespace JT808.Protocol.Extensions.JTActiveSafety.Test Assert.Equal(64, jT808_0X8103_0XF365.VideoRecordingTimeBeforeAndAfterCallAlarm); Assert.Equal(65, jT808_0X8103_0XF365.VideoRecordingTimeBeforeAndAfterFatigueDrivingAlarm); Assert.Equal(66, jT808_0X8103_0XF365.VideoRecordingTimeBeforeAndAfterSmokingAlarm); - Assert.Equal(JT808_JTActiveSafety_Constants.JT808_0X8103_0xF365, jT808_0X8103_0XF365.ParamId); + Assert.Equal(JT808_SuBiao_Constants.JT808_0X8103_0xF365, jT808_0X8103_0XF365.ParamId); } [Fact] public void Json() diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety.Test/JT808_0x8103_0xF366_Test.cs b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao.Test/JT808_0x8103_0xF366_Test.cs similarity index 94% rename from src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety.Test/JT808_0x8103_0xF366_Test.cs rename to src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao.Test/JT808_0x8103_0xF366_Test.cs index 68047b3..44e869e 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety.Test/JT808_0x8103_0xF366_Test.cs +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao.Test/JT808_0x8103_0xF366_Test.cs @@ -1,4 +1,4 @@ -using JT808.Protocol.Extensions.JTActiveSafety.MessageBody; +using JT808.Protocol.Extensions.SuBiao.MessageBody; using JT808.Protocol.MessageBody; using Microsoft.Extensions.DependencyInjection; using System; @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.Text; using Xunit; -namespace JT808.Protocol.Extensions.JTActiveSafety.Test +namespace JT808.Protocol.Extensions.SuBiao.Test { public class JT808_0x8103_0xF366_Test { @@ -15,7 +15,7 @@ namespace JT808.Protocol.Extensions.JTActiveSafety.Test { ServiceCollection serviceDescriptors = new ServiceCollection(); serviceDescriptors.AddJT808Configure() - .AddJTActiveSafetyConfigure(); + .AddSuBiaoConfigure(); IJT808Config jT808Config = serviceDescriptors.BuildServiceProvider().GetRequiredService(); JT808Serializer = new JT808Serializer(jT808Config); } diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety.Test/JT808_0x8103_0xF367_Test.cs b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao.Test/JT808_0x8103_0xF367_Test.cs similarity index 90% rename from src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety.Test/JT808_0x8103_0xF367_Test.cs rename to src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao.Test/JT808_0x8103_0xF367_Test.cs index 4f0867e..38f6a07 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety.Test/JT808_0x8103_0xF367_Test.cs +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao.Test/JT808_0x8103_0xF367_Test.cs @@ -1,4 +1,4 @@ -using JT808.Protocol.Extensions.JTActiveSafety.MessageBody; +using JT808.Protocol.Extensions.SuBiao.MessageBody; using JT808.Protocol.MessageBody; using Microsoft.Extensions.DependencyInjection; using System; @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.Text; using Xunit; -namespace JT808.Protocol.Extensions.JTActiveSafety.Test +namespace JT808.Protocol.Extensions.SuBiao.Test { public class JT808_0x8103_0xF367_Test { @@ -15,7 +15,7 @@ namespace JT808.Protocol.Extensions.JTActiveSafety.Test { ServiceCollection serviceDescriptors = new ServiceCollection(); serviceDescriptors.AddJT808Configure() - .AddJTActiveSafetyConfigure(); + .AddSuBiaoConfigure(); IJT808Config jT808Config = serviceDescriptors.BuildServiceProvider().GetRequiredService(); JT808Serializer = new JT808Serializer(jT808Config); } diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety.Test/JT808_0x8900_Test.cs b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao.Test/JT808_0x8900_Test.cs similarity index 89% rename from src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety.Test/JT808_0x8900_Test.cs rename to src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao.Test/JT808_0x8900_Test.cs index 4061b7d..ff0aa0b 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety.Test/JT808_0x8900_Test.cs +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao.Test/JT808_0x8900_Test.cs @@ -1,4 +1,4 @@ -using JT808.Protocol.Extensions.JTActiveSafety.MessageBody; +using JT808.Protocol.Extensions.SuBiao.MessageBody; using JT808.Protocol.MessageBody; using Microsoft.Extensions.DependencyInjection; using System; @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.Text; using Xunit; -namespace JT808.Protocol.Extensions.JTActiveSafety.Test +namespace JT808.Protocol.Extensions.SuBiao.Test { public class JT808_0x8900_Test { @@ -15,7 +15,7 @@ namespace JT808.Protocol.Extensions.JTActiveSafety.Test { ServiceCollection serviceDescriptors = new ServiceCollection(); serviceDescriptors.AddJT808Configure() - .AddJTActiveSafetyConfigure(); + .AddSuBiaoConfigure(); IJT808Config jT808Config = serviceDescriptors.BuildServiceProvider().GetRequiredService(); JT808Serializer = new JT808Serializer(jT808Config); } diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety.Test/JT808_0x9208_Test.cs b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao.Test/JT808_0x9208_Test.cs similarity index 94% rename from src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety.Test/JT808_0x9208_Test.cs rename to src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao.Test/JT808_0x9208_Test.cs index f5bbd0a..117058f 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety.Test/JT808_0x9208_Test.cs +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao.Test/JT808_0x9208_Test.cs @@ -1,4 +1,4 @@ -using JT808.Protocol.Extensions.JTActiveSafety.MessageBody; +using JT808.Protocol.Extensions.SuBiao.MessageBody; using JT808.Protocol.MessageBody; using Microsoft.Extensions.DependencyInjection; using System; @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.Text; using Xunit; -namespace JT808.Protocol.Extensions.JTActiveSafety.Test +namespace JT808.Protocol.Extensions.SuBiao.Test { public class JT808_0x9208_Test { @@ -15,7 +15,7 @@ namespace JT808.Protocol.Extensions.JTActiveSafety.Test { ServiceCollection serviceDescriptors = new ServiceCollection(); serviceDescriptors.AddJT808Configure() - .AddJTActiveSafetyConfigure(); + .AddSuBiaoConfigure(); IJT808Config jT808Config = serviceDescriptors.BuildServiceProvider().GetRequiredService(); JT808Serializer = new JT808Serializer(jT808Config); } diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety.Test/JT808_0x9212_Test.cs b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao.Test/JT808_0x9212_Test.cs similarity index 92% rename from src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety.Test/JT808_0x9212_Test.cs rename to src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao.Test/JT808_0x9212_Test.cs index dc9a03a..7371e73 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety.Test/JT808_0x9212_Test.cs +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao.Test/JT808_0x9212_Test.cs @@ -1,4 +1,4 @@ -using JT808.Protocol.Extensions.JTActiveSafety.MessageBody; +using JT808.Protocol.Extensions.SuBiao.MessageBody; using JT808.Protocol.MessageBody; using Microsoft.Extensions.DependencyInjection; using System; @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.Text; using Xunit; -namespace JT808.Protocol.Extensions.JTActiveSafety.Test +namespace JT808.Protocol.Extensions.SuBiao.Test { public class JT808_0x9212_Test { @@ -15,7 +15,7 @@ namespace JT808.Protocol.Extensions.JTActiveSafety.Test { ServiceCollection serviceDescriptors = new ServiceCollection(); serviceDescriptors.AddJT808Configure() - .AddJTActiveSafetyConfigure(); + .AddSuBiaoConfigure(); IJT808Config jT808Config = serviceDescriptors.BuildServiceProvider().GetRequiredService(); JT808Serializer = new JT808Serializer(jT808Config); } diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/JTActiveSafetyDependencyInjectionExtensions.cs b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/DependencyInjectionExtensions.cs similarity index 55% rename from src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/JTActiveSafetyDependencyInjectionExtensions.cs rename to src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/DependencyInjectionExtensions.cs index f066aa4..9ea634c 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/JTActiveSafetyDependencyInjectionExtensions.cs +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/DependencyInjectionExtensions.cs @@ -1,5 +1,5 @@ -using JT808.Protocol.Extensions.JTActiveSafety.Enums; -using JT808.Protocol.Extensions.JTActiveSafety.MessageBody; +using JT808.Protocol.Extensions.SuBiao.Enums; +using JT808.Protocol.Extensions.SuBiao.MessageBody; using JT808.Protocol.Interfaces; using Microsoft.Extensions.DependencyInjection; using System; @@ -7,19 +7,19 @@ using System.Collections.Generic; using System.Reflection; using System.Text; -namespace JT808.Protocol.Extensions.JTActiveSafety +namespace JT808.Protocol.Extensions.SuBiao { /// - /// 主动安全扩展 + /// 添加苏标-主动安全 /// - public static class JTActiveSafetyDependencyInjectionExtensions + public static class DependencyInjectionExtensions { /// - /// 添加主动安全 + /// 添加苏标-主动安全 /// /// /// - public static IJT808Builder AddJTActiveSafetyConfigure(this IJT808Builder jT808Builder) + public static IJT808Builder AddSuBiaoConfigure(this IJT808Builder jT808Builder) { jT808Builder.Config.Register(Assembly.GetExecutingAssembly()); return jT808Builder; diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/Enums/ActivePhotographyStrategyType.cs b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/Enums/ActivePhotographyStrategyType.cs similarity index 92% rename from src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/Enums/ActivePhotographyStrategyType.cs rename to src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/Enums/ActivePhotographyStrategyType.cs index e1c0367..2788d99 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/Enums/ActivePhotographyStrategyType.cs +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/Enums/ActivePhotographyStrategyType.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace JT808.Protocol.Extensions.JTActiveSafety.Enums +namespace JT808.Protocol.Extensions.SuBiao.Enums { /// /// 主动拍照策略 diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/Enums/JT808_JTActiveSafety_MsgId.cs b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/Enums/JT808_SuBiao_MsgId.cs similarity index 87% rename from src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/Enums/JT808_JTActiveSafety_MsgId.cs rename to src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/Enums/JT808_SuBiao_MsgId.cs index e1167c8..b9d0fc6 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/Enums/JT808_JTActiveSafety_MsgId.cs +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/Enums/JT808_SuBiao_MsgId.cs @@ -2,12 +2,12 @@ using System.Collections.Generic; using System.Text; -namespace JT808.Protocol.Extensions.JTActiveSafety.Enums +namespace JT808.Protocol.Extensions.SuBiao.Enums { /// /// 主动安全消息Id /// - public enum JT808_JTActiveSafety_MsgId : ushort + public enum JT808_SuBiao_MsgId : ushort { /// /// 报警附件信息消息 diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/Enums/PhotoResolutionType.cs b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/Enums/PhotoResolutionType.cs similarity index 93% rename from src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/Enums/PhotoResolutionType.cs rename to src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/Enums/PhotoResolutionType.cs index e9b4d17..db35593 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/Enums/PhotoResolutionType.cs +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/Enums/PhotoResolutionType.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace JT808.Protocol.Extensions.JTActiveSafety.Enums +namespace JT808.Protocol.Extensions.SuBiao.Enums { /// /// 拍照分辨率 diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/Enums/USBIDType.cs b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/Enums/USBIDType.cs similarity index 91% rename from src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/Enums/USBIDType.cs rename to src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/Enums/USBIDType.cs index 79b6b9f..ff497af 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/Enums/USBIDType.cs +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/Enums/USBIDType.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace JT808.Protocol.Extensions.JTActiveSafety.Enums +namespace JT808.Protocol.Extensions.SuBiao.Enums { /// /// USB编号类型 diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/Enums/VideoRecordingResolutionType.cs b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/Enums/VideoRecordingResolutionType.cs similarity index 93% rename from src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/Enums/VideoRecordingResolutionType.cs rename to src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/Enums/VideoRecordingResolutionType.cs index 3d4026f..3a4eae4 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/Enums/VideoRecordingResolutionType.cs +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/Enums/VideoRecordingResolutionType.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace JT808.Protocol.Extensions.JTActiveSafety.Enums +namespace JT808.Protocol.Extensions.SuBiao.Enums { /// /// 视频录制分辨率 diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/Enums/WorkingConditionType.cs b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/Enums/WorkingConditionType.cs similarity index 92% rename from src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/Enums/WorkingConditionType.cs rename to src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/Enums/WorkingConditionType.cs index 724ae2d..4af463d 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/Enums/WorkingConditionType.cs +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/Enums/WorkingConditionType.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace JT808.Protocol.Extensions.JTActiveSafety.Enums +namespace JT808.Protocol.Extensions.SuBiao.Enums { /// /// 工作状态 diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/JT808.Protocol.Extensions.JTActiveSafety.csproj b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/JT808.Protocol.Extensions.SuBiao.csproj similarity index 75% rename from src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/JT808.Protocol.Extensions.JTActiveSafety.csproj rename to src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/JT808.Protocol.Extensions.SuBiao.csproj index 74c224c..7dfc5f3 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/JT808.Protocol.Extensions.JTActiveSafety.csproj +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/JT808.Protocol.Extensions.SuBiao.csproj @@ -1,11 +1,11 @@  - JT808.Protocol.Extensions.JTActiveSafety - JT808.Protocol.Extensions.JTActiveSafety + JT808.Protocol.Extensions.SuBiao + JT808.Protocol.Extensions.SuBiao 基于JT808协议、GB808协议扩展的主动安全消息协议(苏标) 基于JT808协议、GB808协议扩展的主动安全消息协议(苏标) - JT808.Protocol.Extensions.JTActiveSafety.xml + JT808.Protocol.Extensions.SuBiao.xml diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/JT808.Protocol.Extensions.SuBiao.xml b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/JT808.Protocol.Extensions.SuBiao.xml new file mode 100644 index 0000000..4dfa134 --- /dev/null +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/JT808.Protocol.Extensions.SuBiao.xml @@ -0,0 +1,2028 @@ + + + + JT808.Protocol.Extensions.SuBiao + + + + + 添加苏标-主动安全 + + + + + 添加苏标-主动安全 + + + + + + + 主动拍照策略 + + + + + 不开启 + + + + + 定时拍照 + + + + + 定距拍照 + + + + + 保留 + + + + + 不修改参数 + + + + + 主动安全消息Id + + + + + 报警附件信息消息 + + + + + 文件信息上传 + + + + + 文件上传完成消息 + + + + + 报警附件上传指令 + + + + + 文件上传完成消息应答 + + + + + 拍照分辨率 + + + + + 352x288 + + + + + 704x288 + + + + + 704x576 + + + + + 640x480 + + + + + 1280x720 + + + + + 1920x1080 + + + + + 不修改参数 + + + + + USB编号类型 + + + + + 高级驾驶辅助系统 + + + + + 驾驶员状态监控系统 + + + + + 轮胎气压监测系统 + + + + + 盲点监测系统 + + + + + 视频录制分辨率 + + + + + CIF + + + + + HD1 + + + + + D1 + + + + + WD1 + + + + + VGA + + + + + 720P + + + + + 1080P + + + + + 不修改参数 + + + + + 工作状态 + + + + + 正常工作 + + + + + 待机状态 + + + + + 升级维护 + + + + + 设备异常 + + + + + 断开连接 + + + + + 主动安全常量 + + + + + 附加信息ID 高级驾驶辅助系统报警信息 + + + + + 附加信息ID 驾驶员状态监测系统报警信息 + + + + + 附加信息ID 胎压监测系统报警信息 + + + + + 附加信息ID 盲区监测系统报警信息 + + + + + 高级驾驶辅助系统参数设置 + + + + + 驾驶员状态监测系统参数设置 + + + + + 胎压监测系统参数设置 + + + + + 盲区监测系统参数设置 + + + + + 状态查询 + + + + + 信息查询 + + + + + 高级驾驶辅助系统报警信息 + + + + + 高级驾驶辅助系统报警信息Id + + + + + 高级驾驶辅助系统报警信息附加长度 + + + + + 报警ID + + + + + 标志状态 + + + + + 报警/事件类型 + + + + + 报警/事件类型 + + + + + 前车车速 + + + + + 前车/行人距离 + + + + + 偏离类型 + + + + + 道路标志识别类型 + + + + + 道路标志识别类型 + + + + + 车速 + + + + + 高程 + + + + + 纬度 + + + + + 经度 + + + + + 日期时间 + YYMMDDhhmmss + BCD[6] + + + + + 车辆状态 + + + + + 报警标识号 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 驾驶员状态监测系统报警信息 + + + + + 驾驶员状态监测系统报警信息Id + + + + + 驾驶员状态监测系统报警信息长度 + + + + + 报警ID + + + + + 标志状态 + + + + + 报警/事件类型 + + + + + 报警级别 + + + + + 疲劳程度 + + + + + 预留 + + + + + 车速 + + + + + 高程 + + + + + 纬度 + + + + + 经度 + + + + + 日期时间 + YYMMDDhhmmss + BCD[6] + + + + + 车辆状态 + + + + + 报警标识号 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 胎压监测系统报警信息 + + + + + 胎压监测系统报警信息Id + + + + + 胎压监测系统报警信息长度 + + + + + 报警ID + + + + + 标志状态 + + + + + 车速 + + + + + 高程 + + + + + 纬度 + + + + + 经度 + + + + + 日期时间 + YYMMDDhhmmss + BCD[6] + + + + + 车辆状态 + + + + + 报警标识号 + + + + + 报警/事件列表总数 + + + + + 报警/事件信息列表 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 盲区监测系统报警信息 + + + + + 盲区监测系统报警信息Id + + + + + 盲区监测系统报警信息长度 + + + + + 报警ID + + + + + 标志状态 + + + + + 报警/事件类型 + + + + + 报警/事件类型 + + + + + 车速 + + + + + 高程 + + + + + 纬度 + + + + + 经度 + + + + + 日期时间 + YYMMDDhhmmss + BCD[6] + + + + + 车辆状态 + + + + + 报警标识号 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 透传数据 + + + + + 透传类型 + + + + + 消息列表总数 + + + + + 消息列表数据 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 透传数据 + + + + + 透传类型 + + + + + 消息列表总数 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 报警附件信息消息 + + + + + 终端ID + 7 个字节，由大写字母和数字组成，此终端ID 由制造商自行定义，位数不足时，后补“0x00” + + + + + 报警标识号 + + + + + 平台给报警分配的唯一编号 + 32 + + + + + 信息类型 + 0x00：正常报警文件信息 + 0x01：补传报警文件信息 + + + + + 附件数量 + + + + + 附件信息列表 + + + + + 报警附件信息消息Id + + + + + 报警附件信息消息 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 文件信息上传 + + + + + 文件信息上传 + + + + + 文件名称长度 + + + + + 文件名称 + 形如：文件类型_通道号_报警类型_序号_报警编号.后缀名 + + + + + 文件类型 + + + + + 文件大小 + + + + + 文件信息上传Id + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 文件上传完成消息 + + + + + 文件上传完成消息 + + + + + 文件名称长度 + + + + + 文件名称 + 形如：文件类型_通道号_报警类型_序号_报警编号.后缀名 + + + + + 文件类型 + + + + + 文件大小 + + + + + 文件上传完成消息 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 高级驾驶辅助系统参数 + + + + + 高级驾驶辅助系统参数 + + + + + 高级驾驶辅助系统参数长度 + + + + + 报警判断速度阈值 + + + + + 报警提示音量 + + + + + 主动拍照策略 + + + + + + 主动定时拍照时间间隔 + + + + + 主动定距拍照距离间隔 + + + + + 单次主动拍照张数 + + + + + 单次主动拍照时间间隔 + + + + + 拍照分辨率 + + + + + + 视频录制分辨率 + + + + + 报警使能 + + + + + 事件使能 + + + + + 预留字段 + + + + + 障碍物报警距离阈值 + + + + + 障碍物报警分级速度阈值 + + + + + 障碍物报警前后视频录制时间 + + + + + 障碍物报警拍照张数 + + + + + 障碍物报警拍照间隔 + + + + + 频繁变道报警判断时间段 + + + + + 频繁变道报警判断次数 + + + + + 频繁变道报警分级速度阈值 + + + + + 频繁变道报警前后视频录制时间 + + + + + 频繁变道报警拍照张数 + + + + + 频繁变道报警拍照间隔 + + + + + 车道偏离报警分级速度阈值 + + + + + 车道偏离报警前后视频录制时间 + + + + + 车道偏离报警拍照张数 + + + + + 车道偏离报警拍照间隔 + + + + + 前向碰撞报警时间阈值 + + + + + 前向碰撞报警分级速度阈值 + + + + + 前向碰撞报警前后视频录制时间 + + + + + 前向碰撞报警拍照张数 + + + + + 前向碰撞报警拍照间隔 + + + + + 行人碰撞报警时间阈值 + + + + + 行人碰撞报警使能速度阈值 + + + + + 行人碰撞报警前后视频录制时间 + + + + + 行人碰撞报警拍照张数 + + + + + 行人碰撞报警拍照间隔 + + + + + 车距监控报警距离阈值 + + + + + 车距监控报警分级速度阈值 + + + + + 车距过近报警前后视频录制时间 + + + + + 车距过近报警拍照张数 + + + + + 车距过近报警拍照间隔 + + + + + 道路标志识别拍照张数 + + + + + 道路标志识别拍照间隔 + + + + + 保留字段 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 驾驶员状态监测系统参数 + + + + + 驾驶员状态监测系统参数 + + + + + 驾驶员状态监测系统参数长度 + + + + + 报警判断速度阈值 + + + + + 报警提示音量 + + + + + 主动拍照策略 + + + + + 主动定时拍照时间间隔 + + + + + 主动定距拍照距离间隔 + + + + + 单次主动拍照张数 + + + + + 单次主动拍照时间间隔 + + + + + 拍照分辨率 + + + + + 视频录制分辨率 + + + + + 报警使能 + + + + + 事件使能 + + + + + 吸烟报警判断时间间隔 + + + + + 接打电话报警判断时间间隔 + + + + + 预留字段 + + + + + 疲劳驾驶报警分级速度阈值 + + + + + 疲劳驾驶报警前后视频录制时间 + + + + + 疲劳驾驶报警拍照张数 + + + + + 疲劳驾驶报警拍照间隔时间 + + + + + 接打电话报警分级速度阈值 + + + + + 接打电话报警前后视频录制时间 + + + + + 接打电话报警拍驾驶员面部特征照片张数 + + + + + 接打电话报警拍驾驶员面部特征照片间隔时间 + + + + + 抽烟报警分级车速阈值 + + + + + 抽烟报警前后视频录制时间 + + + + + 抽烟报警拍驾驶员面部特征照片张数 + + + + + 抽烟报警拍驾驶员面部特征照片间隔时间 + + + + + 分神驾驶报警分级车速阈值 + + + + + 分神驾驶报警拍照张数 + + + + + 分神驾驶报警拍照间隔时间 + + + + + 驾驶行为异常视频录制时间 + + + + + 驾驶行为异常抓拍照片张数 + + + + + 驾驶行为异常拍照间隔 + + + + + 驾驶员身份识别触发 + + + + + 保留字段 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 胎压监测系统参数 + + + + + 胎压监测系统参数Id + + + + + 胎压监测系统参数长度 + + + + + 轮胎规格型号 12位 + + + + + 胎压单位 + + + + + 正常胎压值 + + + + + 胎压不平衡门限 + + + + + 慢漏气门限 + + + + + 低压阈值 + + + + + 高压阈值 + + + + + 高温阈值 + + + + + 电压阈值 + + + + + 定时上报时间间隔 + + + + + 保留项 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 盲区监测系统参数 + + + + + 盲区监测系统参数Id + + + + + 盲区监测系统参数长度 + + + + + 后方接近报警时间阈值 + + + + + 侧后方接近报警时间阈值 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 查询基本信息 + + + + + 查询基本信息类型 + + + + + 外设ID列表总数 + + + + + 外设ID + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 查询基本信息 + + + + + 查询基本信息透传类型 + + + + + 外设ID列表总数 + + + + + 外设ID + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 报警附件上传指令 + + + + + Description + + + + + 服务IP地址长度 + + + + + 服务IP地址 + + + + + TCP端口 + + + + + UDP端口 + + + + + 报警标识号 + + + + + 平台给报警分配的唯一编号 + 32 + + + + + 预留 + + + + + 报警附件上传指令Id + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 文件上传完成消息应答 + + + + + 文件上传完成消息应答 + + + + + 文件名称长度 + + + + + 文件名称 + + + + + 文件类型 + + + + + 上传结果 + + + + + 补传数据包数量 + 需要补传的数据包数量，无补传时该值为0 + + + + + 补传数据包列表 + + + + + 文件上传完成消息应答Id + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 报警标识号 + + + + + 终端ID + + + + + YY-MM-DD-hh-mm-ss + BCD[6] + + + + + 序号 + + + + + 附件数量 + + + + + 预留 + + + + + 胎压监测系统报警/事件信息 + + + + + 胎压报警位置 + + + + + 报警/事件类型 + + + + + 胎压 + + + + + 胎温 + + + + + 电池电量 + + + + + 附件信息 + + + + + 文件名称长度 + + + + + 文件名称 + 形如：文件类型_通道号_报警类型_序号_报警编号.后缀名 + + + + + 文件大小 + + + + + 补传数据包信息 + + + + + 数据偏移量 + + + + + 数据长度 + + + + + + + + + + 外设ID + + + + + + 消息长度 + + + + + 工作状态 + + + + + + 报警状态 + + + + + + + + + + 外设ID + + + + + + 消息长度 + + + + + 公司名称长度 + + + + + 公司名称 + + + + + 产品型号长度 + + + + + 产品型号 + + + + + 硬件版本号长度 + + + + + 硬件版本号 + ASCII + + + + + 软件版本号长度 + + + + + 软件版本号 + ASCII + + + + + 设备ID长度 + + + + + 设备ID + + + + + 客户代码长度 + + + + + 客户代码 + + + + diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/JT808_JTActiveSafety_Constants.cs b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/JT808_SuBiao_Constants.cs similarity index 93% rename from src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/JT808_JTActiveSafety_Constants.cs rename to src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/JT808_SuBiao_Constants.cs index 9b8a148..a66350d 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/JT808_JTActiveSafety_Constants.cs +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/JT808_SuBiao_Constants.cs @@ -2,12 +2,12 @@ using System.Collections.Generic; using System.Text; -namespace JT808.Protocol.Extensions.JTActiveSafety +namespace JT808.Protocol.Extensions.SuBiao { /// /// 主动安全常量 /// - public static class JT808_JTActiveSafety_Constants + public static class JT808_SuBiao_Constants { /// /// 附加信息ID 高级驾驶辅助系统报警信息 diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/MessageBody/JT808_0x0200_0x64.cs b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/MessageBody/JT808_0x0200_0x64.cs similarity index 99% rename from src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/MessageBody/JT808_0x0200_0x64.cs rename to src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/MessageBody/JT808_0x0200_0x64.cs index 5f9c46f..beb9332 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/MessageBody/JT808_0x0200_0x64.cs +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/MessageBody/JT808_0x0200_0x64.cs @@ -1,4 +1,4 @@ -using JT808.Protocol.Extensions.JTActiveSafety.Metadata; +using JT808.Protocol.Extensions.SuBiao.Metadata; using JT808.Protocol.Formatters; using JT808.Protocol.Interfaces; using JT808.Protocol.MessageBody; @@ -8,7 +8,7 @@ using System.Collections.Generic; using System.Text; using System.Text.Json; -namespace JT808.Protocol.Extensions.JTActiveSafety.MessageBody +namespace JT808.Protocol.Extensions.SuBiao.MessageBody { /// /// 高级驾驶辅助系统报警信息 @@ -18,7 +18,7 @@ namespace JT808.Protocol.Extensions.JTActiveSafety.MessageBody /// /// 高级驾驶辅助系统报警信息Id /// - public override byte AttachInfoId { get; set; } = JT808_JTActiveSafety_Constants.JT808_0X0200_0x64; + public override byte AttachInfoId { get; set; } = JT808_SuBiao_Constants.JT808_0X0200_0x64; /// /// 高级驾驶辅助系统报警信息附加长度 /// diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/MessageBody/JT808_0x0200_0x65.cs b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/MessageBody/JT808_0x0200_0x65.cs similarity index 98% rename from src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/MessageBody/JT808_0x0200_0x65.cs rename to src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/MessageBody/JT808_0x0200_0x65.cs index 3d26d50..ef6efc2 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/MessageBody/JT808_0x0200_0x65.cs +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/MessageBody/JT808_0x0200_0x65.cs @@ -1,4 +1,4 @@ -using JT808.Protocol.Extensions.JTActiveSafety.Metadata; +using JT808.Protocol.Extensions.SuBiao.Metadata; using JT808.Protocol.Formatters; using JT808.Protocol.Interfaces; using JT808.Protocol.MessageBody; @@ -8,7 +8,7 @@ using System.Collections.Generic; using System.Text; using System.Text.Json; -namespace JT808.Protocol.Extensions.JTActiveSafety.MessageBody +namespace JT808.Protocol.Extensions.SuBiao.MessageBody { /// /// 驾驶员状态监测系统报警信息 @@ -18,7 +18,7 @@ namespace JT808.Protocol.Extensions.JTActiveSafety.MessageBody /// /// 驾驶员状态监测系统报警信息Id /// - public override byte AttachInfoId { get; set; } = JT808_JTActiveSafety_Constants.JT808_0X0200_0x65; + public override byte AttachInfoId { get; set; } = JT808_SuBiao_Constants.JT808_0X0200_0x65; /// /// 驾驶员状态监测系统报警信息长度 /// diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/MessageBody/JT808_0x0200_0x66.cs b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/MessageBody/JT808_0x0200_0x66.cs similarity index 98% rename from src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/MessageBody/JT808_0x0200_0x66.cs rename to src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/MessageBody/JT808_0x0200_0x66.cs index d42f267..cbce584 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/MessageBody/JT808_0x0200_0x66.cs +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/MessageBody/JT808_0x0200_0x66.cs @@ -1,4 +1,4 @@ -using JT808.Protocol.Extensions.JTActiveSafety.Metadata; +using JT808.Protocol.Extensions.SuBiao.Metadata; using JT808.Protocol.Formatters; using JT808.Protocol.Interfaces; using JT808.Protocol.MessageBody; @@ -8,7 +8,7 @@ using System.Collections.Generic; using System.Text; using System.Text.Json; -namespace JT808.Protocol.Extensions.JTActiveSafety.MessageBody +namespace JT808.Protocol.Extensions.SuBiao.MessageBody { /// /// 胎压监测系统报警信息 @@ -18,7 +18,7 @@ namespace JT808.Protocol.Extensions.JTActiveSafety.MessageBody /// /// 胎压监测系统报警信息Id /// - public override byte AttachInfoId { get; set; } = JT808_JTActiveSafety_Constants.JT808_0X0200_0x66; + public override byte AttachInfoId { get; set; } = JT808_SuBiao_Constants.JT808_0X0200_0x66; /// /// 胎压监测系统报警信息长度 /// diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/MessageBody/JT808_0x0200_0x67.cs b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/MessageBody/JT808_0x0200_0x67.cs similarity index 98% rename from src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/MessageBody/JT808_0x0200_0x67.cs rename to src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/MessageBody/JT808_0x0200_0x67.cs index b3c7568..118d285 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/MessageBody/JT808_0x0200_0x67.cs +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/MessageBody/JT808_0x0200_0x67.cs @@ -1,4 +1,4 @@ -using JT808.Protocol.Extensions.JTActiveSafety.Metadata; +using JT808.Protocol.Extensions.SuBiao.Metadata; using JT808.Protocol.Formatters; using JT808.Protocol.Interfaces; using JT808.Protocol.MessageBody; @@ -8,7 +8,7 @@ using System.Collections.Generic; using System.Text; using System.Text.Json; -namespace JT808.Protocol.Extensions.JTActiveSafety.MessageBody +namespace JT808.Protocol.Extensions.SuBiao.MessageBody { /// /// 盲区监测系统报警信息 @@ -18,7 +18,7 @@ namespace JT808.Protocol.Extensions.JTActiveSafety.MessageBody /// /// 盲区监测系统报警信息Id /// - public override byte AttachInfoId { get; set; } = JT808_JTActiveSafety_Constants.JT808_0X0200_0x67; + public override byte AttachInfoId { get; set; } = JT808_SuBiao_Constants.JT808_0X0200_0x67; /// /// 盲区监测系统报警信息长度 /// diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/MessageBody/JT808_0x0900_0xF7.cs b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/MessageBody/JT808_0x0900_0xF7.cs similarity index 96% rename from src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/MessageBody/JT808_0x0900_0xF7.cs rename to src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/MessageBody/JT808_0x0900_0xF7.cs index b4c9888..7966ba5 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/MessageBody/JT808_0x0900_0xF7.cs +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/MessageBody/JT808_0x0900_0xF7.cs @@ -1,5 +1,5 @@ -using JT808.Protocol.Extensions.JTActiveSafety.Enums; -using JT808.Protocol.Extensions.JTActiveSafety.Metadata; +using JT808.Protocol.Extensions.SuBiao.Enums; +using JT808.Protocol.Extensions.SuBiao.Metadata; using JT808.Protocol.Formatters; using JT808.Protocol.Interfaces; using JT808.Protocol.MessageBody; @@ -9,7 +9,7 @@ using System.Collections.Generic; using System.Text; using System.Text.Json; -namespace JT808.Protocol.Extensions.JTActiveSafety.MessageBody +namespace JT808.Protocol.Extensions.SuBiao.MessageBody { /// /// 透传数据 @@ -19,7 +19,7 @@ namespace JT808.Protocol.Extensions.JTActiveSafety.MessageBody /// /// 透传类型 /// - public override byte PassthroughType { get; set; } = JT808_JTActiveSafety_Constants.JT808_0X0900_0xF7; + public override byte PassthroughType { get; set; } = JT808_SuBiao_Constants.JT808_0X0900_0xF7; /// /// 消息列表总数 /// diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/MessageBody/JT808_0x0900_0xF8.cs b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/MessageBody/JT808_0x0900_0xF8.cs similarity index 98% rename from src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/MessageBody/JT808_0x0900_0xF8.cs rename to src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/MessageBody/JT808_0x0900_0xF8.cs index 6198167..0908fdf 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/MessageBody/JT808_0x0900_0xF8.cs +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/MessageBody/JT808_0x0900_0xF8.cs @@ -1,4 +1,4 @@ -using JT808.Protocol.Extensions.JTActiveSafety.Metadata; +using JT808.Protocol.Extensions.SuBiao.Metadata; using JT808.Protocol.Formatters; using JT808.Protocol.Interfaces; using JT808.Protocol.MessageBody; @@ -8,7 +8,7 @@ using System.Collections.Generic; using System.Text; using System.Text.Json; -namespace JT808.Protocol.Extensions.JTActiveSafety.MessageBody +namespace JT808.Protocol.Extensions.SuBiao.MessageBody { /// /// 透传数据 @@ -18,7 +18,7 @@ namespace JT808.Protocol.Extensions.JTActiveSafety.MessageBody /// /// 透传类型 /// - public override byte PassthroughType { get; set; } = JT808_JTActiveSafety_Constants.JT808_0X0900_0xF8; + public override byte PassthroughType { get; set; } = JT808_SuBiao_Constants.JT808_0X0900_0xF8; /// /// 消息列表总数 /// diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/MessageBody/JT808_0x1210.cs b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/MessageBody/JT808_0x1210.cs similarity index 98% rename from src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/MessageBody/JT808_0x1210.cs rename to src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/MessageBody/JT808_0x1210.cs index 6de33f1..fec8851 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/MessageBody/JT808_0x1210.cs +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/MessageBody/JT808_0x1210.cs @@ -1,4 +1,4 @@ -using JT808.Protocol.Extensions.JTActiveSafety.Metadata; +using JT808.Protocol.Extensions.SuBiao.Metadata; using JT808.Protocol.Formatters; using JT808.Protocol.Interfaces; using JT808.Protocol.MessagePack; @@ -7,7 +7,7 @@ using System.Collections.Generic; using System.Text; using System.Text.Json; -namespace JT808.Protocol.Extensions.JTActiveSafety.MessageBody +namespace JT808.Protocol.Extensions.SuBiao.MessageBody { /// /// 报警附件信息消息 diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/MessageBody/JT808_0x1211.cs b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/MessageBody/JT808_0x1211.cs similarity index 98% rename from src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/MessageBody/JT808_0x1211.cs rename to src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/MessageBody/JT808_0x1211.cs index 8f071f2..203968f 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/MessageBody/JT808_0x1211.cs +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/MessageBody/JT808_0x1211.cs @@ -3,7 +3,7 @@ using JT808.Protocol.Interfaces; using JT808.Protocol.MessagePack; using System.Text.Json; -namespace JT808.Protocol.Extensions.JTActiveSafety.MessageBody +namespace JT808.Protocol.Extensions.SuBiao.MessageBody { /// /// 文件信息上传 diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/MessageBody/JT808_0x1212.cs b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/MessageBody/JT808_0x1212.cs similarity index 98% rename from src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/MessageBody/JT808_0x1212.cs rename to src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/MessageBody/JT808_0x1212.cs index afbf5dd..858fb03 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/MessageBody/JT808_0x1212.cs +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/MessageBody/JT808_0x1212.cs @@ -3,7 +3,7 @@ using JT808.Protocol.Interfaces; using JT808.Protocol.MessagePack; using System.Text.Json; -namespace JT808.Protocol.Extensions.JTActiveSafety.MessageBody +namespace JT808.Protocol.Extensions.SuBiao.MessageBody { /// /// 文件上传完成消息 diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/MessageBody/JT808_0x8103_0xF364.cs b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/MessageBody/JT808_0x8103_0xF364.cs similarity index 98% rename from src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/MessageBody/JT808_0x8103_0xF364.cs rename to src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/MessageBody/JT808_0x8103_0xF364.cs index f5b2952..3c4d29e 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/MessageBody/JT808_0x8103_0xF364.cs +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/MessageBody/JT808_0x8103_0xF364.cs @@ -1,4 +1,4 @@ -using JT808.Protocol.Extensions.JTActiveSafety.Enums; +using JT808.Protocol.Extensions.SuBiao.Enums; using JT808.Protocol.Formatters; using JT808.Protocol.Interfaces; using JT808.Protocol.MessageBody; @@ -6,7 +6,7 @@ using JT808.Protocol.MessagePack; using System; using System.Text.Json; -namespace JT808.Protocol.Extensions.JTActiveSafety.MessageBody +namespace JT808.Protocol.Extensions.SuBiao.MessageBody { /// /// 高级驾驶辅助系统参数 @@ -16,7 +16,7 @@ namespace JT808.Protocol.Extensions.JTActiveSafety.MessageBody /// /// 高级驾驶辅助系统参数 /// - public override uint ParamId { get; set; } = JT808_JTActiveSafety_Constants.JT808_0X8103_0xF364; + public override uint ParamId { get; set; } = JT808_SuBiao_Constants.JT808_0X8103_0xF364; /// /// 高级驾驶辅助系统参数长度 /// @@ -31,7 +31,7 @@ namespace JT808.Protocol.Extensions.JTActiveSafety.MessageBody public byte WarningVolume { get; set; } /// /// 主动拍照策略 - /// + /// /// public byte ActivePhotographyStrategy { get; set; } /// @@ -52,7 +52,7 @@ namespace JT808.Protocol.Extensions.JTActiveSafety.MessageBody public byte SingleInitiativePhotosInterval { get; set; } /// /// 拍照分辨率 - /// + /// /// public byte PhotoResolution { get; set; } /// diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/MessageBody/JT808_0x8103_0xF365.cs b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/MessageBody/JT808_0x8103_0xF365.cs similarity index 99% rename from src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/MessageBody/JT808_0x8103_0xF365.cs rename to src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/MessageBody/JT808_0x8103_0xF365.cs index d082995..6113780 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/MessageBody/JT808_0x8103_0xF365.cs +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/MessageBody/JT808_0x8103_0xF365.cs @@ -1,4 +1,4 @@ -using JT808.Protocol.Extensions.JTActiveSafety.Enums; +using JT808.Protocol.Extensions.SuBiao.Enums; using JT808.Protocol.Formatters; using JT808.Protocol.Interfaces; using JT808.Protocol.MessageBody; @@ -6,7 +6,7 @@ using JT808.Protocol.MessagePack; using System; using System.Text.Json; -namespace JT808.Protocol.Extensions.JTActiveSafety.MessageBody +namespace JT808.Protocol.Extensions.SuBiao.MessageBody { /// /// 驾驶员状态监测系统参数 @@ -16,7 +16,7 @@ namespace JT808.Protocol.Extensions.JTActiveSafety.MessageBody /// /// 驾驶员状态监测系统参数 /// - public override uint ParamId { get; set; } = JT808_JTActiveSafety_Constants.JT808_0X8103_0xF365; + public override uint ParamId { get; set; } = JT808_SuBiao_Constants.JT808_0X8103_0xF365; /// /// 驾驶员状态监测系统参数长度 /// diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/MessageBody/JT808_0x8103_0xF366.cs b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/MessageBody/JT808_0x8103_0xF366.cs similarity index 97% rename from src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/MessageBody/JT808_0x8103_0xF366.cs rename to src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/MessageBody/JT808_0x8103_0xF366.cs index 649c5b2..d70f8b1 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/MessageBody/JT808_0x8103_0xF366.cs +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/MessageBody/JT808_0x8103_0xF366.cs @@ -4,7 +4,7 @@ using JT808.Protocol.MessageBody; using JT808.Protocol.MessagePack; using System.Text.Json; -namespace JT808.Protocol.Extensions.JTActiveSafety.MessageBody +namespace JT808.Protocol.Extensions.SuBiao.MessageBody { /// /// 胎压监测系统参数 @@ -14,7 +14,7 @@ namespace JT808.Protocol.Extensions.JTActiveSafety.MessageBody /// /// 胎压监测系统参数Id /// - public override uint ParamId { get; set; } = JT808_JTActiveSafety_Constants.JT808_0X8103_0xF366; + public override uint ParamId { get; set; } = JT808_SuBiao_Constants.JT808_0X8103_0xF366; /// /// 胎压监测系统参数长度 /// diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/MessageBody/JT808_0x8103_0xF367.cs b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/MessageBody/JT808_0x8103_0xF367.cs similarity index 95% rename from src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/MessageBody/JT808_0x8103_0xF367.cs rename to src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/MessageBody/JT808_0x8103_0xF367.cs index c8b0aab..772eb46 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/MessageBody/JT808_0x8103_0xF367.cs +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/MessageBody/JT808_0x8103_0xF367.cs @@ -4,7 +4,7 @@ using JT808.Protocol.MessageBody; using JT808.Protocol.MessagePack; using System.Text.Json; -namespace JT808.Protocol.Extensions.JTActiveSafety.MessageBody +namespace JT808.Protocol.Extensions.SuBiao.MessageBody { /// /// 盲区监测系统参数 @@ -14,7 +14,7 @@ namespace JT808.Protocol.Extensions.JTActiveSafety.MessageBody /// /// 盲区监测系统参数Id /// - public override uint ParamId { get; set; } = JT808_JTActiveSafety_Constants.JT808_0X8103_0xF367; + public override uint ParamId { get; set; } = JT808_SuBiao_Constants.JT808_0X8103_0xF367; /// /// 盲区监测系统参数长度 /// diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/MessageBody/JT808_0x8900_0xF7.cs b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/MessageBody/JT808_0x8900_0xF7.cs similarity index 96% rename from src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/MessageBody/JT808_0x8900_0xF7.cs rename to src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/MessageBody/JT808_0x8900_0xF7.cs index bede06a..48b8988 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/MessageBody/JT808_0x8900_0xF7.cs +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/MessageBody/JT808_0x8900_0xF7.cs @@ -5,7 +5,7 @@ using JT808.Protocol.MessagePack; using System.Collections.Generic; using System.Text.Json; -namespace JT808.Protocol.Extensions.JTActiveSafety.MessageBody +namespace JT808.Protocol.Extensions.SuBiao.MessageBody { /// /// 查询基本信息 @@ -15,7 +15,7 @@ namespace JT808.Protocol.Extensions.JTActiveSafety.MessageBody /// /// 查询基本信息类型 /// - public override byte PassthroughType { get; set; } = JT808_JTActiveSafety_Constants.JT808_0X0900_0xF7; + public override byte PassthroughType { get; set; } = JT808_SuBiao_Constants.JT808_0X0900_0xF7; /// /// 外设ID列表总数 /// diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/MessageBody/JT808_0x8900_0xF8.cs b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/MessageBody/JT808_0x8900_0xF8.cs similarity index 96% rename from src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/MessageBody/JT808_0x8900_0xF8.cs rename to src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/MessageBody/JT808_0x8900_0xF8.cs index b7514ac..ccadebb 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/MessageBody/JT808_0x8900_0xF8.cs +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/MessageBody/JT808_0x8900_0xF8.cs @@ -5,7 +5,7 @@ using JT808.Protocol.MessagePack; using System.Collections.Generic; using System.Text.Json; -namespace JT808.Protocol.Extensions.JTActiveSafety.MessageBody +namespace JT808.Protocol.Extensions.SuBiao.MessageBody { /// /// 查询基本信息 @@ -15,7 +15,7 @@ namespace JT808.Protocol.Extensions.JTActiveSafety.MessageBody /// /// 查询基本信息透传类型 /// - public override byte PassthroughType { get; set; } = JT808_JTActiveSafety_Constants.JT808_0X0900_0xF8; + public override byte PassthroughType { get; set; } = JT808_SuBiao_Constants.JT808_0X0900_0xF8; /// /// 外设ID列表总数 /// diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/MessageBody/JT808_0x9208.cs b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/MessageBody/JT808_0x9208.cs similarity index 98% rename from src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/MessageBody/JT808_0x9208.cs rename to src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/MessageBody/JT808_0x9208.cs index f34de32..3cebe1f 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/MessageBody/JT808_0x9208.cs +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/MessageBody/JT808_0x9208.cs @@ -1,11 +1,11 @@ -using JT808.Protocol.Extensions.JTActiveSafety.Metadata; +using JT808.Protocol.Extensions.SuBiao.Metadata; using JT808.Protocol.Formatters; using JT808.Protocol.Interfaces; using JT808.Protocol.MessagePack; using System; using System.Text.Json; -namespace JT808.Protocol.Extensions.JTActiveSafety.MessageBody +namespace JT808.Protocol.Extensions.SuBiao.MessageBody { /// /// 报警附件上传指令 diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/MessageBody/JT808_0x9212.cs b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/MessageBody/JT808_0x9212.cs similarity index 97% rename from src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/MessageBody/JT808_0x9212.cs rename to src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/MessageBody/JT808_0x9212.cs index a3a667d..1243c18 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/MessageBody/JT808_0x9212.cs +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/MessageBody/JT808_0x9212.cs @@ -1,11 +1,11 @@ -using JT808.Protocol.Extensions.JTActiveSafety.Metadata; +using JT808.Protocol.Extensions.SuBiao.Metadata; using JT808.Protocol.Formatters; using JT808.Protocol.Interfaces; using JT808.Protocol.MessagePack; using System.Collections.Generic; using System.Text.Json; -namespace JT808.Protocol.Extensions.JTActiveSafety.MessageBody +namespace JT808.Protocol.Extensions.SuBiao.MessageBody { /// /// 文件上传完成消息应答 diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/Metadata/AlarmIdentificationProperty.cs b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/Metadata/AlarmIdentificationProperty.cs similarity index 92% rename from src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/Metadata/AlarmIdentificationProperty.cs rename to src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/Metadata/AlarmIdentificationProperty.cs index 085ccb0..907b094 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/Metadata/AlarmIdentificationProperty.cs +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/Metadata/AlarmIdentificationProperty.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace JT808.Protocol.Extensions.JTActiveSafety.Metadata +namespace JT808.Protocol.Extensions.SuBiao.Metadata { /// /// 报警标识号 diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/Metadata/AlarmOrEventProperty.cs b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/Metadata/AlarmOrEventProperty.cs similarity index 93% rename from src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/Metadata/AlarmOrEventProperty.cs rename to src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/Metadata/AlarmOrEventProperty.cs index 91977cb..8f1c6bc 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/Metadata/AlarmOrEventProperty.cs +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/Metadata/AlarmOrEventProperty.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace JT808.Protocol.Extensions.JTActiveSafety.Metadata +namespace JT808.Protocol.Extensions.SuBiao.Metadata { /// /// 胎压监测系统报警/事件信息 diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/Metadata/AttachProperty.cs b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/Metadata/AttachProperty.cs similarity index 91% rename from src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/Metadata/AttachProperty.cs rename to src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/Metadata/AttachProperty.cs index 516c8e3..b90dffe 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/Metadata/AttachProperty.cs +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/Metadata/AttachProperty.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace JT808.Protocol.Extensions.JTActiveSafety.Metadata +namespace JT808.Protocol.Extensions.SuBiao.Metadata { /// /// 附件信息 diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/Metadata/DataPackageProperty.cs b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/Metadata/DataPackageProperty.cs similarity index 87% rename from src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/Metadata/DataPackageProperty.cs rename to src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/Metadata/DataPackageProperty.cs index f336dc2..b0012b6 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/Metadata/DataPackageProperty.cs +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/Metadata/DataPackageProperty.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace JT808.Protocol.Extensions.JTActiveSafety.Metadata +namespace JT808.Protocol.Extensions.SuBiao.Metadata { /// /// 补传数据包信息 diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/Metadata/JT808_0x0900_0xF7_USB.cs b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/Metadata/JT808_0x0900_0xF7_USB.cs similarity index 72% rename from src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/Metadata/JT808_0x0900_0xF7_USB.cs rename to src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/Metadata/JT808_0x0900_0xF7_USB.cs index 1f2f6de..30e2001 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/Metadata/JT808_0x0900_0xF7_USB.cs +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/Metadata/JT808_0x0900_0xF7_USB.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace JT808.Protocol.Extensions.JTActiveSafety.Metadata +namespace JT808.Protocol.Extensions.SuBiao.Metadata { /// /// @@ -11,7 +11,7 @@ namespace JT808.Protocol.Extensions.JTActiveSafety.Metadata { /// /// 外设ID - /// + /// /// public byte USBID { get; set; } /// @@ -20,7 +20,7 @@ namespace JT808.Protocol.Extensions.JTActiveSafety.Metadata public byte MessageLength { get; set; } /// /// 工作状态 - /// + /// /// public byte WorkingCondition { get; set; } /// diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/Metadata/JT808_0x0900_0xF8_USB.cs b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/Metadata/JT808_0x0900_0xF8_USB.cs similarity index 93% rename from src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/Metadata/JT808_0x0900_0xF8_USB.cs rename to src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/Metadata/JT808_0x0900_0xF8_USB.cs index 611538d..d7e3af2 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JTActiveSafety/Metadata/JT808_0x0900_0xF8_USB.cs +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/Metadata/JT808_0x0900_0xF8_USB.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace JT808.Protocol.Extensions.JTActiveSafety.Metadata +namespace JT808.Protocol.Extensions.SuBiao.Metadata { /// /// @@ -11,7 +11,7 @@ namespace JT808.Protocol.Extensions.JTActiveSafety.Metadata { /// /// 外设ID - /// + /// /// public byte USBID { get; set; } /// diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.YueBiao/DependencyInjectionExtensions.cs b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.YueBiao/DependencyInjectionExtensions.cs index 9bb8a39..919f2ec 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.YueBiao/DependencyInjectionExtensions.cs +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.YueBiao/DependencyInjectionExtensions.cs @@ -8,12 +8,13 @@ using System.Text; namespace JT808.Protocol.Extensions.YueBiao { /// - /// 粤标扩展 + /// 添加粤标-主动安全 + /// JT/T808-2019 /// public static class DependencyInjectionExtensions { /// - /// 添加粤标扩展 + /// 添加粤标-主动安全 /// /// /// diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.YueBiao/JT808.Protocol.Extensions.YueBiao.csproj b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.YueBiao/JT808.Protocol.Extensions.YueBiao.csproj index 1467982..65bd7e6 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.YueBiao/JT808.Protocol.Extensions.YueBiao.csproj +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.YueBiao/JT808.Protocol.Extensions.YueBiao.csproj @@ -3,8 +3,8 @@ JT808.Protocol.Extensions.YueBiao JT808.Protocol.Extensions.YueBiao - 基于JT808协议、GB808协议扩展的粤标消息协议 - 基于JT808协议、GB808协议扩展的粤标消息协议 + 基于JT808协议、GB808协议扩展的主动安全消息协议(粤标) + 基于JT808协议、GB808协议扩展的主动安全消息协议(粤标) JT808.Protocol.Extensions.YueBiao.xml diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.YueBiao/JT808.Protocol.Extensions.YueBiao.xml b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.YueBiao/JT808.Protocol.Extensions.YueBiao.xml index a379e70..7d9fbee 100644 --- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.YueBiao/JT808.Protocol.Extensions.YueBiao.xml +++ b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.YueBiao/JT808.Protocol.Extensions.YueBiao.xml @@ -6,12 +6,13 @@ - 粤标扩展 + 添加粤标-主动安全 + JT/T808-2019 - 添加粤标扩展 + 添加粤标-主动安全 diff --git a/src/JT808.Protocol.sln b/src/JT808.Protocol.sln index 2821047..ab8a56c 100644 --- a/src/JT808.Protocol.sln +++ b/src/JT808.Protocol.sln @@ -10,6 +10,7 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{E6296ADE-B239-4A4B-ACDA-B80C0A61399B}" ProjectSection(SolutionItems) = preProject .editorconfig = .editorconfig + ..\.github\workflows\dotnetcore.yml = ..\.github\workflows\dotnetcore.yml Info.props = Info.props ..\README.md = ..\README.md EndProjectSection @@ -22,14 +23,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JT808.Protocol.Extensions.J EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JT808.Protocol.Extensions.JT1078.Test", "JT808.Protocol.Extensions\JT808.Protocol.Extensions.JT1078.Test\JT808.Protocol.Extensions.JT1078.Test.csproj", "{852751C5-9069-4B2D-9489-C3AB1A8C6EAD}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JT808.Protocol.Extensions.JTActiveSafety", "JT808.Protocol.Extensions\JT808.Protocol.Extensions.JTActiveSafety\JT808.Protocol.Extensions.JTActiveSafety.csproj", "{FDCB70AD-6F3D-4A48-9DB9-46D969C088FF}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JT808.Protocol.Extensions.JTActiveSafety.Test", "JT808.Protocol.Extensions\JT808.Protocol.Extensions.JTActiveSafety.Test\JT808.Protocol.Extensions.JTActiveSafety.Test.csproj", "{A9625B48-BD87-45B1-9881-2A9F32B21B07}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JT808.Protocol.Extensions.YueBiao", "JT808.Protocol.Extensions\JT808.Protocol.Extensions.YueBiao\JT808.Protocol.Extensions.YueBiao.csproj", "{DFFAA83E-43ED-44F8-8F3D-1E692F090184}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JT808.Protocol.Extensions.YueBiao.Test", "JT808.Protocol.Extensions\JT808.Protocol.Extensions.YueBiao.Test\JT808.Protocol.Extensions.YueBiao.Test.csproj", "{4984E375-4B55-4188-A94E-844B694BBA5C}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JT808.Protocol.Extensions.SuBiao", "JT808.Protocol.Extensions\JT808.Protocol.Extensions.SuBiao\JT808.Protocol.Extensions.SuBiao.csproj", "{001ECBA0-CF17-40B0-B983-B7AE824B8050}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JT808.Protocol.Extensions.SuBiao.Test", "JT808.Protocol.Extensions\JT808.Protocol.Extensions.SuBiao.Test\JT808.Protocol.Extensions.SuBiao.Test.csproj", "{BEE2E12D-C123-4682-AB7E-210C2BF564B3}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -56,14 +57,6 @@ Global {852751C5-9069-4B2D-9489-C3AB1A8C6EAD}.Debug|Any CPU.Build.0 = Debug|Any CPU {852751C5-9069-4B2D-9489-C3AB1A8C6EAD}.Release|Any CPU.ActiveCfg = Release|Any CPU {852751C5-9069-4B2D-9489-C3AB1A8C6EAD}.Release|Any CPU.Build.0 = Release|Any CPU - {FDCB70AD-6F3D-4A48-9DB9-46D969C088FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FDCB70AD-6F3D-4A48-9DB9-46D969C088FF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FDCB70AD-6F3D-4A48-9DB9-46D969C088FF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FDCB70AD-6F3D-4A48-9DB9-46D969C088FF}.Release|Any CPU.Build.0 = Release|Any CPU - {A9625B48-BD87-45B1-9881-2A9F32B21B07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A9625B48-BD87-45B1-9881-2A9F32B21B07}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A9625B48-BD87-45B1-9881-2A9F32B21B07}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A9625B48-BD87-45B1-9881-2A9F32B21B07}.Release|Any CPU.Build.0 = Release|Any CPU {DFFAA83E-43ED-44F8-8F3D-1E692F090184}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {DFFAA83E-43ED-44F8-8F3D-1E692F090184}.Debug|Any CPU.Build.0 = Debug|Any CPU {DFFAA83E-43ED-44F8-8F3D-1E692F090184}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -72,6 +65,14 @@ Global {4984E375-4B55-4188-A94E-844B694BBA5C}.Debug|Any CPU.Build.0 = Debug|Any CPU {4984E375-4B55-4188-A94E-844B694BBA5C}.Release|Any CPU.ActiveCfg = Release|Any CPU {4984E375-4B55-4188-A94E-844B694BBA5C}.Release|Any CPU.Build.0 = Release|Any CPU + {001ECBA0-CF17-40B0-B983-B7AE824B8050}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {001ECBA0-CF17-40B0-B983-B7AE824B8050}.Debug|Any CPU.Build.0 = Debug|Any CPU + {001ECBA0-CF17-40B0-B983-B7AE824B8050}.Release|Any CPU.ActiveCfg = Release|Any CPU + {001ECBA0-CF17-40B0-B983-B7AE824B8050}.Release|Any CPU.Build.0 = Release|Any CPU + {BEE2E12D-C123-4682-AB7E-210C2BF564B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BEE2E12D-C123-4682-AB7E-210C2BF564B3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BEE2E12D-C123-4682-AB7E-210C2BF564B3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BEE2E12D-C123-4682-AB7E-210C2BF564B3}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -79,10 +80,10 @@ Global GlobalSection(NestedProjects) = preSolution {8A18863F-44AB-4779-A501-D15C97205EA9} = {3A0EEA9A-9667-4386-BB46-4A9CB319CE30} {852751C5-9069-4B2D-9489-C3AB1A8C6EAD} = {3A0EEA9A-9667-4386-BB46-4A9CB319CE30} - {FDCB70AD-6F3D-4A48-9DB9-46D969C088FF} = {3A0EEA9A-9667-4386-BB46-4A9CB319CE30} - {A9625B48-BD87-45B1-9881-2A9F32B21B07} = {3A0EEA9A-9667-4386-BB46-4A9CB319CE30} {DFFAA83E-43ED-44F8-8F3D-1E692F090184} = {3A0EEA9A-9667-4386-BB46-4A9CB319CE30} {4984E375-4B55-4188-A94E-844B694BBA5C} = {3A0EEA9A-9667-4386-BB46-4A9CB319CE30} + {001ECBA0-CF17-40B0-B983-B7AE824B8050} = {3A0EEA9A-9667-4386-BB46-4A9CB319CE30} + {BEE2E12D-C123-4682-AB7E-210C2BF564B3} = {3A0EEA9A-9667-4386-BB46-4A9CB319CE30} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {D58CCAA8-ED94-4048-A6DE-55A84814DF17}