浏览代码

修改各个对象属性为英文属性并附上对应英文描述(2)

tags/v2.5.0
SmallChi(Koike) 3 年前
父节点
当前提交
94a9a82bc8
共有 39 个文件被更改,包括 314 次插入182 次删除
  1. +2
    -2
      src/JT808.Protocol.Benchmark/JT808SerializerContext.cs
  2. +2
    -2
      src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.YueBiao.Test/JT808_0x1FC4_Test.cs
  3. +4
    -4
      src/JT808.Protocol.Test/MessageBody/JT808_0x0108Test.cs
  4. +2
    -2
      src/JT808.Protocol.Test/MessageBody/JT808_0x0200Test.cs
  5. +6
    -6
      src/JT808.Protocol.Test/MessageBody/JT808_0x0608Test.cs
  6. +4
    -4
      src/JT808.Protocol.Test/MessageBody/JT808_0x0801Test.cs
  7. +8
    -8
      src/JT808.Protocol.Test/MessageBody/JT808_0x0802Test.cs
  8. +2
    -2
      src/JT808.Protocol.Test/MessageBody/JT808_0x8001Test.cs
  9. +6
    -6
      src/JT808.Protocol.Test/MessageBody/JT808_0x8100Test.cs
  10. +2
    -2
      src/JT808.Protocol.Test/MessageBody/JT808_0x8108Test.cs
  11. +6
    -6
      src/JT808.Protocol.Test/MessageBody/JT808_0x8401Test.cs
  12. +4
    -4
      src/JT808.Protocol.Test/MessageBody/JT808_0x8600Test.cs
  13. +2
    -2
      src/JT808.Protocol.Test/MessageBody/JT808_0x8602Test.cs
  14. +2
    -2
      src/JT808.Protocol.Test/MessageBody/JT808_0x8604Test.cs
  15. +2
    -2
      src/JT808.Protocol.Test/MessageBody/JT808_0x8802Test.cs
  16. +4
    -4
      src/JT808.Protocol.Test/MessageBody/JT808_0x8803Test.cs
  17. +4
    -4
      src/JT808.Protocol.Test/MessageBody/JT808_0x8804Test.cs
  18. +2
    -2
      src/JT808.Protocol.Test/MessageBody/JT808_0x8805Test.cs
  19. +1
    -1
      src/JT808.Protocol.Test/Simples/Demo16.cs
  20. +5
    -2
      src/JT808.Protocol/Enums/JT808IOStatus.cs
  21. +1
    -0
      src/JT808.Protocol/Enums/JT808MultimediaCodingFormat.cs
  22. +5
    -2
      src/JT808.Protocol/Enums/JT808MultimediaDeleted.cs
  23. +7
    -3
      src/JT808.Protocol/Enums/JT808MultimediaType.cs
  24. +4
    -3
      src/JT808.Protocol/Enums/JT808PhoneNumberType.cs
  25. +11
    -5
      src/JT808.Protocol/Enums/JT808PlatformResult.cs
  26. +10
    -5
      src/JT808.Protocol/Enums/JT808PositionType.cs
  27. +6
    -3
      src/JT808.Protocol/Enums/JT808RecordCmd.cs
  28. +5
    -2
      src/JT808.Protocol/Enums/JT808RecordSave.cs
  29. +7
    -3
      src/JT808.Protocol/Enums/JT808SettingProperty.cs
  30. +10
    -5
      src/JT808.Protocol/Enums/JT808SettingTelephoneBook.cs
  31. +7
    -3
      src/JT808.Protocol/Enums/JT808TelephoneBookContactType.cs
  32. +11
    -5
      src/JT808.Protocol/Enums/JT808TerminalRegisterResult.cs
  33. +1
    -0
      src/JT808.Protocol/Enums/JT808TerminalResult.cs
  34. +15
    -7
      src/JT808.Protocol/Enums/JT808UpgradeResult.cs
  35. +15
    -7
      src/JT808.Protocol/Enums/JT808UpgradeType.cs
  36. +1
    -0
      src/JT808.Protocol/Enums/JT808Version.cs
  37. +121
    -55
      src/JT808.Protocol/JT808.Protocol.xml
  38. +4
    -4
      src/JT808.Protocol/MessageBody/JT808_0x0200_0x11.cs
  39. +3
    -3
      src/JT808.Protocol/MessageBody/JT808_0x8100.cs

+ 2
- 2
src/JT808.Protocol.Benchmark/JT808SerializerContext.cs 查看文件

@@ -77,12 +77,12 @@ namespace JT808.Protocol.Benchmark
jT808UploadLocationRequest.BasicLocationAttachData.Add(JT808Constants.JT808_0x0200_0x11, new JT808_0x0200_0x11 jT808UploadLocationRequest.BasicLocationAttachData.Add(JT808Constants.JT808_0x0200_0x11, new JT808_0x0200_0x11
{ {
AreaId=1, AreaId=1,
JT808PositionType= Enums.JT808PositionType.圆形区域
JT808PositionType= Enums.JT808PositionType.circular_region
}); });
jT808UploadLocationRequest.BasicLocationAttachData.Add(JT808Constants.JT808_0x0200_0x12, new JT808_0x0200_0x12 jT808UploadLocationRequest.BasicLocationAttachData.Add(JT808Constants.JT808_0x0200_0x12, new JT808_0x0200_0x12
{ {
AreaId = 1, AreaId = 1,
JT808PositionType = Enums.JT808PositionType.圆形区域,
JT808PositionType = Enums.JT808PositionType.circular_region,
Direction= Enums.JT808DirectionType.direction_out Direction= Enums.JT808DirectionType.direction_out
}); });
jT808UploadLocationRequest.BasicLocationAttachData.Add(JT808Constants.JT808_0x0200_0x13, new JT808_0x0200_0x13 jT808UploadLocationRequest.BasicLocationAttachData.Add(JT808Constants.JT808_0x0200_0x13, new JT808_0x0200_0x13


+ 2
- 2
src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.YueBiao.Test/JT808_0x1FC4_Test.cs 查看文件

@@ -27,7 +27,7 @@ namespace JT808.Protocol.Extensions.YueBiao.Test
ErrorCode=1, ErrorCode=1,
MsgNum=2, MsgNum=2,
UpgradeStatus= Enums.JT808UpgradeStatus.固件下载中, UpgradeStatus= Enums.JT808UpgradeStatus.固件下载中,
UpgradeType= Protocol.Enums.JT808UpgradeType.北斗卫星定位模块,
UpgradeType= Protocol.Enums.JT808UpgradeType.beidou_module,
UploadProgress=3 UploadProgress=3
}; };
var hex = JT808Serializer.Serialize(jT808UploadLocationRequest).ToHexString(); var hex = JT808Serializer.Serialize(jT808UploadLocationRequest).ToHexString();
@@ -40,7 +40,7 @@ namespace JT808.Protocol.Extensions.YueBiao.Test
Assert.Equal(1, jT808UploadLocationRequest.ErrorCode); Assert.Equal(1, jT808UploadLocationRequest.ErrorCode);
Assert.Equal(2, jT808UploadLocationRequest.MsgNum); Assert.Equal(2, jT808UploadLocationRequest.MsgNum);
Assert.Equal(Enums.JT808UpgradeStatus.固件下载中, jT808UploadLocationRequest.UpgradeStatus); Assert.Equal(Enums.JT808UpgradeStatus.固件下载中, jT808UploadLocationRequest.UpgradeStatus);
Assert.Equal(Protocol.Enums.JT808UpgradeType.北斗卫星定位模块, jT808UploadLocationRequest.UpgradeType);
Assert.Equal(Protocol.Enums.JT808UpgradeType.beidou_module, jT808UploadLocationRequest.UpgradeType);
Assert.Equal(3, jT808UploadLocationRequest.UploadProgress); Assert.Equal(3, jT808UploadLocationRequest.UploadProgress);
} }
[Fact] [Fact]


+ 4
- 4
src/JT808.Protocol.Test/MessageBody/JT808_0x0108Test.cs 查看文件

