Переглянути джерело

修复主动安全0x0200附加信息中的0x67

tags/v2.6.2
yedajiang44 1 рік тому
джерело
коміт
a55ca026c0
3 змінених файлів з 3 додано та 28 видалено
  1. +3
    -5
      src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao.Test/JT808_0x0200_0x67_Test.cs
  2. +0
    -5
      src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/JT808.Protocol.Extensions.SuBiao.xml
  3. +0
    -18
      src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/MessageBody/JT808_0x0200_0x67.cs

+ 3
- 5
src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao.Test/JT808_0x0200_0x67_Test.cs Переглянути файл

@@ -46,7 +46,6 @@ namespace JT808.Protocol.Extensions.SuBiao.Test
},
AlarmTime = Convert.ToDateTime("2019-12-11 18:31:00"),
Altitude = 7,
AlarmLevel=8,
AlarmOrEventType=9,
FlagState = 12,
Latitude = 13,
@@ -55,12 +54,12 @@ namespace JT808.Protocol.Extensions.SuBiao.Test
VehicleState = 19
});
var hex = JT808Serializer.Serialize(jT808UploadLocationRequest).ToHexString();
Assert.Equal("000000010000000200BA7F0E07E4F11C0028003C0000180715101010672A000000010C09081100070000000D0000000E191211183100001334343434343434191210183100030200", hex);
Assert.Equal("000000010000000200BA7F0E07E4F11C0028003C00001807151010106729000000010C091100070000000D0000000E191211183100001334343434343434191210183100030200", hex);
}
[Fact]
public void Deserialize()
{
var jT808UploadLocationRequest = JT808Serializer.Deserialize<JT808_0x0200>("000000010000000200BA7F0E07E4F11C0028003C0000180715101010672A000000010C09081100070000000D0000000E191211183100001334343434343434191210183100030200".ToHexBytes());
var jT808UploadLocationRequest = JT808Serializer.Deserialize<JT808_0x0200>("000000010000000200BA7F0E07E4F11C0028003C00001807151010106729000000010C091100070000000D0000000E191211183100001334343434343434191210183100030200".ToHexBytes());
jT808UploadLocationRequest.CustomLocationAttachData.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);
@@ -70,10 +69,9 @@ namespace JT808.Protocol.Extensions.SuBiao.Test
Assert.Equal(Convert.ToDateTime("2019-12-10 18:31:00"), jT808_0X0200_0X67.AlarmIdentification.Time);
Assert.Equal(Convert.ToDateTime("2019-12-11 18:31:00"), jT808_0X0200_0X67.AlarmTime);
Assert.Equal(7, jT808_0X0200_0X67.Altitude);
Assert.Equal(8, jT808_0X0200_0X67.AlarmLevel);
Assert.Equal(9, jT808_0X0200_0X67.AlarmOrEventType);
Assert.Equal(0x67, jT808_0X0200_0X67.AttachInfoId);
Assert.Equal(42, jT808_0X0200_0X67.AttachInfoLength);
Assert.Equal(41, jT808_0X0200_0X67.AttachInfoLength);
Assert.Equal(12, jT808_0X0200_0X67.FlagState);
Assert.Equal(13, jT808_0X0200_0X67.Latitude);
Assert.Equal(14, jT808_0X0200_0X67.Longitude);


+ 0
- 5
src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/JT808.Protocol.Extensions.SuBiao.xml Переглянути файл

@@ -657,11 +657,6 @@
报警/事件类型
</summary>
</member>
<member name="P:JT808.Protocol.Extensions.SuBiao.MessageBody.JT808_0x0200_0x67.AlarmLevel">
<summary>
报警/事件类型
</summary>
</member>
<member name="P:JT808.Protocol.Extensions.SuBiao.MessageBody.JT808_0x0200_0x67.Speed">
<summary>
车速


+ 0
- 18
src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao/MessageBody/JT808_0x0200_0x67.cs Переглянути файл

@@ -36,10 +36,6 @@ namespace JT808.Protocol.Extensions.SuBiao.MessageBody
/// </summary>
public byte AlarmOrEventType { get; set; }
/// <summary>
/// 报警/事件类型
/// </summary>
public byte AlarmLevel { get; set; }
/// <summary>
/// 车速
/// </summary>
public byte Speed { get; set; }
@@ -158,18 +154,6 @@ namespace JT808.Protocol.Extensions.SuBiao.MessageBody
break;
}
writer.WriteNumber($"[{value.AlarmOrEventType.ReadNumber()}]报警_事件类型-{alarmOrEventTypeString}", value.AlarmOrEventType);
value.AlarmLevel = reader.ReadByte();
string alarmLevelString = "未知";
switch (value.AlarmLevel)
{
case 0x01:
alarmLevelString = "一级报警";
break;
case 0x02:
alarmLevelString = "二级报警";
break;
}
writer.WriteNumber($"[{value.AlarmLevel.ReadNumber()}]报警级别-{alarmLevelString}", value.AlarmLevel);
value.Speed = reader.ReadByte();
writer.WriteNumber($"[{value.Speed.ReadNumber()}]车速", value.Speed);
value.Altitude = reader.ReadUInt16();
@@ -228,7 +212,6 @@ namespace JT808.Protocol.Extensions.SuBiao.MessageBody
value.AlarmId = reader.ReadUInt32();
value.FlagState = reader.ReadByte();
value.AlarmOrEventType = reader.ReadByte();
value.AlarmLevel = reader.ReadByte();
value.Speed = reader.ReadByte();
value.Altitude = reader.ReadUInt16();
value.Latitude = (int)reader.ReadUInt32();
@@ -258,7 +241,6 @@ namespace JT808.Protocol.Extensions.SuBiao.MessageBody
writer.WriteUInt32(value.AlarmId);
writer.WriteByte(value.FlagState);
writer.WriteByte(value.AlarmOrEventType);
writer.WriteByte(value.AlarmLevel);
writer.WriteByte(value.Speed);
writer.WriteUInt16(value.Altitude);
writer.WriteUInt32((uint)value.Latitude);


Завантаження…
Відмінити
Зберегти