@@ -13,8 +13,8 @@ namespace JT808.Protocol.Test.MessageBody
{ {
JT808_0x0108 jT808_0X0108 = new JT808_0x0108 JT808_0x0108 jT808_0X0108 = new JT808_0x0108
{ {
UpgradeType = JT808UpgradeType.北斗卫星定位模块,
UpgradeResult = JT808UpgradeResult.成功
UpgradeType = JT808UpgradeType.beidou_module,
UpgradeResult = JT808UpgradeResult.success
}; };
string hex = JT808Serializer.Serialize(jT808_0X0108).ToHexString(); string hex = JT808Serializer.Serialize(jT808_0X0108).ToHexString();
Assert.Equal("3400", hex); Assert.Equal("3400", hex);
@@ -25,8 +25,8 @@ namespace JT808.Protocol.Test.MessageBody
{ {
byte[] bytes = "34 00".ToHexBytes(); byte[] bytes = "34 00".ToHexBytes();
JT808_0x0108 jT808_0X0108 = JT808Serializer.Deserialize<JT808_0x0108>(bytes); JT808_0x0108 jT808_0X0108 = JT808Serializer.Deserialize<JT808_0x0108>(bytes);
Assert.Equal(JT808UpgradeResult.成功, jT808_0X0108.UpgradeResult);
Assert.Equal(JT808UpgradeType.北斗卫星定位模块, jT808_0X0108.UpgradeType);
Assert.Equal(JT808UpgradeResult.success, jT808_0X0108.UpgradeResult);
Assert.Equal(JT808UpgradeType.beidou_module, jT808_0X0108.UpgradeType);
} }


[Fact] [Fact]


+ 2
- 2
src/JT808.Protocol.Test/MessageBody/JT808_0x0200Test.cs 查看文件

@@ -532,12 +532,12 @@ namespace JT808.Protocol.Test.MessageBody
jT808UploadLocationRequest.BasicLocationAttachData.Add(JT808Constants.JT808_0x0200_0x11, new JT808_0x0200_0x11 jT808UploadLocationRequest.BasicLocationAttachData.Add(JT808Constants.JT808_0x0200_0x11, new JT808_0x0200_0x11
{ {
AreaId = 1, AreaId = 1,
JT808PositionType = Enums.JT808PositionType.圆形区域
JT808PositionType = Enums.JT808PositionType.circular_region
}); });
jT808UploadLocationRequest.BasicLocationAttachData.Add(JT808Constants.JT808_0x0200_0x12, new JT808_0x0200_0x12 jT808UploadLocationRequest.BasicLocationAttachData.Add(JT808Constants.JT808_0x0200_0x12, new JT808_0x0200_0x12
{ {
AreaId = 1, AreaId = 1,
JT808PositionType = Enums.JT808PositionType.圆形区域,
JT808PositionType = Enums.JT808PositionType.circular_region,
Direction = Enums.JT808DirectionType.direction_out Direction = Enums.JT808DirectionType.direction_out
}); });
jT808UploadLocationRequest.BasicLocationAttachData.Add(JT808Constants.JT808_0x0200_0x13, new JT808_0x0200_0x13 jT808UploadLocationRequest.BasicLocationAttachData.Add(JT808Constants.JT808_0x0200_0x13, new JT808_0x0200_0x13


+ 6
- 6
src/JT808.Protocol.Test/MessageBody/JT808_0x0608Test.cs 查看文件

@@ -70,7 +70,7 @@ namespace JT808.Protocol.Test.MessageBody
AreaName="SmallChi" AreaName="SmallChi"
} }
}, },
SettingAreaProperty= JT808SettingProperty.追加区域.ToByteValue()
SettingAreaProperty= JT808SettingProperty.append_region.ToByteValue()
} }
} }
}; };
@@ -86,7 +86,7 @@ namespace JT808.Protocol.Test.MessageBody
Assert.Equal(1, value.QueryType); Assert.Equal(1, value.QueryType);
Assert.Equal(1u, value.Count); Assert.Equal(1u, value.Count);
var jT808_0X8600 = value.JT808_0x8600s[0]; var jT808_0X8600 = value.JT808_0x8600s[0];
Assert.Equal(JT808SettingProperty.追加区域.ToByteValue(), jT808_0X8600.SettingAreaProperty);
Assert.Equal(JT808SettingProperty.append_region.ToByteValue(), jT808_0X8600.SettingAreaProperty);
Assert.Equal(1, jT808_0X8600.AreaCount); Assert.Equal(1, jT808_0X8600.AreaCount);
var item0 = jT808_0X8600.AreaItems[0]; var item0 = jT808_0X8600.AreaItems[0];
Assert.Equal((uint)1522, item0.AreaId); Assert.Equal((uint)1522, item0.AreaId);
@@ -136,7 +136,7 @@ namespace JT808.Protocol.Test.MessageBody
AreaName="smallchi" AreaName="smallchi"
} }
}, },
SettingAreaProperty= JT808SettingProperty.追加区域.ToByteValue()
SettingAreaProperty= JT808SettingProperty.append_region.ToByteValue()
} }
} }
}; };
@@ -152,7 +152,7 @@ namespace JT808.Protocol.Test.MessageBody
Assert.Equal(2, value.QueryType); Assert.Equal(2, value.QueryType);
Assert.Equal(1u, value.Count); Assert.Equal(1u, value.Count);
var jT808_0X8602 = value.JT808_0x8602s[0]; var jT808_0X8602 = value.JT808_0x8602s[0];
Assert.Equal(JT808SettingProperty.追加区域.ToByteValue(), jT808_0X8602.SettingAreaProperty);
Assert.Equal(JT808SettingProperty.append_region.ToByteValue(), jT808_0X8602.SettingAreaProperty);
Assert.Equal(1, jT808_0X8602.AreaCount); Assert.Equal(1, jT808_0X8602.AreaCount);
var item0 = jT808_0X8602.AreaItems[0]; var item0 = jT808_0X8602.AreaItems[0];
Assert.Equal((uint)1522, item0.AreaId); Assert.Equal((uint)1522, item0.AreaId);
@@ -186,7 +186,7 @@ namespace JT808.Protocol.Test.MessageBody
{ {
new JT808_0x8604 new JT808_0x8604
{ AreaId = 1234, { AreaId = 1234,
AreaProperty = JT808SettingProperty.追加区域.ToByteValue(),
AreaProperty = JT808SettingProperty.append_region.ToByteValue(),
StartTime = DateTime.Parse("2020-01-07 00:00:12"), StartTime = DateTime.Parse("2020-01-07 00:00:12"),
EndTime = DateTime.Parse("2020-01-07 00:00:13"), EndTime = DateTime.Parse("2020-01-07 00:00:13"),
HighestSpeed = 62, HighestSpeed = 62,
@@ -222,7 +222,7 @@ namespace JT808.Protocol.Test.MessageBody
Assert.Equal(1u, value.Count); Assert.Equal(1u, value.Count);
var jT808_0X8604 = value.JT808_0x8604s[0]; var jT808_0X8604 = value.JT808_0x8604s[0];
Assert.Equal((uint)1234, jT808_0X8604.AreaId); Assert.Equal((uint)1234, jT808_0X8604.AreaId);
Assert.Equal(JT808SettingProperty.追加区域.ToByteValue(), jT808_0X8604.AreaProperty);
Assert.Equal(JT808SettingProperty.append_region.ToByteValue(), jT808_0X8604.AreaProperty);
Assert.Null(jT808_0X8604.HighestSpeed); Assert.Null(jT808_0X8604.HighestSpeed);
Assert.Null(jT808_0X8604.OverspeedDuration); Assert.Null(jT808_0X8604.OverspeedDuration);
Assert.Equal(DateTime.Parse("2020-01-07 00:00:12"), jT808_0X8604.StartTime); Assert.Equal(DateTime.Parse("2020-01-07 00:00:12"), jT808_0X8604.StartTime);


+ 4
- 4
src/JT808.Protocol.Test/MessageBody/JT808_0x0801Test.cs 查看文件

@@ -30,7 +30,7 @@ namespace JT808.Protocol.Test.MessageBody
EventItemCoding = JT808EventItemCoding.regular_action.ToByteValue(), EventItemCoding = JT808EventItemCoding.regular_action.ToByteValue(),
MultimediaCodingFormat = JT808MultimediaCodingFormat.JPEG.ToByteValue(), MultimediaCodingFormat = JT808MultimediaCodingFormat.JPEG.ToByteValue(),
MultimediaId = 2567, MultimediaId = 2567,
MultimediaType = JT808MultimediaType.图像.ToByteValue(),
MultimediaType = JT808MultimediaType.image.ToByteValue(),
MultimediaDataPackage = new byte[] { 0x01, 0x02, 0x03, 0x04 }, MultimediaDataPackage = new byte[] { 0x01, 0x02, 0x03, 0x04 },
Position = new JT808_0x0200 Position = new JT808_0x0200
{ {
@@ -57,7 +57,7 @@ namespace JT808.Protocol.Test.MessageBody
Assert.Equal(JT808EventItemCoding.regular_action.ToByteValue(), jT808_0X0801.EventItemCoding); Assert.Equal(JT808EventItemCoding.regular_action.ToByteValue(), jT808_0X0801.EventItemCoding);
Assert.Equal(JT808MultimediaCodingFormat.JPEG.ToByteValue(), jT808_0X0801.MultimediaCodingFormat); Assert.Equal(JT808MultimediaCodingFormat.JPEG.ToByteValue(), jT808_0X0801.MultimediaCodingFormat);
Assert.Equal((uint)2567, jT808_0X0801.MultimediaId); Assert.Equal((uint)2567, jT808_0X0801.MultimediaId);
Assert.Equal(JT808MultimediaType.图像.ToByteValue(), jT808_0X0801.MultimediaType);
Assert.Equal(JT808MultimediaType.image.ToByteValue(), jT808_0X0801.MultimediaType);
Assert.Equal(new byte[] { 0x01, 0x02, 0x03, 0x04 }, jT808_0X0801.MultimediaDataPackage); Assert.Equal(new byte[] { 0x01, 0x02, 0x03, 0x04 }, jT808_0X0801.MultimediaDataPackage);
Assert.Equal((uint)1, jT808_0X0801.Position.AlarmFlag); Assert.Equal((uint)1, jT808_0X0801.Position.AlarmFlag);
Assert.Equal(40, jT808_0X0801.Position.Altitude); Assert.Equal(40, jT808_0X0801.Position.Altitude);
@@ -107,7 +107,7 @@ namespace JT808.Protocol.Test.MessageBody
EventItemCoding = JT808EventItemCoding.regular_action.ToByteValue(), EventItemCoding = JT808EventItemCoding.regular_action.ToByteValue(),
MultimediaCodingFormat = JT808MultimediaCodingFormat.JPEG.ToByteValue(), MultimediaCodingFormat = JT808MultimediaCodingFormat.JPEG.ToByteValue(),
MultimediaId = 2567, MultimediaId = 2567,
MultimediaType = JT808MultimediaType.图像.ToByteValue(),
MultimediaType = JT808MultimediaType.image.ToByteValue(),
MultimediaDataPackage = new byte[] { 0x01, 0x02, 0x03, 0x04 } MultimediaDataPackage = new byte[] { 0x01, 0x02, 0x03, 0x04 }
}; };
string hex = JT808Serializer.Serialize(jT808_0X0801,JT808Version.JTT2011).ToHexString(); string hex = JT808Serializer.Serialize(jT808_0X0801,JT808Version.JTT2011).ToHexString();
@@ -123,7 +123,7 @@ namespace JT808.Protocol.Test.MessageBody
Assert.Equal(JT808EventItemCoding.regular_action.ToByteValue(), jT808_0X0801.EventItemCoding); Assert.Equal(JT808EventItemCoding.regular_action.ToByteValue(), jT808_0X0801.EventItemCoding);
Assert.Equal(JT808MultimediaCodingFormat.JPEG.ToByteValue(), jT808_0X0801.MultimediaCodingFormat); Assert.Equal(JT808MultimediaCodingFormat.JPEG.ToByteValue(), jT808_0X0801.MultimediaCodingFormat);
Assert.Equal((uint)2567, jT808_0X0801.MultimediaId); Assert.Equal((uint)2567, jT808_0X0801.MultimediaId);
Assert.Equal(JT808MultimediaType.图像.ToByteValue(), jT808_0X0801.MultimediaType);
Assert.Equal(JT808MultimediaType.image.ToByteValue(), jT808_0X0801.MultimediaType);
Assert.Equal(new byte[] { 0x01, 0x02, 0x03, 0x04 }, jT808_0X0801.MultimediaDataPackage); Assert.Equal(new byte[] { 0x01, 0x02, 0x03, 0x04 }, jT808_0X0801.MultimediaDataPackage);
} }




+ 8
- 8
src/JT808.Protocol.Test/MessageBody/JT808_0x0802Test.cs 查看文件

@@ -25,7 +25,7 @@ namespace JT808.Protocol.Test.MessageBody
ChannelId = 123, ChannelId = 123,
EventItemCoding = JT808EventItemCoding.regular_action.ToByteValue(), EventItemCoding = JT808EventItemCoding.regular_action.ToByteValue(),
MultimediaId = 258, MultimediaId = 258,
MultimediaType = JT808MultimediaType.图像.ToByteValue(),
MultimediaType = JT808MultimediaType.image.ToByteValue(),
Position = new JT808_0x0200() Position = new JT808_0x0200()
{ {
AlarmFlag = 1, AlarmFlag = 1,
@@ -44,7 +44,7 @@ namespace JT808.Protocol.Test.MessageBody
ChannelId = 124, ChannelId = 124,
EventItemCoding = JT808EventItemCoding.platform_delivery_order.ToByteValue(), EventItemCoding = JT808EventItemCoding.platform_delivery_order.ToByteValue(),
MultimediaId = 259, MultimediaId = 259,
MultimediaType = JT808MultimediaType.视频.ToByteValue(),
MultimediaType = JT808MultimediaType.video.ToByteValue(),
Position = new JT808_0x0200() Position = new JT808_0x0200()
{ {
AlarmFlag = 1, AlarmFlag = 1,
@@ -73,7 +73,7 @@ namespace JT808.Protocol.Test.MessageBody


Assert.Equal(123, jT808_0X0802.MultimediaSearchItems[0].ChannelId); Assert.Equal(123, jT808_0X0802.MultimediaSearchItems[0].ChannelId);
Assert.Equal(JT808EventItemCoding.regular_action.ToByteValue(), jT808_0X0802.MultimediaSearchItems[0].EventItemCoding); Assert.Equal(JT808EventItemCoding.regular_action.ToByteValue(), jT808_0X0802.MultimediaSearchItems[0].EventItemCoding);
Assert.Equal(JT808MultimediaType.图像.ToByteValue(), jT808_0X0802.MultimediaSearchItems[0].MultimediaType);
Assert.Equal(JT808MultimediaType.image.ToByteValue(), jT808_0X0802.MultimediaSearchItems[0].MultimediaType);
Assert.Equal((uint)258, jT808_0X0802.MultimediaSearchItems[0].MultimediaId); Assert.Equal((uint)258, jT808_0X0802.MultimediaSearchItems[0].MultimediaId);


Assert.Equal((uint)1, jT808_0X0802.MultimediaSearchItems[0].Position.AlarmFlag); Assert.Equal((uint)1, jT808_0X0802.MultimediaSearchItems[0].Position.AlarmFlag);
@@ -87,7 +87,7 @@ namespace JT808.Protocol.Test.MessageBody


Assert.Equal(124, jT808_0X0802.MultimediaSearchItems[1].ChannelId); Assert.Equal(124, jT808_0X0802.MultimediaSearchItems[1].ChannelId);
Assert.Equal(JT808EventItemCoding.platform_delivery_order.ToByteValue(), jT808_0X0802.MultimediaSearchItems[1].EventItemCoding); Assert.Equal(JT808EventItemCoding.platform_delivery_order.ToByteValue(), jT808_0X0802.MultimediaSearchItems[1].EventItemCoding);
Assert.Equal(JT808MultimediaType.视频.ToByteValue(), jT808_0X0802.MultimediaSearchItems[1].MultimediaType);
Assert.Equal(JT808MultimediaType.video.ToByteValue(), jT808_0X0802.MultimediaSearchItems[1].MultimediaType);
Assert.Equal((uint)259, jT808_0X0802.MultimediaSearchItems[1].MultimediaId); Assert.Equal((uint)259, jT808_0X0802.MultimediaSearchItems[1].MultimediaId);


Assert.Equal((uint)1, jT808_0X0802.MultimediaSearchItems[1].Position.AlarmFlag); Assert.Equal((uint)1, jT808_0X0802.MultimediaSearchItems[1].Position.AlarmFlag);
@@ -120,7 +120,7 @@ namespace JT808.Protocol.Test.MessageBody
{ {
ChannelId = 123, ChannelId = 123,
EventItemCoding = JT808EventItemCoding.regular_action.ToByteValue(), EventItemCoding = JT808EventItemCoding.regular_action.ToByteValue(),
MultimediaType = JT808MultimediaType.图像.ToByteValue(),
MultimediaType = JT808MultimediaType.image.ToByteValue(),
Position = new JT808_0x0200() Position = new JT808_0x0200()
{ {
AlarmFlag = 1, AlarmFlag = 1,
@@ -138,7 +138,7 @@ namespace JT808.Protocol.Test.MessageBody
{ {
ChannelId = 124, ChannelId = 124,
EventItemCoding = JT808EventItemCoding.platform_delivery_order.ToByteValue(), EventItemCoding = JT808EventItemCoding.platform_delivery_order.ToByteValue(),
MultimediaType = JT808MultimediaType.视频.ToByteValue(),
MultimediaType = JT808MultimediaType.video.ToByteValue(),
Position = new JT808_0x0200() Position = new JT808_0x0200()
{ {
AlarmFlag = 1, AlarmFlag = 1,
@@ -167,7 +167,7 @@ namespace JT808.Protocol.Test.MessageBody


Assert.Equal(123, jT808_0X0802.MultimediaSearchItems[0].ChannelId); Assert.Equal(123, jT808_0X0802.MultimediaSearchItems[0].ChannelId);
Assert.Equal(JT808EventItemCoding.regular_action.ToByteValue(), jT808_0X0802.MultimediaSearchItems[0].EventItemCoding); Assert.Equal(JT808EventItemCoding.regular_action.ToByteValue(), jT808_0X0802.MultimediaSearchItems[0].EventItemCoding);
Assert.Equal(JT808MultimediaType.图像.ToByteValue(), jT808_0X0802.MultimediaSearchItems[0].MultimediaType);
Assert.Equal(JT808MultimediaType.image.ToByteValue(), jT808_0X0802.MultimediaSearchItems[0].MultimediaType);


Assert.Equal((uint)1, jT808_0X0802.MultimediaSearchItems[0].Position.AlarmFlag); Assert.Equal((uint)1, jT808_0X0802.MultimediaSearchItems[0].Position.AlarmFlag);
Assert.Equal((ushort)40, jT808_0X0802.MultimediaSearchItems[0].Position.Altitude); Assert.Equal((ushort)40, jT808_0X0802.MultimediaSearchItems[0].Position.Altitude);
@@ -180,7 +180,7 @@ namespace JT808.Protocol.Test.MessageBody


Assert.Equal(124, jT808_0X0802.MultimediaSearchItems[1].ChannelId); Assert.Equal(124, jT808_0X0802.MultimediaSearchItems[1].ChannelId);
Assert.Equal(JT808EventItemCoding.platform_delivery_order.ToByteValue(), jT808_0X0802.MultimediaSearchItems[1].EventItemCoding); Assert.Equal(JT808EventItemCoding.platform_delivery_order.ToByteValue(), jT808_0X0802.MultimediaSearchItems[1].EventItemCoding);
Assert.Equal(JT808MultimediaType.视频.ToByteValue(), jT808_0X0802.MultimediaSearchItems[1].MultimediaType);
Assert.Equal(JT808MultimediaType.video.ToByteValue(), jT808_0X0802.MultimediaSearchItems[1].MultimediaType);


Assert.Equal((uint)1, jT808_0X0802.MultimediaSearchItems[1].Position.AlarmFlag); Assert.Equal((uint)1, jT808_0X0802.MultimediaSearchItems[1].Position.AlarmFlag);
Assert.Equal((ushort)40, jT808_0X0802.MultimediaSearchItems[1].Position.Altitude); Assert.Equal((ushort)40, jT808_0X0802.MultimediaSearchItems[1].Position.Altitude);


+ 2
- 2
src/JT808.Protocol.Test/MessageBody/JT808_0x8001Test.cs 查看文件

@@ -21,7 +21,7 @@ namespace JT808.Protocol.Test.MessageBody
Bodies = new JT808_0x8001 Bodies = new JT808_0x8001
{ {
AckMsgId = Enums.JT808MsgId.位置信息汇报.ToUInt16Value(), AckMsgId = Enums.JT808MsgId.位置信息汇报.ToUInt16Value(),
JT808PlatformResult = Enums.JT808PlatformResult.成功,
JT808PlatformResult = Enums.JT808PlatformResult.succeed,
MsgNum = 100 MsgNum = 100
} }
}; };
@@ -51,7 +51,7 @@ namespace JT808.Protocol.Test.MessageBody
JT808_0x8001 JT808Bodies = (JT808_0x8001)jT808Package.Bodies; JT808_0x8001 JT808Bodies = (JT808_0x8001)jT808Package.Bodies;
Assert.Equal(Enums.JT808MsgId.位置信息汇报.ToUInt16Value(), JT808Bodies.AckMsgId); Assert.Equal(Enums.JT808MsgId.位置信息汇报.ToUInt16Value(), JT808Bodies.AckMsgId);
Assert.Equal(100, JT808Bodies.MsgNum); Assert.Equal(100, JT808Bodies.MsgNum);
Assert.Equal(Enums.JT808PlatformResult.成功, JT808Bodies.JT808PlatformResult);
Assert.Equal(Enums.JT808PlatformResult.succeed, JT808Bodies.JT808PlatformResult);
} }


[Fact] [Fact]


+ 6
- 6
src/JT808.Protocol.Test/MessageBody/JT808_0x8100Test.cs 查看文件

@@ -21,7 +21,7 @@ namespace JT808.Protocol.Test.MessageBody
Bodies = new JT808_0x8100 Bodies = new JT808_0x8100
{ {
Code = "123456", Code = "123456",
JT808TerminalRegisterResult = Enums.JT808TerminalRegisterResult.成功,
JT808TerminalRegisterResult = Enums.JT808TerminalRegisterResult.success,
AckMsgNum = 100 AckMsgNum = 100
} }
}; };
@@ -51,7 +51,7 @@ namespace JT808.Protocol.Test.MessageBody
JT808_0x8100 JT808Bodies = (JT808_0x8100)jT808Package.Bodies; JT808_0x8100 JT808Bodies = (JT808_0x8100)jT808Package.Bodies;
Assert.Equal("123456", JT808Bodies.Code); Assert.Equal("123456", JT808Bodies.Code);
Assert.Equal(100, JT808Bodies.AckMsgNum); Assert.Equal(100, JT808Bodies.AckMsgNum);
Assert.Equal(Enums.JT808TerminalRegisterResult.成功, JT808Bodies.JT808TerminalRegisterResult);
Assert.Equal(Enums.JT808TerminalRegisterResult.success, JT808Bodies.JT808TerminalRegisterResult);
} }


[Fact] [Fact]
@@ -68,7 +68,7 @@ namespace JT808.Protocol.Test.MessageBody
Bodies = new JT808_0x8100 Bodies = new JT808_0x8100
{ {
Code = "123456", Code = "123456",
JT808TerminalRegisterResult = Enums.JT808TerminalRegisterResult.数据库中无该终端,
JT808TerminalRegisterResult = Enums.JT808TerminalRegisterResult.terminal_not_database,
AckMsgNum = 100 AckMsgNum = 100
} }
}; };
@@ -97,7 +97,7 @@ namespace JT808.Protocol.Test.MessageBody
JT808_0x8100 JT808Bodies = (JT808_0x8100)jT808Package.Bodies; JT808_0x8100 JT808Bodies = (JT808_0x8100)jT808Package.Bodies;
Assert.Null(JT808Bodies.Code); Assert.Null(JT808Bodies.Code);
Assert.Equal(100, JT808Bodies.AckMsgNum); Assert.Equal(100, JT808Bodies.AckMsgNum);
Assert.Equal(Enums.JT808TerminalRegisterResult.数据库中无该终端, JT808Bodies.JT808TerminalRegisterResult);
Assert.Equal(Enums.JT808TerminalRegisterResult.terminal_not_database, JT808Bodies.JT808TerminalRegisterResult);
} }




@@ -115,7 +115,7 @@ namespace JT808.Protocol.Test.MessageBody
Bodies = new JT808_0x8100 Bodies = new JT808_0x8100
{ {
Code = "zssdaf23124sfdsc", Code = "zssdaf23124sfdsc",
JT808TerminalRegisterResult = Enums.JT808TerminalRegisterResult.成功,
JT808TerminalRegisterResult = Enums.JT808TerminalRegisterResult.success,
AckMsgNum = 100 AckMsgNum = 100
} }
}; };
@@ -136,7 +136,7 @@ namespace JT808.Protocol.Test.MessageBody
JT808_0x8100 JT808Bodies = (JT808_0x8100)jT808Package.Bodies; JT808_0x8100 JT808Bodies = (JT808_0x8100)jT808Package.Bodies;
Assert.Equal("zssdaf23124sfdsc", JT808Bodies.Code); Assert.Equal("zssdaf23124sfdsc", JT808Bodies.Code);
Assert.Equal(100, JT808Bodies.AckMsgNum); Assert.Equal(100, JT808Bodies.AckMsgNum);
Assert.Equal(Enums.JT808TerminalRegisterResult.成功, JT808Bodies.JT808TerminalRegisterResult);
Assert.Equal(Enums.JT808TerminalRegisterResult.success, JT808Bodies.JT808TerminalRegisterResult);
} }


[Fact] [Fact]


+ 2
- 2
src/JT808.Protocol.Test/MessageBody/JT808_0x8108Test.cs 查看文件

@@ -13,7 +13,7 @@ namespace JT808.Protocol.Test.MessageBody
{ {
JT808_0x8108 jT808_0X8108 = new JT808_0x8108 JT808_0x8108 jT808_0X8108 = new JT808_0x8108
{ {
UpgradeType = JT808UpgradeType.北斗卫星定位模块,
UpgradeType = JT808UpgradeType.beidou_module,
MakerId = "asdfg", MakerId = "asdfg",
VersionNum = "qscvhiuytrew", VersionNum = "qscvhiuytrew",
UpgradePackage = new byte[] { 1, 2, 3, 4, 5 } UpgradePackage = new byte[] { 1, 2, 3, 4, 5 }
@@ -28,7 +28,7 @@ namespace JT808.Protocol.Test.MessageBody
{ {
byte[] bytes = "34 61 73 64 66 67 0C 71 73 63 76 68 69 75 79 74 72 65 77 00 00 00 05 01 02 03 04 05".ToHexBytes(); byte[] bytes = "34 61 73 64 66 67 0C 71 73 63 76 68 69 75 79 74 72 65 77 00 00 00 05 01 02 03 04 05".ToHexBytes();
JT808_0x8108 jT808_0X8108 = JT808Serializer.Deserialize<JT808_0x8108>(bytes); JT808_0x8108 jT808_0X8108 = JT808Serializer.Deserialize<JT808_0x8108>(bytes);
Assert.Equal(JT808UpgradeType.北斗卫星定位模块, jT808_0X8108.UpgradeType);
Assert.Equal(JT808UpgradeType.beidou_module, jT808_0X8108.UpgradeType);
Assert.Equal("asdfg", jT808_0X8108.MakerId); Assert.Equal("asdfg", jT808_0X8108.MakerId);
Assert.Equal("qscvhiuytrew", jT808_0X8108.VersionNum); Assert.Equal("qscvhiuytrew", jT808_0X8108.VersionNum);
Assert.Equal(new byte[] { 1, 2, 3, 4, 5 }, jT808_0X8108.UpgradePackage); Assert.Equal(new byte[] { 1, 2, 3, 4, 5 }, jT808_0X8108.UpgradePackage);


+ 6
- 6
src/JT808.Protocol.Test/MessageBody/JT808_0x8401Test.cs 查看文件

@@ -14,18 +14,18 @@ namespace JT808.Protocol.Test.MessageBody
{ {
JT808_0x8401 jT808_0X8401 = new JT808_0x8401 JT808_0x8401 jT808_0X8401 = new JT808_0x8401
{ {
SettingTelephoneBook = Enums.JT808SettingTelephoneBook.追加电话本
SettingTelephoneBook = Enums.JT808SettingTelephoneBook.append_phone_book
}; };
List<JT808ContactProperty> jT808ContactProperties = new List<JT808ContactProperty>(); List<JT808ContactProperty> jT808ContactProperties = new List<JT808ContactProperty>();
jT808ContactProperties.Add(new JT808ContactProperty jT808ContactProperties.Add(new JT808ContactProperty
{ {
TelephoneBookContactType= Enums.JT808TelephoneBookContactType.呼入,
TelephoneBookContactType= Enums.JT808TelephoneBookContactType.callin,
Contact="smallchi", Contact="smallchi",
PhoneNumber="13456smallch" PhoneNumber="13456smallch"
}); });
jT808ContactProperties.Add(new JT808ContactProperty jT808ContactProperties.Add(new JT808ContactProperty
{ {
TelephoneBookContactType = Enums.JT808TelephoneBookContactType.呼入_呼出,
TelephoneBookContactType = Enums.JT808TelephoneBookContactType.call_in_out,
Contact = "koike", Contact = "koike",
PhoneNumber = "koike123456" PhoneNumber = "koike123456"
}); });
@@ -40,15 +40,15 @@ namespace JT808.Protocol.Test.MessageBody
{ {
var bytes = "02 02 01 0C 31 33 34 35 36 73 6D 61 6C 6C 63 68 08 73 6D 61 6C 6C 63 68 69 03 0B 6B 6F 69 6B 65 31 32 33 34 35 36 05 6B 6F 69 6B 65".ToHexBytes(); var bytes = "02 02 01 0C 31 33 34 35 36 73 6D 61 6C 6C 63 68 08 73 6D 61 6C 6C 63 68 69 03 0B 6B 6F 69 6B 65 31 32 33 34 35 36 05 6B 6F 69 6B 65".ToHexBytes();
JT808_0x8401 jT808_0X8401 = JT808Serializer.Deserialize<JT808_0x8401>(bytes); JT808_0x8401 jT808_0X8401 = JT808Serializer.Deserialize<JT808_0x8401>(bytes);
Assert.Equal(Enums.JT808SettingTelephoneBook.追加电话本, jT808_0X8401.SettingTelephoneBook);
Assert.Equal(Enums.JT808SettingTelephoneBook.append_phone_book, jT808_0X8401.SettingTelephoneBook);
Assert.Equal(2, jT808_0X8401.ContactCount); Assert.Equal(2, jT808_0X8401.ContactCount);


Assert.Equal("13456smallch", jT808_0X8401.JT808ContactProperties[0].PhoneNumber); Assert.Equal("13456smallch", jT808_0X8401.JT808ContactProperties[0].PhoneNumber);
Assert.Equal(Enums.JT808TelephoneBookContactType.呼入, jT808_0X8401.JT808ContactProperties[0].TelephoneBookContactType);
Assert.Equal(Enums.JT808TelephoneBookContactType.callin, jT808_0X8401.JT808ContactProperties[0].TelephoneBookContactType);
Assert.Equal("smallchi", jT808_0X8401.JT808ContactProperties[0].Contact); Assert.Equal("smallchi", jT808_0X8401.JT808ContactProperties[0].Contact);


Assert.Equal("koike123456", jT808_0X8401.JT808ContactProperties[1].PhoneNumber); Assert.Equal("koike123456", jT808_0X8401.JT808ContactProperties[1].PhoneNumber);
Assert.Equal(Enums.JT808TelephoneBookContactType.呼入_呼出, jT808_0X8401.JT808ContactProperties[1].TelephoneBookContactType);
Assert.Equal(Enums.JT808TelephoneBookContactType.call_in_out, jT808_0X8401.JT808ContactProperties[1].TelephoneBookContactType);
Assert.Equal("koike", jT808_0X8401.JT808ContactProperties[1].Contact); Assert.Equal("koike", jT808_0X8401.JT808ContactProperties[1].Contact);


} }


+ 4
- 4
src/JT808.Protocol.Test/MessageBody/JT808_0x8600Test.cs 查看文件

@@ -16,7 +16,7 @@ namespace JT808.Protocol.Test.MessageBody
{ {
JT808_0x8600 jT808_0X8600 = new JT808_0x8600 JT808_0x8600 jT808_0X8600 = new JT808_0x8600
{ {
SettingAreaProperty = JT808SettingProperty.追加区域.ToByteValue(),
SettingAreaProperty = JT808SettingProperty.append_region.ToByteValue(),
AreaItems = new List<JT808CircleAreaProperty>() AreaItems = new List<JT808CircleAreaProperty>()
}; };
jT808_0X8600.AreaItems.Add(new JT808CircleAreaProperty jT808_0X8600.AreaItems.Add(new JT808CircleAreaProperty
@@ -66,7 +66,7 @@ namespace JT808.Protocol.Test.MessageBody
byte[] bytes = "01 03 00 00 05 F2 00 DE 07 5B CD 15 07 5B CD 15 00 00 00 C8 00 3C C8 00 00 05 F3 00 00 07 5B CD 15 07 5B CD 15 00 00 00 C8 00 00 05 F4 08 A3 07 5B CD 15 07 5B CD 15 00 00 00 C8 18 10 18 00 00 12 18 10 19 00 00 12 00 3C C8".ToHexBytes(); byte[] bytes = "01 03 00 00 05 F2 00 DE 07 5B CD 15 07 5B CD 15 00 00 00 C8 00 3C C8 00 00 05 F3 00 00 07 5B CD 15 07 5B CD 15 00 00 00 C8 00 00 05 F4 08 A3 07 5B CD 15 07 5B CD 15 00 00 00 C8 18 10 18 00 00 12 18 10 19 00 00 12 00 3C C8".ToHexBytes();
JT808_0x8600 jT808_0X8600 = JT808Serializer.Deserialize<JT808_0x8600>(bytes); JT808_0x8600 jT808_0X8600 = JT808Serializer.Deserialize<JT808_0x8600>(bytes);


Assert.Equal(JT808SettingProperty.追加区域.ToByteValue(), jT808_0X8600.SettingAreaProperty);
Assert.Equal(JT808SettingProperty.append_region.ToByteValue(), jT808_0X8600.SettingAreaProperty);
Assert.Equal(3, jT808_0X8600.AreaCount); Assert.Equal(3, jT808_0X8600.AreaCount);


var item0 = jT808_0X8600.AreaItems[0]; var item0 = jT808_0X8600.AreaItems[0];
@@ -118,7 +118,7 @@ namespace JT808.Protocol.Test.MessageBody
{ {
JT808_0x8600 jT808_0X8600 = new JT808_0x8600 JT808_0x8600 jT808_0X8600 = new JT808_0x8600
{ {
SettingAreaProperty = JT808SettingProperty.追加区域.ToByteValue(),
SettingAreaProperty = JT808SettingProperty.append_region.ToByteValue(),
AreaItems = new List<JT808CircleAreaProperty>() AreaItems = new List<JT808CircleAreaProperty>()
}; };
jT808_0X8600.AreaItems.Add(new JT808CircleAreaProperty jT808_0X8600.AreaItems.Add(new JT808CircleAreaProperty
@@ -146,7 +146,7 @@ namespace JT808.Protocol.Test.MessageBody
byte[] bytes = "0101000005F200DE075BCD15075BCD15000000C8003CC8029A0008536D616C6C436869".ToHexBytes(); byte[] bytes = "0101000005F200DE075BCD15075BCD15000000C8003CC8029A0008536D616C6C436869".ToHexBytes();
JT808_0x8600 jT808_0X8600 = JT808Serializer.Deserialize<JT808_0x8600>(bytes, JT808Version.JTT2019); JT808_0x8600 jT808_0X8600 = JT808Serializer.Deserialize<JT808_0x8600>(bytes, JT808Version.JTT2019);


Assert.Equal(JT808SettingProperty.追加区域.ToByteValue(), jT808_0X8600.SettingAreaProperty);
Assert.Equal(JT808SettingProperty.append_region.ToByteValue(), jT808_0X8600.SettingAreaProperty);
Assert.Equal(1, jT808_0X8600.AreaCount); Assert.Equal(1, jT808_0X8600.AreaCount);
var item0 = jT808_0X8600.AreaItems[0]; var item0 = jT808_0X8600.AreaItems[0];
Assert.Equal((uint)1522, item0.AreaId); Assert.Equal((uint)1522, item0.AreaId);


+ 2
- 2
src/JT808.Protocol.Test/MessageBody/JT808_0x8602Test.cs 查看文件

@@ -16,7 +16,7 @@ namespace JT808.Protocol.Test.MessageBody
{ {
JT808_0x8602 jT808_0X8602 = new JT808_0x8602 JT808_0x8602 jT808_0X8602 = new JT808_0x8602
{ {
SettingAreaProperty = JT808SettingProperty.追加区域.ToByteValue(),
SettingAreaProperty = JT808SettingProperty.append_region.ToByteValue(),
AreaItems = new List<JT808RectangleAreaProperty>() AreaItems = new List<JT808RectangleAreaProperty>()
}; };
jT808_0X8602.AreaItems.Add(new JT808RectangleAreaProperty jT808_0X8602.AreaItems.Add(new JT808RectangleAreaProperty
@@ -55,7 +55,7 @@ namespace JT808.Protocol.Test.MessageBody
byte[] bytes = "0102000005F200DE075BCD13075BCD12075BCD15075BCD14003CC8000005F3000A075BCCBE075BCCBF075BCCBC075BCCBD003CC8".ToHexBytes(); byte[] bytes = "0102000005F200DE075BCD13075BCD12075BCD15075BCD14003CC8000005F3000A075BCCBE075BCCBF075BCCBC075BCCBD003CC8".ToHexBytes();
JT808_0x8602 jT808_0X8602 = JT808Serializer.Deserialize<JT808_0x8602>(bytes); JT808_0x8602 jT808_0X8602 = JT808Serializer.Deserialize<JT808_0x8602>(bytes);


Assert.Equal(JT808SettingProperty.追加区域.ToByteValue(), jT808_0X8602.SettingAreaProperty);
Assert.Equal(JT808SettingProperty.append_region.ToByteValue(), jT808_0X8602.SettingAreaProperty);
Assert.Equal(2, jT808_0X8602.AreaCount); Assert.Equal(2, jT808_0X8602.AreaCount);


var item0 = jT808_0X8602.AreaItems[0]; var item0 = jT808_0X8602.AreaItems[0];


+ 2
- 2
src/JT808.Protocol.Test/MessageBody/JT808_0x8604Test.cs 查看文件

@@ -17,7 +17,7 @@ namespace JT808.Protocol.Test.MessageBody
JT808_0x8604 jT808_0X8604 = new JT808_0x8604 JT808_0x8604 jT808_0X8604 = new JT808_0x8604
{ {
AreaId = 1234, AreaId = 1234,
AreaProperty = JT808SettingProperty.追加区域.ToByteValue(),
AreaProperty = JT808SettingProperty.append_region.ToByteValue(),
StartTime = DateTime.Parse("2018-11-20 00:00:12"), StartTime = DateTime.Parse("2018-11-20 00:00:12"),
EndTime = DateTime.Parse("2018-11-21 00:00:12"), EndTime = DateTime.Parse("2018-11-21 00:00:12"),
HighestSpeed = 62, HighestSpeed = 62,
@@ -44,7 +44,7 @@ namespace JT808.Protocol.Test.MessageBody
byte[] bytes = "000004D200011811200000121811210000120002075BCD15075BCD14075BCCBC075BCCBD".ToHexBytes(); byte[] bytes = "000004D200011811200000121811210000120002075BCD15075BCD14075BCCBC075BCCBD".ToHexBytes();
JT808_0x8604 jT808_0X8604 = JT808Serializer.Deserialize<JT808_0x8604>(bytes); JT808_0x8604 jT808_0X8604 = JT808Serializer.Deserialize<JT808_0x8604>(bytes);
Assert.Equal((uint)1234, jT808_0X8604.AreaId); Assert.Equal((uint)1234, jT808_0X8604.AreaId);
Assert.Equal(JT808SettingProperty.追加区域.ToByteValue(), jT808_0X8604.AreaProperty);
Assert.Equal(JT808SettingProperty.append_region.ToByteValue(), jT808_0X8604.AreaProperty);
Assert.Null(jT808_0X8604.HighestSpeed); Assert.Null(jT808_0X8604.HighestSpeed);
Assert.Null(jT808_0X8604.OverspeedDuration); Assert.Null(jT808_0X8604.OverspeedDuration);




+ 2
- 2
src/JT808.Protocol.Test/MessageBody/JT808_0x8802Test.cs 查看文件

@@ -16,7 +16,7 @@ namespace JT808.Protocol.Test.MessageBody
{ {
ChannelId = 123, ChannelId = 123,
EventItemCoding = JT808EventItemCoding.collision_rollover_alarm_triggered.ToByteValue(), EventItemCoding = JT808EventItemCoding.collision_rollover_alarm_triggered.ToByteValue(),
MultimediaType = JT808MultimediaType.视频.ToByteValue(),
MultimediaType = JT808MultimediaType.video.ToByteValue(),
StartTime = DateTime.Parse("2018-11-16 21:00:08"), StartTime = DateTime.Parse("2018-11-16 21:00:08"),
EndTime = DateTime.Parse("2018-11-16 22:00:08") EndTime = DateTime.Parse("2018-11-16 22:00:08")
}; };
@@ -31,7 +31,7 @@ namespace JT808.Protocol.Test.MessageBody
JT808_0x8802 jT808_0X8802 = JT808Serializer.Deserialize<JT808_0x8802>(bytes); JT808_0x8802 jT808_0X8802 = JT808Serializer.Deserialize<JT808_0x8802>(bytes);
Assert.Equal(123, jT808_0X8802.ChannelId); Assert.Equal(123, jT808_0X8802.ChannelId);
Assert.Equal(JT808EventItemCoding.collision_rollover_alarm_triggered.ToByteValue(), jT808_0X8802.EventItemCoding); Assert.Equal(JT808EventItemCoding.collision_rollover_alarm_triggered.ToByteValue(), jT808_0X8802.EventItemCoding);
Assert.Equal(JT808MultimediaType.视频.ToByteValue(), jT808_0X8802.MultimediaType);
Assert.Equal(JT808MultimediaType.video.ToByteValue(), jT808_0X8802.MultimediaType);
Assert.Equal(DateTime.Parse("2018-11-16 21:00:08"), jT808_0X8802.StartTime); Assert.Equal(DateTime.Parse("2018-11-16 21:00:08"), jT808_0X8802.StartTime);
Assert.Equal(DateTime.Parse("2018-11-16 22:00:08"), jT808_0X8802.EndTime); Assert.Equal(DateTime.Parse("2018-11-16 22:00:08"), jT808_0X8802.EndTime);
} }


+ 4
- 4
src/JT808.Protocol.Test/MessageBody/JT808_0x8803Test.cs 查看文件

@@ -16,8 +16,8 @@ namespace JT808.Protocol.Test.MessageBody
{ {
ChannelId = 128, ChannelId = 128,
EventItemCoding = JT808EventItemCoding.platform_delivery_order.ToByteValue(), EventItemCoding = JT808EventItemCoding.platform_delivery_order.ToByteValue(),
MultimediaDeleted = JT808MultimediaDeleted.删除.ToByteValue(),
MultimediaType = JT808MultimediaType.图像.ToByteValue(),
MultimediaDeleted = JT808MultimediaDeleted.delete.ToByteValue(),
MultimediaType = JT808MultimediaType.image.ToByteValue(),
StartTime = DateTime.Parse("2018-11-16 22:00:21"), StartTime = DateTime.Parse("2018-11-16 22:00:21"),
EndTime = DateTime.Parse("2018-11-16 23:00:21") EndTime = DateTime.Parse("2018-11-16 23:00:21")
}; };
@@ -32,8 +32,8 @@ namespace JT808.Protocol.Test.MessageBody
JT808_0x8803 jT808_0X8803 = JT808Serializer.Deserialize<JT808_0x8803>(bytes); JT808_0x8803 jT808_0X8803 = JT808Serializer.Deserialize<JT808_0x8803>(bytes);
Assert.Equal(128, jT808_0X8803.ChannelId); Assert.Equal(128, jT808_0X8803.ChannelId);
Assert.Equal(JT808EventItemCoding.platform_delivery_order.ToByteValue(), jT808_0X8803.EventItemCoding); Assert.Equal(JT808EventItemCoding.platform_delivery_order.ToByteValue(), jT808_0X8803.EventItemCoding);
Assert.Equal(JT808MultimediaDeleted.删除.ToByteValue(), jT808_0X8803.MultimediaDeleted);
Assert.Equal(JT808MultimediaType.图像.ToByteValue(), jT808_0X8803.MultimediaType);
Assert.Equal(JT808MultimediaDeleted.delete.ToByteValue(), jT808_0X8803.MultimediaDeleted);
Assert.Equal(JT808MultimediaType.image.ToByteValue(), jT808_0X8803.MultimediaType);
Assert.Equal(DateTime.Parse("2018-11-16 22:00:21"), jT808_0X8803.StartTime); Assert.Equal(DateTime.Parse("2018-11-16 22:00:21"), jT808_0X8803.StartTime);
Assert.Equal(DateTime.Parse("2018-11-16 23:00:21"), jT808_0X8803.EndTime); Assert.Equal(DateTime.Parse("2018-11-16 23:00:21"), jT808_0X8803.EndTime);
} }


+ 4
- 4
src/JT808.Protocol.Test/MessageBody/JT808_0x8804Test.cs 查看文件

@@ -13,9 +13,9 @@ namespace JT808.Protocol.Test.MessageBody
{ {
JT808_0x8804 jT808_0X8804 = new JT808_0x8804 JT808_0x8804 jT808_0X8804 = new JT808_0x8804
{ {
RecordCmd = JT808RecordCmd.停止录音,
RecordCmd = JT808RecordCmd.stop,
RecordTime = 30, RecordTime = 30,
RecordSave = JT808RecordSave.实时上传,
RecordSave = JT808RecordSave.realtime_upload,
AudioSampleRate = 1 AudioSampleRate = 1
}; };
string hex = JT808Serializer.Serialize(jT808_0X8804).ToHexString(); string hex = JT808Serializer.Serialize(jT808_0X8804).ToHexString();
@@ -28,9 +28,9 @@ namespace JT808.Protocol.Test.MessageBody
{ {
byte[] bytes = "00 00 1E 00 01".ToHexBytes(); byte[] bytes = "00 00 1E 00 01".ToHexBytes();
JT808_0x8804 jT808_0X8804 = JT808Serializer.Deserialize<JT808_0x8804>(bytes); JT808_0x8804 jT808_0X8804 = JT808Serializer.Deserialize<JT808_0x8804>(bytes);
Assert.Equal(JT808RecordCmd.停止录音, jT808_0X8804.RecordCmd);
Assert.Equal(JT808RecordCmd.stop, jT808_0X8804.RecordCmd);
Assert.Equal(30, jT808_0X8804.RecordTime); Assert.Equal(30, jT808_0X8804.RecordTime);
Assert.Equal(JT808RecordSave.实时上传, jT808_0X8804.RecordSave);
Assert.Equal(JT808RecordSave.realtime_upload, jT808_0X8804.RecordSave);
Assert.Equal(1, jT808_0X8804.AudioSampleRate); Assert.Equal(1, jT808_0X8804.AudioSampleRate);
} }
[Fact] [Fact]


+ 2
- 2
src/JT808.Protocol.Test/MessageBody/JT808_0x8805Test.cs 查看文件

@@ -13,7 +13,7 @@ namespace JT808.Protocol.Test.MessageBody
JT808_0x8805 jT808_0X8805 = new JT808_0x8805 JT808_0x8805 jT808_0X8805 = new JT808_0x8805
{ {
MultimediaId = 10000, MultimediaId = 10000,
MultimediaDeleted = Enums.JT808MultimediaDeleted.保留.ToByteValue()
MultimediaDeleted = Enums.JT808MultimediaDeleted.reserve.ToByteValue()
}; };
string hex = JT808Serializer.Serialize(jT808_0X8805).ToHexString(); string hex = JT808Serializer.Serialize(jT808_0X8805).ToHexString();
Assert.Equal("0000271000", hex); Assert.Equal("0000271000", hex);
@@ -24,7 +24,7 @@ namespace JT808.Protocol.Test.MessageBody
{ {
byte[] bytes = "00 00 27 10 00".ToHexBytes(); byte[] bytes = "00 00 27 10 00".ToHexBytes();
JT808_0x8805 jT808_0X8805 = JT808Serializer.Deserialize<JT808_0x8805>(bytes); JT808_0x8805 jT808_0X8805 = JT808Serializer.Deserialize<JT808_0x8805>(bytes);
Assert.Equal(Enums.JT808MultimediaDeleted.保留.ToByteValue(), jT808_0X8805.MultimediaDeleted);
Assert.Equal(Enums.JT808MultimediaDeleted.reserve.ToByteValue(), jT808_0X8805.MultimediaDeleted);
Assert.Equal((uint)10000, jT808_0X8805.MultimediaId); Assert.Equal((uint)10000, jT808_0X8805.MultimediaId);
} }
[Fact] [Fact]


+ 1
- 1
src/JT808.Protocol.Test/Simples/Demo16.cs 查看文件

@@ -49,7 +49,7 @@ namespace JT808.Protocol.Test.Simples
{ {
var bodies = new JT808_0x8108 var bodies = new JT808_0x8108
{ {
UpgradeType = JT808UpgradeType.终端,
UpgradeType = JT808UpgradeType.terminal,
VersionNum = "v1.2.1", VersionNum = "v1.2.1",
MakerId = "1234", MakerId = "1234",
UpgradePackage = splitPackage[i - 1].Data UpgradePackage = splitPackage[i - 1].Data


+ 5
- 2
src/JT808.Protocol/Enums/JT808IOStatus.cs 查看文件

@@ -6,17 +6,20 @@ namespace JT808.Protocol.Enums
{ {
/// <summary> /// <summary>
/// IO状态位 /// IO状态位
/// IO status bits
/// </summary> /// </summary>
[Flags] [Flags]
public enum JT808IOStatus:ushort public enum JT808IOStatus:ushort
{ {
/// <summary> /// <summary>
/// 深度休眠状态 /// 深度休眠状态
/// Deep dormant state
/// </summary> /// </summary>
深度休眠状态 = 1,
deep_dormant_state = 1,
/// <summary> /// <summary>
/// 休眠状态 /// 休眠状态
/// dormant state
/// </summary> /// </summary>
休眠状态 = 2
dormant_state = 2
} }
} }

+ 1
- 0
src/JT808.Protocol/Enums/JT808MultimediaCodingFormat.cs 查看文件

@@ -2,6 +2,7 @@
{ {
/// <summary> /// <summary>
/// 多媒体格式编码 /// 多媒体格式编码
/// Multimedia format coding
/// </summary> /// </summary>
public enum JT808MultimediaCodingFormat : byte public enum JT808MultimediaCodingFormat : byte
{ {


+ 5
- 2
src/JT808.Protocol/Enums/JT808MultimediaDeleted.cs 查看文件

@@ -3,16 +3,19 @@
/// <summary> /// <summary>
/// 删除标志 /// 删除标志
/// 单条存储多媒体数据检索上传命令 /// 单条存储多媒体数据检索上传命令
/// Single storage multimedia data retrieval upload command
/// </summary> /// </summary>
public enum JT808MultimediaDeleted : byte public enum JT808MultimediaDeleted : byte
{ {
/// <summary> /// <summary>
/// 保留 /// 保留
/// reserve
/// </summary> /// </summary>
保留 = 0,
reserve = 0,
/// <summary> /// <summary>
/// 删除 /// 删除
/// delete
/// </summary> /// </summary>
删除 = 1
delete = 1
} }
} }

+ 7
- 3
src/JT808.Protocol/Enums/JT808MultimediaType.cs 查看文件

@@ -2,20 +2,24 @@
{ {
/// <summary> /// <summary>
/// 多媒体类型 /// 多媒体类型
/// Multimedia Type
/// </summary> /// </summary>
public enum JT808MultimediaType : byte public enum JT808MultimediaType : byte
{ {
/// <summary> /// <summary>
/// 图像 /// 图像
/// image
/// </summary> /// </summary>
图像 = 0x00,
image = 0x00,
/// <summary> /// <summary>
/// 音频 /// 音频
/// audio
/// </summary> /// </summary>
音频 = 0x01,
audio = 0x01,
/// <summary> /// <summary>
/// 视频 /// 视频
/// video
/// </summary> /// </summary>
视频 = 0x02
video = 0x02
} }
} }

+ 4
- 3
src/JT808.Protocol/Enums/JT808PhoneNumberType.cs 查看文件

@@ -12,15 +12,16 @@
{ {
/// <summary> /// <summary>
/// 大陆 /// 大陆
/// china
/// </summary> /// </summary>
大陆 = 11,
china = 11,
/// <summary> /// <summary>
/// 香港|澳门 /// 香港|澳门
/// </summary> /// </summary>
香港_澳门 = 8,
china_hongkong_macao = 8,
/// <summary> /// <summary>
/// 台湾 /// 台湾
/// </summary> /// </summary>
台湾 = 10
china_taiwan = 10
} }
} }

+ 11
- 5
src/JT808.Protocol/Enums/JT808PlatformResult.cs 查看文件

@@ -2,28 +2,34 @@
{ {
/// <summary> /// <summary>
/// 返回结果 /// 返回结果
/// return to the result
/// </summary> /// </summary>
public enum JT808PlatformResult : byte public enum JT808PlatformResult : byte
{ {
/// <summary> /// <summary>
/// 成功/确认 /// 成功/确认
/// succeed
/// </summary> /// </summary>
成功 = 0x00,
succeed = 0x00,
/// <summary> /// <summary>
/// 失败 /// 失败
/// fail
/// </summary> /// </summary>
失败 = 0x01,
fail = 0x01,
/// <summary> /// <summary>
/// 消息有误 /// 消息有误
/// The message is wrong
/// </summary> /// </summary>
消息有误 = 0x02,
message_wrong = 0x02,
/// <summary> /// <summary>
/// 不支持 /// 不支持
/// nonsupport
/// </summary> /// </summary>
不支持 = 0x03,
nonsupport = 0x03,
/// <summary> /// <summary>
/// 报警处理确认 /// 报警处理确认
/// Alarm processing confirmation
/// </summary> /// </summary>
报警处理确认 = 0x04
alarm_processing_confirmation = 0x04
} }
} }

+ 10
- 5
src/JT808.Protocol/Enums/JT808PositionType.cs 查看文件

@@ -2,28 +2,33 @@
{ {
/// <summary> /// <summary>
/// 位置类型 /// 位置类型
/// Position type
/// </summary> /// </summary>
public enum JT808PositionType : byte public enum JT808PositionType : byte
{ {
/// <summary> /// <summary>
/// 无特定位置 /// 无特定位置
/// No specific position
/// </summary> /// </summary>
无特定位置 = 0x00,
no_specific_position = 0x00,
/// <summary> /// <summary>
/// 圆形区域 /// 圆形区域
/// circular region
/// </summary> /// </summary>
圆形区域 = 0x01,
circular_region = 0x01,
/// <summary> /// <summary>
/// 矩形区域 /// 矩形区域
/// </summary> /// </summary>
矩形区域 = 0x02,
rectangular_region = 0x02,
/// <summary> /// <summary>
/// 多边形区域 /// 多边形区域
/// polyarea
/// </summary> /// </summary>
多边形区域 = 0x03,
polyarea = 0x03,
/// <summary> /// <summary>
/// 路段 /// 路段
/// Road Segment
/// </summary> /// </summary>
路段 = 0x04
road_segment = 0x04
} }
} }

+ 6
- 3
src/JT808.Protocol/Enums/JT808RecordCmd.cs 查看文件

@@ -2,16 +2,19 @@
{ {
/// <summary> /// <summary>
/// 录音命令 /// 录音命令
/// The recording command
/// </summary> /// </summary>
public enum JT808RecordCmd : byte public enum JT808RecordCmd : byte
{ {
/// <summary> /// <summary>
/// 停止录音 /// 停止录音
/// stop
/// </summary> /// </summary>
停止录音 = 0x00,
stop = 0x00,
/// <summary> /// <summary>
/// 停止录音
/// 开始录音
/// start
/// </summary> /// </summary>
开始录音 = 0x01
start = 0x01
} }
} }

+ 5
- 2
src/JT808.Protocol/Enums/JT808RecordSave.cs 查看文件

@@ -2,16 +2,19 @@
{ {
/// <summary> /// <summary>
/// 保存标志 /// 保存标志
/// Save the logo
/// </summary> /// </summary>
public enum JT808RecordSave : byte public enum JT808RecordSave : byte
{ {
/// <summary> /// <summary>
/// 实时上传 /// 实时上传
/// In real time to upload
/// </summary> /// </summary>
实时上传 = 0,
realtime_upload = 0,
/// <summary> /// <summary>
/// 保存 /// 保存
/// Save
/// </summary> /// </summary>
保存 = 1
save = 1
} }
} }

+ 7
- 3
src/JT808.Protocol/Enums/JT808SettingProperty.cs 查看文件

@@ -2,20 +2,24 @@
{ {
/// <summary> /// <summary>
/// 设置属性 /// 设置属性
/// set attributes
/// </summary> /// </summary>
public enum JT808SettingProperty : byte public enum JT808SettingProperty : byte
{ {
/// <summary> /// <summary>
/// 更新区域 /// 更新区域
/// update region
/// </summary> /// </summary>
更新区域 = 0x00,
update_region = 0x00,
/// <summary> /// <summary>
/// 追加区域 /// 追加区域
/// append region
/// </summary> /// </summary>
追加区域 = 0x01,
append_region = 0x01,
/// <summary> /// <summary>
/// 修改区域 /// 修改区域
/// modify region
/// </summary> /// </summary>
修改区域 = 0x02
modify_region = 0x02
} }
} }

+ 10
- 5
src/JT808.Protocol/Enums/JT808SettingTelephoneBook.cs 查看文件

@@ -1,25 +1,30 @@
namespace JT808.Protocol.Enums namespace JT808.Protocol.Enums
{ {
/// <summary> /// <summary>
/// 设置电话本 设置类型
/// 设置电话本设置类型
/// Set the phone book setting type
/// </summary> /// </summary>
public enum JT808SettingTelephoneBook : byte public enum JT808SettingTelephoneBook : byte
{ {
/// <summary> /// <summary>
/// 删除终端上所有存储的联系人 /// 删除终端上所有存储的联系人
/// Delete all contacts stored on the terminal
/// </summary> /// </summary>
删除终端上所有存储的联系人 = 0,
delete_all = 0,
/// <summary> /// <summary>
/// 更新电话本_删除终端中已有全部联系人并追加消息中的联系人 /// 更新电话本_删除终端中已有全部联系人并追加消息中的联系人
/// Update the phone book _ Delete all contacts from the terminal and add contacts to the message
/// </summary> /// </summary>
更新电话本_删除终端中已有全部联系人并追加消息中的联系人 = 1,
update_phone_book=1,
/// <summary> /// <summary>
/// 追加电话本 /// 追加电话本
/// Append phone book
/// </summary> /// </summary>
追加电话本 = 2,
append_phone_book = 2,
/// <summary> /// <summary>
/// 修改电话本_以联系人为索引 /// 修改电话本_以联系人为索引
/// Modify the phone book to index contacts
/// </summary> /// </summary>
修改电话本_以联系人为索引 = 3
modify_phone_book = 3
} }
} }

+ 7
- 3
src/JT808.Protocol/Enums/JT808TelephoneBookContactType.cs 查看文件

@@ -2,20 +2,24 @@
{ {
/// <summary> /// <summary>
/// 电话本联系人标志 /// 电话本联系人标志
/// Phone book contact mark
/// </summary> /// </summary>
public enum JT808TelephoneBookContactType : byte public enum JT808TelephoneBookContactType : byte
{ {
/// <summary> /// <summary>
/// 呼入 /// 呼入
/// call_in
/// </summary> /// </summary>
呼入 = 1,
callin = 1,
/// <summary> /// <summary>
/// 呼出 /// 呼出
/// call_out
/// </summary> /// </summary>
呼出 = 2,
callout = 2,
/// <summary> /// <summary>
/// 呼入_呼出 /// 呼入_呼出
/// call_in|call_out
/// </summary> /// </summary>
呼入_呼出 = 3
call_in_out = 3
} }
} }

+ 11
- 5
src/JT808.Protocol/Enums/JT808TerminalRegisterResult.cs 查看文件

@@ -2,28 +2,34 @@
{ {
/// <summary> /// <summary>
/// 终端注册返回结果 /// 终端注册返回结果
/// The terminal registration result is returned
/// </summary> /// </summary>
public enum JT808TerminalRegisterResult : byte public enum JT808TerminalRegisterResult : byte
{ {
/// <summary> /// <summary>
/// 成功 /// 成功
/// success
/// </summary> /// </summary>
成功 = 0x00,
success = 0x00,
/// <summary> /// <summary>
/// 车辆已被注册 /// 车辆已被注册
/// The vehicle has been registered
/// </summary> /// </summary>
车辆已被注册 = 0x01,
vehicle_registered = 0x01,
/// <summary> /// <summary>
/// 数据库中无该车辆 /// 数据库中无该车辆
/// The vehicle is not in the database
/// </summary> /// </summary>
数据库中无该车辆 = 0x02,
vehicle_not_database = 0x02,
/// <summary> /// <summary>
/// 终端已被注册 /// 终端已被注册
/// The terminal has been registered
/// </summary> /// </summary>
终端已被注册 = 0x03,
terminal_registered = 0x03,
/// <summary> /// <summary>
/// 数据库中无该终端 /// 数据库中无该终端
/// The terminal is not in the database
/// </summary> /// </summary>
数据库中无该终端 = 0x04
terminal_not_database = 0x04
} }
} }

+ 1
- 0
src/JT808.Protocol/Enums/JT808TerminalResult.cs 查看文件

@@ -2,6 +2,7 @@
{ {
/// <summary> /// <summary>
/// 通用应答返回 /// 通用应答返回
/// Universal reply return
/// </summary> /// </summary>
public enum JT808TerminalResult : byte public enum JT808TerminalResult : byte
{ {


+ 15
- 7
src/JT808.Protocol/Enums/JT808UpgradeResult.cs 查看文件

@@ -2,36 +2,44 @@
{ {
/// <summary> /// <summary>
/// 升级结果 /// 升级结果
/// Upgrade Result
/// </summary> /// </summary>
public enum JT808UpgradeResult : byte public enum JT808UpgradeResult : byte
{ {
/// <summary> /// <summary>
/// 成功 /// 成功
/// success
/// </summary> /// </summary>
成功 = 0x00,
success = 0x00,
/// <summary> /// <summary>
/// 失败 /// 失败
/// fail
/// </summary> /// </summary>
失败 = 0x01,
fail = 0x01,
/// <summary> /// <summary>
/// 取消 /// 取消
/// cancel
/// </summary> /// </summary>
取消 = 0x02,
cancel = 0x02,
/// <summary> /// <summary>
/// 粤标主动安全-未找到目标设备 /// 粤标主动安全-未找到目标设备
/// Yue Biao active Safety. - Target device not found
/// </summary> /// </summary>
未找到目标设备 = 0x10,
yue_biao_active_safety_target_device_not_found = 0x10,
/// <summary> /// <summary>
/// 粤标主动安全-硬件型号不支持 /// 粤标主动安全-硬件型号不支持
/// Yue Biao Active Safety - hardware models not supported
/// </summary> /// </summary>
硬件型号不支持 = 0x11,
yue_biao_active_safety_hardware_not_supported = 0x11,
/// <summary> /// <summary>
/// 粤标主动安全-软件版本相同 /// 粤标主动安全-软件版本相同
/// Yue Biao Active Safety - Same Software Version
/// </summary> /// </summary>
软件版本相同 = 0x12,
yue_biao_active_safety_same_software_version = 0x12,
/// <summary> /// <summary>
/// 粤标主动安全-软件版本不支持 /// 粤标主动安全-软件版本不支持
/// Yue Biao Active Safety - The software version is not supported
/// </summary> /// </summary>
软件版本不支持 = 0x13
yue_biao_active_safety_same_software_version_not_supported = 0x13
} }
} }

+ 15
- 7
src/JT808.Protocol/Enums/JT808UpgradeType.cs 查看文件

@@ -2,36 +2,44 @@
{ {
/// <summary> /// <summary>
/// 升级类型 /// 升级类型
/// Upgrade Type
/// </summary> /// </summary>
public enum JT808UpgradeType : byte public enum JT808UpgradeType : byte
{ {
/// <summary> /// <summary>
/// 终端 /// 终端
/// terminal
/// </summary> /// </summary>
终端 = 0,
terminal = 0,
/// <summary> /// <summary>
/// 道路运输证IC卡读卡器 /// 道路运输证IC卡读卡器
/// Road transport certificate IC card reader
/// </summary> /// </summary>
道路运输证IC卡读卡器 = 0x0C,
road_transport_cert_ic_card_reader = 0x0C,
/// <summary> /// <summary>
/// 北斗卫星定位模块 /// 北斗卫星定位模块
/// Beidou satellite positioning module
/// </summary> /// </summary>
北斗卫星定位模块 = 0x34,
beidou_module = 0x34,
/// <summary> /// <summary>
/// 粤标主动安全-高级驾驶辅助系统 /// 粤标主动安全-高级驾驶辅助系统
/// Advanced driver assistance system
/// </summary> /// </summary>
高级驾驶辅助系统 = 0x64,
adas = 0x64,
/// <summary> /// <summary>
/// 粤标主动安全-驾驶状态监控系统 /// 粤标主动安全-驾驶状态监控系统
/// Driving condition monitoring system
/// </summary> /// </summary>
驾驶状态监控系统 = 0x65,
dsm = 0x65,
/// <summary> /// <summary>
/// 粤标主动安全-胎压监测系统 /// 粤标主动安全-胎压监测系统
/// tire pressure monitoring system
/// </summary> /// </summary>
胎压监测系统 = 0x66,
tpms = 0x66,
/// <summary> /// <summary>
/// 粤标主动安全-盲点监测系统 /// 粤标主动安全-盲点监测系统
/// Blind Spot Monitoring system
/// </summary> /// </summary>
盲点监测系统 = 0x67,
bsd = 0x67,
} }
} }

+ 1
- 0
src/JT808.Protocol/Enums/JT808Version.cs 查看文件

@@ -6,6 +6,7 @@ namespace JT808.Protocol.Enums
{ {
/// <summary> /// <summary>
/// JT808版本号 /// JT808版本号
/// JT808 Version
/// </summary> /// </summary>
public enum JT808Version:byte public enum JT808Version:byte
{ {


+ 121
- 55
src/JT808.Protocol/JT808.Protocol.xml 查看文件

@@ -813,16 +813,19 @@
<member name="T:JT808.Protocol.Enums.JT808IOStatus"> <member name="T:JT808.Protocol.Enums.JT808IOStatus">
<summary> <summary>
IO状态位 IO状态位
IO status bits
</summary> </summary>
</member> </member>
<member name="F:JT808.Protocol.Enums.JT808IOStatus.深度休眠状态">
<member name="F:JT808.Protocol.Enums.JT808IOStatus.deep_dormant_state">
<summary> <summary>
深度休眠状态 深度休眠状态
Deep dormant state
</summary> </summary>
</member> </member>
<member name="F:JT808.Protocol.Enums.JT808IOStatus.休眠状态">
<member name="F:JT808.Protocol.Enums.JT808IOStatus.dormant_state">
<summary> <summary>
休眠状态 休眠状态
dormant state
</summary> </summary>
</member> </member>
<member name="T:JT808.Protocol.Enums.JT808MsgId"> <member name="T:JT808.Protocol.Enums.JT808MsgId">
@@ -1259,6 +1262,7 @@
<member name="T:JT808.Protocol.Enums.JT808MultimediaCodingFormat"> <member name="T:JT808.Protocol.Enums.JT808MultimediaCodingFormat">
<summary> <summary>
多媒体格式编码 多媒体格式编码
Multimedia format coding
</summary> </summary>
</member> </member>
<member name="F:JT808.Protocol.Enums.JT808MultimediaCodingFormat.JPEG"> <member name="F:JT808.Protocol.Enums.JT808MultimediaCodingFormat.JPEG">
@@ -1290,36 +1294,43 @@
<summary> <summary>
删除标志 删除标志
单条存储多媒体数据检索上传命令 单条存储多媒体数据检索上传命令
Single storage multimedia data retrieval upload command
</summary> </summary>
</member> </member>
<member name="F:JT808.Protocol.Enums.JT808MultimediaDeleted.保留">
<member name="F:JT808.Protocol.Enums.JT808MultimediaDeleted.reserve">
<summary> <summary>
保留 保留
reserve
</summary> </summary>
</member> </member>
<member name="F:JT808.Protocol.Enums.JT808MultimediaDeleted.删除">
<member name="F:JT808.Protocol.Enums.JT808MultimediaDeleted.delete">
<summary> <summary>
删除 删除
delete
</summary> </summary>
</member> </member>
<member name="T:JT808.Protocol.Enums.JT808MultimediaType"> <member name="T:JT808.Protocol.Enums.JT808MultimediaType">
<summary> <summary>
多媒体类型 多媒体类型
Multimedia Type
</summary> </summary>
</member> </member>
<member name="F:JT808.Protocol.Enums.JT808MultimediaType.图像">
<member name="F:JT808.Protocol.Enums.JT808MultimediaType.image">
<summary> <summary>
图像 图像
image
</summary> </summary>
</member> </member>
<member name="F:JT808.Protocol.Enums.JT808MultimediaType.音频">
<member name="F:JT808.Protocol.Enums.JT808MultimediaType.audio">
<summary> <summary>
音频 音频
audio
</summary> </summary>
</member> </member>
<member name="F:JT808.Protocol.Enums.JT808MultimediaType.视频">
<member name="F:JT808.Protocol.Enums.JT808MultimediaType.video">
<summary> <summary>
视频 视频
video
</summary> </summary>
</member> </member>
<member name="T:JT808.Protocol.Enums.JT808PhoneNumberType"> <member name="T:JT808.Protocol.Enums.JT808PhoneNumberType">
@@ -1332,17 +1343,18 @@
假如是其他地方打来要改成打 +886912345678 假如是其他地方打来要改成打 +886912345678
</summary> </summary>
</member> </member>
<member name="F:JT808.Protocol.Enums.JT808PhoneNumberType.大陆">
<member name="F:JT808.Protocol.Enums.JT808PhoneNumberType.china">
<summary> <summary>
大陆 大陆
china
</summary> </summary>
</member> </member>
<member name="F:JT808.Protocol.Enums.JT808PhoneNumberType.香港_澳门">
<member name="F:JT808.Protocol.Enums.JT808PhoneNumberType.china_hongkong_macao">
<summary> <summary>
香港|澳门 香港|澳门
</summary> </summary>
</member> </member>
<member name="F:JT808.Protocol.Enums.JT808PhoneNumberType.台湾">
<member name="F:JT808.Protocol.Enums.JT808PhoneNumberType.china_taiwan">
<summary> <summary>
台湾 台湾
</summary> </summary>
@@ -1350,136 +1362,162 @@
<member name="T:JT808.Protocol.Enums.JT808PlatformResult"> <member name="T:JT808.Protocol.Enums.JT808PlatformResult">
<summary> <summary>
返回结果 返回结果
return to the result
</summary> </summary>
</member> </member>
<member name="F:JT808.Protocol.Enums.JT808PlatformResult.成功">
<member name="F:JT808.Protocol.Enums.JT808PlatformResult.succeed">
<summary> <summary>
成功/确认 成功/确认
succeed
</summary> </summary>
</member> </member>
<member name="F:JT808.Protocol.Enums.JT808PlatformResult.失败">
<member name="F:JT808.Protocol.Enums.JT808PlatformResult.fail">
<summary> <summary>
失败 失败
fail
</summary> </summary>
</member> </member>
<member name="F:JT808.Protocol.Enums.JT808PlatformResult.消息有误">
<member name="F:JT808.Protocol.Enums.JT808PlatformResult.message_wrong">
<summary> <summary>
消息有误 消息有误
The message is wrong
</summary> </summary>
</member> </member>
<member name="F:JT808.Protocol.Enums.JT808PlatformResult.不支持">
<member name="F:JT808.Protocol.Enums.JT808PlatformResult.nonsupport">
<summary> <summary>
不支持 不支持
nonsupport
</summary> </summary>
</member> </member>
<member name="F:JT808.Protocol.Enums.JT808PlatformResult.报警处理确认">
<member name="F:JT808.Protocol.Enums.JT808PlatformResult.alarm_processing_confirmation">
<summary> <summary>
报警处理确认 报警处理确认
Alarm processing confirmation
</summary> </summary>
</member> </member>
<member name="T:JT808.Protocol.Enums.JT808PositionType"> <member name="T:JT808.Protocol.Enums.JT808PositionType">
<summary> <summary>
位置类型 位置类型
Position type
</summary> </summary>
</member> </member>
<member name="F:JT808.Protocol.Enums.JT808PositionType.无特定位置">
<member name="F:JT808.Protocol.Enums.JT808PositionType.no_specific_position">
<summary> <summary>
无特定位置 无特定位置
No specific position
</summary> </summary>
</member> </member>
<member name="F:JT808.Protocol.Enums.JT808PositionType.圆形区域">
<member name="F:JT808.Protocol.Enums.JT808PositionType.circular_region">
<summary> <summary>
圆形区域 圆形区域
circular region
</summary> </summary>
</member> </member>
<member name="F:JT808.Protocol.Enums.JT808PositionType.矩形区域">
<member name="F:JT808.Protocol.Enums.JT808PositionType.rectangular_region">
<summary> <summary>
矩形区域 矩形区域
</summary> </summary>
</member> </member>
<member name="F:JT808.Protocol.Enums.JT808PositionType.多边形区域">
<member name="F:JT808.Protocol.Enums.JT808PositionType.polyarea">
<summary> <summary>
多边形区域 多边形区域
polyarea
</summary> </summary>
</member> </member>
<member name="F:JT808.Protocol.Enums.JT808PositionType.路段">
<member name="F:JT808.Protocol.Enums.JT808PositionType.road_segment">
<summary> <summary>
路段 路段
Road Segment
</summary> </summary>
</member> </member>
<member name="T:JT808.Protocol.Enums.JT808RecordCmd"> <member name="T:JT808.Protocol.Enums.JT808RecordCmd">
<summary> <summary>
录音命令 录音命令
The recording command
</summary> </summary>
</member> </member>
<member name="F:JT808.Protocol.Enums.JT808RecordCmd.停止录音">
<member name="F:JT808.Protocol.Enums.JT808RecordCmd.stop">
<summary> <summary>
停止录音 停止录音
stop
</summary> </summary>
</member> </member>
<member name="F:JT808.Protocol.Enums.JT808RecordCmd.开始录音">
<member name="F:JT808.Protocol.Enums.JT808RecordCmd.start">
<summary> <summary>
停止录音
开始录音
start
</summary> </summary>
</member> </member>
<member name="T:JT808.Protocol.Enums.JT808RecordSave"> <member name="T:JT808.Protocol.Enums.JT808RecordSave">
<summary> <summary>
保存标志 保存标志
Save the logo
</summary> </summary>
</member> </member>
<member name="F:JT808.Protocol.Enums.JT808RecordSave.实时上传">
<member name="F:JT808.Protocol.Enums.JT808RecordSave.realtime_upload">
<summary> <summary>
实时上传 实时上传
In real time to upload
</summary> </summary>
</member> </member>
<member name="F:JT808.Protocol.Enums.JT808RecordSave.保存">
<member name="F:JT808.Protocol.Enums.JT808RecordSave.save">
<summary> <summary>
保存 保存
Save
</summary> </summary>
</member> </member>
<member name="T:JT808.Protocol.Enums.JT808SettingProperty"> <member name="T:JT808.Protocol.Enums.JT808SettingProperty">
<summary> <summary>
设置属性 设置属性
set attributes
</summary> </summary>
</member> </member>
<member name="F:JT808.Protocol.Enums.JT808SettingProperty.更新区域">
<member name="F:JT808.Protocol.Enums.JT808SettingProperty.update_region">
<summary> <summary>
更新区域 更新区域
update region
</summary> </summary>
</member> </member>
<member name="F:JT808.Protocol.Enums.JT808SettingProperty.追加区域">
<member name="F:JT808.Protocol.Enums.JT808SettingProperty.append_region">
<summary> <summary>
追加区域 追加区域
append region
</summary> </summary>
</member> </member>
<member name="F:JT808.Protocol.Enums.JT808SettingProperty.修改区域">
<member name="F:JT808.Protocol.Enums.JT808SettingProperty.modify_region">
<summary> <summary>
修改区域 修改区域
modify region
</summary> </summary>
</member> </member>
<member name="T:JT808.Protocol.Enums.JT808SettingTelephoneBook"> <member name="T:JT808.Protocol.Enums.JT808SettingTelephoneBook">
<summary> <summary>
设置电话本 设置类型
设置电话本设置类型
Set the phone book setting type
</summary> </summary>
</member> </member>
<member name="F:JT808.Protocol.Enums.JT808SettingTelephoneBook.删除终端上所有存储的联系人">
<member name="F:JT808.Protocol.Enums.JT808SettingTelephoneBook.delete_all">
<summary> <summary>
删除终端上所有存储的联系人 删除终端上所有存储的联系人
Delete all contacts stored on the terminal
</summary> </summary>
</member> </member>
<member name="F:JT808.Protocol.Enums.JT808SettingTelephoneBook.更新电话本_删除终端中已有全部联系人并追加消息中的联系人">
<member name="F:JT808.Protocol.Enums.JT808SettingTelephoneBook.update_phone_book">
<summary> <summary>
更新电话本_删除终端中已有全部联系人并追加消息中的联系人 更新电话本_删除终端中已有全部联系人并追加消息中的联系人
Update the phone book _ Delete all contacts from the terminal and add contacts to the message
</summary> </summary>
</member> </member>
<member name="F:JT808.Protocol.Enums.JT808SettingTelephoneBook.追加电话本">
<member name="F:JT808.Protocol.Enums.JT808SettingTelephoneBook.append_phone_book">
<summary> <summary>
追加电话本 追加电话本
Append phone book
</summary> </summary>
</member> </member>
<member name="F:JT808.Protocol.Enums.JT808SettingTelephoneBook.修改电话本_以联系人为索引">
<member name="F:JT808.Protocol.Enums.JT808SettingTelephoneBook.modify_phone_book">
<summary> <summary>
修改电话本_以联系人为索引 修改电话本_以联系人为索引
Modify the phone book to index contacts
</summary> </summary>
</member> </member>
<member name="T:JT808.Protocol.Enums.JT808Status"> <member name="T:JT808.Protocol.Enums.JT808Status">
@@ -1590,56 +1628,67 @@
<member name="T:JT808.Protocol.Enums.JT808TelephoneBookContactType"> <member name="T:JT808.Protocol.Enums.JT808TelephoneBookContactType">
<summary> <summary>
电话本联系人标志 电话本联系人标志
Phone book contact mark
</summary> </summary>
</member> </member>
<member name="F:JT808.Protocol.Enums.JT808TelephoneBookContactType.呼入">
<member name="F:JT808.Protocol.Enums.JT808TelephoneBookContactType.callin">
<summary> <summary>
呼入 呼入
call_in
</summary> </summary>
</member> </member>
<member name="F:JT808.Protocol.Enums.JT808TelephoneBookContactType.呼出">
<member name="F:JT808.Protocol.Enums.JT808TelephoneBookContactType.callout">
<summary> <summary>
呼出 呼出
call_out
</summary> </summary>
</member> </member>
<member name="F:JT808.Protocol.Enums.JT808TelephoneBookContactType.呼入_呼出">
<member name="F:JT808.Protocol.Enums.JT808TelephoneBookContactType.call_in_out">
<summary> <summary>
呼入_呼出 呼入_呼出
call_in|call_out
</summary> </summary>
</member> </member>
<member name="T:JT808.Protocol.Enums.JT808TerminalRegisterResult"> <member name="T:JT808.Protocol.Enums.JT808TerminalRegisterResult">
<summary> <summary>
终端注册返回结果 终端注册返回结果
The terminal registration result is returned
</summary> </summary>
</member> </member>
<member name="F:JT808.Protocol.Enums.JT808TerminalRegisterResult.成功">
<member name="F:JT808.Protocol.Enums.JT808TerminalRegisterResult.success">
<summary> <summary>
成功 成功
success
</summary> </summary>
</member> </member>
<member name="F:JT808.Protocol.Enums.JT808TerminalRegisterResult.车辆已被注册">
<member name="F:JT808.Protocol.Enums.JT808TerminalRegisterResult.vehicle_registered">
<summary> <summary>
车辆已被注册 车辆已被注册
The vehicle has been registered
</summary> </summary>
</member> </member>
<member name="F:JT808.Protocol.Enums.JT808TerminalRegisterResult.数据库中无该车辆">
<member name="F:JT808.Protocol.Enums.JT808TerminalRegisterResult.vehicle_not_database">
<summary> <summary>
数据库中无该车辆 数据库中无该车辆
The vehicle is not in the database
</summary> </summary>
</member> </member>
<member name="F:JT808.Protocol.Enums.JT808TerminalRegisterResult.终端已被注册">
<member name="F:JT808.Protocol.Enums.JT808TerminalRegisterResult.terminal_registered">
<summary> <summary>
终端已被注册 终端已被注册
The terminal has been registered
</summary> </summary>
</member> </member>
<member name="F:JT808.Protocol.Enums.JT808TerminalRegisterResult.数据库中无该终端">
<member name="F:JT808.Protocol.Enums.JT808TerminalRegisterResult.terminal_not_database">
<summary> <summary>
数据库中无该终端 数据库中无该终端
The terminal is not in the database
</summary> </summary>
</member> </member>
<member name="T:JT808.Protocol.Enums.JT808TerminalResult"> <member name="T:JT808.Protocol.Enums.JT808TerminalResult">
<summary> <summary>
通用应答返回 通用应答返回
Universal reply return
</summary> </summary>
</member> </member>
<member name="F:JT808.Protocol.Enums.JT808TerminalResult.Success"> <member name="F:JT808.Protocol.Enums.JT808TerminalResult.Success">
@@ -1665,86 +1714,103 @@
<member name="T:JT808.Protocol.Enums.JT808UpgradeResult"> <member name="T:JT808.Protocol.Enums.JT808UpgradeResult">
<summary> <summary>
升级结果 升级结果
Upgrade Result
</summary> </summary>
</member> </member>
<member name="F:JT808.Protocol.Enums.JT808UpgradeResult.成功">
<member name="F:JT808.Protocol.Enums.JT808UpgradeResult.success">
<summary> <summary>
成功 成功
success
</summary> </summary>
</member> </member>
<member name="F:JT808.Protocol.Enums.JT808UpgradeResult.失败">
<member name="F:JT808.Protocol.Enums.JT808UpgradeResult.fail">
<summary> <summary>
失败 失败
fail
</summary> </summary>
</member> </member>
<member name="F:JT808.Protocol.Enums.JT808UpgradeResult.取消">
<member name="F:JT808.Protocol.Enums.JT808UpgradeResult.cancel">
<summary> <summary>
取消 取消
cancel
</summary> </summary>
</member> </member>
<member name="F:JT808.Protocol.Enums.JT808UpgradeResult.未找到目标设备">
<member name="F:JT808.Protocol.Enums.JT808UpgradeResult.yue_biao_active_safety_target_device_not_found">
<summary> <summary>
粤标主动安全-未找到目标设备 粤标主动安全-未找到目标设备
Yue Biao active Safety. - Target device not found
</summary> </summary>
</member> </member>
<member name="F:JT808.Protocol.Enums.JT808UpgradeResult.硬件型号不支持">
<member name="F:JT808.Protocol.Enums.JT808UpgradeResult.yue_biao_active_safety_hardware_not_supported">
<summary> <summary>
粤标主动安全-硬件型号不支持 粤标主动安全-硬件型号不支持
Yue Biao Active Safety - hardware models not supported
</summary> </summary>
</member> </member>
<member name="F:JT808.Protocol.Enums.JT808UpgradeResult.软件版本相同">
<member name="F:JT808.Protocol.Enums.JT808UpgradeResult.yue_biao_active_safety_same_software_version">
<summary> <summary>
粤标主动安全-软件版本相同 粤标主动安全-软件版本相同
Yue Biao Active Safety - Same Software Version
</summary> </summary>
</member> </member>
<member name="F:JT808.Protocol.Enums.JT808UpgradeResult.软件版本不支持">
<member name="F:JT808.Protocol.Enums.JT808UpgradeResult.yue_biao_active_safety_same_software_version_not_supported">
<summary> <summary>
粤标主动安全-软件版本不支持 粤标主动安全-软件版本不支持
Yue Biao Active Safety - The software version is not supported
</summary> </summary>
</member> </member>
<member name="T:JT808.Protocol.Enums.JT808UpgradeType"> <member name="T:JT808.Protocol.Enums.JT808UpgradeType">
<summary> <summary>
升级类型 升级类型
Upgrade Type
</summary> </summary>
</member> </member>
<member name="F:JT808.Protocol.Enums.JT808UpgradeType.终端">
<member name="F:JT808.Protocol.Enums.JT808UpgradeType.terminal">
<summary> <summary>
终端 终端
terminal
</summary> </summary>
</member> </member>
<member name="F:JT808.Protocol.Enums.JT808UpgradeType.道路运输证IC卡读卡器">
<member name="F:JT808.Protocol.Enums.JT808UpgradeType.road_transport_cert_ic_card_reader">
<summary> <summary>
道路运输证IC卡读卡器 道路运输证IC卡读卡器
Road transport certificate IC card reader
</summary> </summary>
</member> </member>
<member name="F:JT808.Protocol.Enums.JT808UpgradeType.北斗卫星定位模块">
<member name="F:JT808.Protocol.Enums.JT808UpgradeType.beidou_module">
<summary> <summary>
北斗卫星定位模块 北斗卫星定位模块
Beidou satellite positioning module
</summary> </summary>
</member> </member>
<member name="F:JT808.Protocol.Enums.JT808UpgradeType.高级驾驶辅助系统">
<member name="F:JT808.Protocol.Enums.JT808UpgradeType.adas">
<summary> <summary>
粤标主动安全-高级驾驶辅助系统 粤标主动安全-高级驾驶辅助系统
Advanced driver assistance system
</summary> </summary>
</member> </member>
<member name="F:JT808.Protocol.Enums.JT808UpgradeType.驾驶状态监控系统">
<member name="F:JT808.Protocol.Enums.JT808UpgradeType.dsm">
<summary> <summary>
粤标主动安全-驾驶状态监控系统 粤标主动安全-驾驶状态监控系统
Driving condition monitoring system
</summary> </summary>
</member> </member>
<member name="F:JT808.Protocol.Enums.JT808UpgradeType.胎压监测系统">
<member name="F:JT808.Protocol.Enums.JT808UpgradeType.tpms">
<summary> <summary>
粤标主动安全-胎压监测系统 粤标主动安全-胎压监测系统
tire pressure monitoring system
</summary> </summary>
</member> </member>
<member name="F:JT808.Protocol.Enums.JT808UpgradeType.盲点监测系统">
<member name="F:JT808.Protocol.Enums.JT808UpgradeType.bsd">
<summary> <summary>
粤标主动安全-盲点监测系统 粤标主动安全-盲点监测系统
Blind Spot Monitoring system
</summary> </summary>
</member> </member>
<member name="T:JT808.Protocol.Enums.JT808Version"> <member name="T:JT808.Protocol.Enums.JT808Version">
<summary> <summary>
JT808版本号 JT808版本号
JT808 Version
</summary> </summary>
</member> </member>
<member name="F:JT808.Protocol.Enums.JT808Version.JTT2011"> <member name="F:JT808.Protocol.Enums.JT808Version.JTT2011">


+ 4
- 4
src/JT808.Protocol/MessageBody/JT808_0x0200_0x11.cs 查看文件

@@ -38,7 +38,7 @@ namespace JT808.Protocol.MessageBody
{ {
get get
{ {
if (JT808PositionType != JT808PositionType.无特定位置)
if (JT808PositionType != JT808PositionType.no_specific_position)
{ {
return 5; return 5;
} }
@@ -64,7 +64,7 @@ namespace JT808.Protocol.MessageBody
writer.WriteNumber($"[{value.AttachInfoLength.ReadNumber()}]附加信息长度", value.AttachInfoLength); writer.WriteNumber($"[{value.AttachInfoLength.ReadNumber()}]附加信息长度", value.AttachInfoLength);
value.JT808PositionType = (JT808PositionType)reader.ReadByte(); value.JT808PositionType = (JT808PositionType)reader.ReadByte();
writer.WriteNumber($"[{((byte)value.JT808PositionType).ReadNumber()}]超速报警附加信息-{value.JT808PositionType.ToString()}", (byte)value.JT808PositionType); writer.WriteNumber($"[{((byte)value.JT808PositionType).ReadNumber()}]超速报警附加信息-{value.JT808PositionType.ToString()}", (byte)value.JT808PositionType);
if (value.JT808PositionType != JT808PositionType.无特定位置)
if (value.JT808PositionType != JT808PositionType.no_specific_position)
{ {
value.AreaId = reader.ReadUInt32(); value.AreaId = reader.ReadUInt32();
writer.WriteNumber($"[{value.AreaId.ReadNumber()}]区域或路段ID", value.AreaId); writer.WriteNumber($"[{value.AreaId.ReadNumber()}]区域或路段ID", value.AreaId);
@@ -82,7 +82,7 @@ namespace JT808.Protocol.MessageBody
value.AttachInfoId = reader.ReadByte(); value.AttachInfoId = reader.ReadByte();
value.AttachInfoLength = reader.ReadByte(); value.AttachInfoLength = reader.ReadByte();
value.JT808PositionType = (JT808PositionType)reader.ReadByte(); value.JT808PositionType = (JT808PositionType)reader.ReadByte();
if (value.JT808PositionType != JT808PositionType.无特定位置)
if (value.JT808PositionType != JT808PositionType.no_specific_position)
{ {
value.AreaId = reader.ReadUInt32(); value.AreaId = reader.ReadUInt32();
} }
@@ -99,7 +99,7 @@ namespace JT808.Protocol.MessageBody
writer.WriteByte(value.AttachInfoId); writer.WriteByte(value.AttachInfoId);
writer.WriteByte(value.AttachInfoLength); writer.WriteByte(value.AttachInfoLength);
writer.WriteByte((byte)value.JT808PositionType); writer.WriteByte((byte)value.JT808PositionType);
if (value.JT808PositionType != JT808PositionType.无特定位置)
if (value.JT808PositionType != JT808PositionType.no_specific_position)
{ {
writer.WriteUInt32(value.AreaId); writer.WriteUInt32(value.AreaId);
} }


+ 3
- 3
src/JT808.Protocol/MessageBody/JT808_0x8100.cs 查看文件

@@ -50,7 +50,7 @@ namespace JT808.Protocol.MessageBody
value.JT808TerminalRegisterResult = (JT808TerminalRegisterResult)reader.ReadByte(); value.JT808TerminalRegisterResult = (JT808TerminalRegisterResult)reader.ReadByte();
writer.WriteNumber($"[{ ((byte)value.JT808TerminalRegisterResult).ReadNumber()}]结果-{value.JT808TerminalRegisterResult.ToString()}", (byte)value.JT808TerminalRegisterResult); writer.WriteNumber($"[{ ((byte)value.JT808TerminalRegisterResult).ReadNumber()}]结果-{value.JT808TerminalRegisterResult.ToString()}", (byte)value.JT808TerminalRegisterResult);
// 只有在成功后才有该字段 // 只有在成功后才有该字段
if (value.JT808TerminalRegisterResult == JT808TerminalRegisterResult.成功)
if (value.JT808TerminalRegisterResult == JT808TerminalRegisterResult.success)
{ {
var codeBuffer = reader.ReadVirtualArray(reader.ReadCurrentRemainContentLength()).ToArray(); var codeBuffer = reader.ReadVirtualArray(reader.ReadCurrentRemainContentLength()).ToArray();
value.Code = reader.ReadRemainStringContent(); value.Code = reader.ReadRemainStringContent();
@@ -69,7 +69,7 @@ namespace JT808.Protocol.MessageBody
value.AckMsgNum = reader.ReadUInt16(); value.AckMsgNum = reader.ReadUInt16();
value.JT808TerminalRegisterResult = (JT808TerminalRegisterResult)reader.ReadByte(); value.JT808TerminalRegisterResult = (JT808TerminalRegisterResult)reader.ReadByte();
// 只有在成功后才有该字段 // 只有在成功后才有该字段
if (value.JT808TerminalRegisterResult == JT808TerminalRegisterResult.成功)
if (value.JT808TerminalRegisterResult == JT808TerminalRegisterResult.success)
{ {
value.Code = reader.ReadRemainStringContent(); value.Code = reader.ReadRemainStringContent();
} }
@@ -86,7 +86,7 @@ namespace JT808.Protocol.MessageBody
writer.WriteUInt16(value.AckMsgNum); writer.WriteUInt16(value.AckMsgNum);
writer.WriteByte((byte)value.JT808TerminalRegisterResult); writer.WriteByte((byte)value.JT808TerminalRegisterResult);
// 只有在成功后才有该字段 // 只有在成功后才有该字段
if (value.JT808TerminalRegisterResult == JT808TerminalRegisterResult.成功)
if (value.JT808TerminalRegisterResult == JT808TerminalRegisterResult.success)
{ {
writer.WriteString(value.Code); writer.WriteString(value.Code);
} }


正在加载...
取消
保存