From 94a9a82bc8ed6ea5a303eea97e5e5a79dba9b5b4 Mon Sep 17 00:00:00 2001
From: "SmallChi(Koike)" <564952747@qq.com>
Date: Thu, 19 May 2022 22:34:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=84=E4=B8=AA=E5=AF=B9?=
=?UTF-8?q?=E8=B1=A1=E5=B1=9E=E6=80=A7=E4=B8=BA=E8=8B=B1=E6=96=87=E5=B1=9E?=
=?UTF-8?q?=E6=80=A7=E5=B9=B6=E9=99=84=E4=B8=8A=E5=AF=B9=E5=BA=94=E8=8B=B1?=
=?UTF-8?q?=E6=96=87=E6=8F=8F=E8=BF=B0(2)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../JT808SerializerContext.cs | 4 +-
.../JT808_0x1FC4_Test.cs | 4 +-
.../MessageBody/JT808_0x0108Test.cs | 8 +-
.../MessageBody/JT808_0x0200Test.cs | 4 +-
.../MessageBody/JT808_0x0608Test.cs | 12 +-
.../MessageBody/JT808_0x0801Test.cs | 8 +-
.../MessageBody/JT808_0x0802Test.cs | 16 +-
.../MessageBody/JT808_0x8001Test.cs | 4 +-
.../MessageBody/JT808_0x8100Test.cs | 12 +-
.../MessageBody/JT808_0x8108Test.cs | 4 +-
.../MessageBody/JT808_0x8401Test.cs | 12 +-
.../MessageBody/JT808_0x8600Test.cs | 8 +-
.../MessageBody/JT808_0x8602Test.cs | 4 +-
.../MessageBody/JT808_0x8604Test.cs | 4 +-
.../MessageBody/JT808_0x8802Test.cs | 4 +-
.../MessageBody/JT808_0x8803Test.cs | 8 +-
.../MessageBody/JT808_0x8804Test.cs | 8 +-
.../MessageBody/JT808_0x8805Test.cs | 4 +-
src/JT808.Protocol.Test/Simples/Demo16.cs | 2 +-
src/JT808.Protocol/Enums/JT808IOStatus.cs | 7 +-
.../Enums/JT808MultimediaCodingFormat.cs | 1 +
.../Enums/JT808MultimediaDeleted.cs | 7 +-
.../Enums/JT808MultimediaType.cs | 10 +-
.../Enums/JT808PhoneNumberType.cs | 7 +-
.../Enums/JT808PlatformResult.cs | 16 +-
src/JT808.Protocol/Enums/JT808PositionType.cs | 15 +-
src/JT808.Protocol/Enums/JT808RecordCmd.cs | 9 +-
src/JT808.Protocol/Enums/JT808RecordSave.cs | 7 +-
.../Enums/JT808SettingProperty.cs | 10 +-
.../Enums/JT808SettingTelephoneBook.cs | 15 +-
.../Enums/JT808TelephoneBookContactType.cs | 10 +-
.../Enums/JT808TerminalRegisterResult.cs | 16 +-
.../Enums/JT808TerminalResult.cs | 1 +
.../Enums/JT808UpgradeResult.cs | 22 ++-
src/JT808.Protocol/Enums/JT808UpgradeType.cs | 22 ++-
src/JT808.Protocol/Enums/JT808Version.cs | 1 +
src/JT808.Protocol/JT808.Protocol.xml | 176 ++++++++++++------
.../MessageBody/JT808_0x0200_0x11.cs | 8 +-
.../MessageBody/JT808_0x8100.cs | 6 +-
39 files changed, 314 insertions(+), 182 deletions(-)
diff --git a/src/JT808.Protocol.Benchmark/JT808SerializerContext.cs b/src/JT808.Protocol.Benchmark/JT808SerializerContext.cs
index a936939..5c81e3b 100644
--- a/src/JT808.Protocol.Benchmark/JT808SerializerContext.cs
+++ b/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
{
AreaId=1,
- JT808PositionType= Enums.JT808PositionType.圆形区域
+ JT808PositionType= Enums.JT808PositionType.circular_region
});
jT808UploadLocationRequest.BasicLocationAttachData.Add(JT808Constants.JT808_0x0200_0x12, new JT808_0x0200_0x12
{
AreaId = 1,
- JT808PositionType = Enums.JT808PositionType.圆形区域,
+ JT808PositionType = Enums.JT808PositionType.circular_region,
Direction= Enums.JT808DirectionType.direction_out
});
jT808UploadLocationRequest.BasicLocationAttachData.Add(JT808Constants.JT808_0x0200_0x13, new JT808_0x0200_0x13
diff --git a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.YueBiao.Test/JT808_0x1FC4_Test.cs b/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.YueBiao.Test/JT808_0x1FC4_Test.cs
index 444d00c..b23c1d7 100644
--- a/src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.YueBiao.Test/JT808_0x1FC4_Test.cs
+++ b/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,
MsgNum=2,
UpgradeStatus= Enums.JT808UpgradeStatus.固件下载中,
- UpgradeType= Protocol.Enums.JT808UpgradeType.北斗卫星定位模块,
+ UpgradeType= Protocol.Enums.JT808UpgradeType.beidou_module,
UploadProgress=3
};
var hex = JT808Serializer.Serialize(jT808UploadLocationRequest).ToHexString();
@@ -40,7 +40,7 @@ namespace JT808.Protocol.Extensions.YueBiao.Test
Assert.Equal(1, jT808UploadLocationRequest.ErrorCode);
Assert.Equal(2, jT808UploadLocationRequest.MsgNum);
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);
}
[Fact]
diff --git a/src/JT808.Protocol.Test/MessageBody/JT808_0x0108Test.cs b/src/JT808.Protocol.Test/MessageBody/JT808_0x0108Test.cs
index 9d4fee3..0ee7c88 100644
--- a/src/JT808.Protocol.Test/MessageBody/JT808_0x0108Test.cs
+++ b/src/JT808.Protocol.Test/MessageBody/JT808_0x0108Test.cs
@@ -13,8 +13,8 @@ namespace JT808.Protocol.Test.MessageBody
{
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();
Assert.Equal("3400", hex);
@@ -25,8 +25,8 @@ namespace JT808.Protocol.Test.MessageBody
{
byte[] bytes = "34 00".ToHexBytes();
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]
diff --git a/src/JT808.Protocol.Test/MessageBody/JT808_0x0200Test.cs b/src/JT808.Protocol.Test/MessageBody/JT808_0x0200Test.cs
index b51bf3d..309e77d 100644
--- a/src/JT808.Protocol.Test/MessageBody/JT808_0x0200Test.cs
+++ b/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
{
AreaId = 1,
- JT808PositionType = Enums.JT808PositionType.圆形区域
+ JT808PositionType = Enums.JT808PositionType.circular_region
});
jT808UploadLocationRequest.BasicLocationAttachData.Add(JT808Constants.JT808_0x0200_0x12, new JT808_0x0200_0x12
{
AreaId = 1,
- JT808PositionType = Enums.JT808PositionType.圆形区域,
+ JT808PositionType = Enums.JT808PositionType.circular_region,
Direction = Enums.JT808DirectionType.direction_out
});
jT808UploadLocationRequest.BasicLocationAttachData.Add(JT808Constants.JT808_0x0200_0x13, new JT808_0x0200_0x13
diff --git a/src/JT808.Protocol.Test/MessageBody/JT808_0x0608Test.cs b/src/JT808.Protocol.Test/MessageBody/JT808_0x0608Test.cs
index 20ff459..6878f22 100644
--- a/src/JT808.Protocol.Test/MessageBody/JT808_0x0608Test.cs
+++ b/src/JT808.Protocol.Test/MessageBody/JT808_0x0608Test.cs
@@ -70,7 +70,7 @@ namespace JT808.Protocol.Test.MessageBody
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(1u, value.Count);
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);
var item0 = jT808_0X8600.AreaItems[0];
Assert.Equal((uint)1522, item0.AreaId);
@@ -136,7 +136,7 @@ namespace JT808.Protocol.Test.MessageBody
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(1u, value.Count);
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);
var item0 = jT808_0X8602.AreaItems[0];
Assert.Equal((uint)1522, item0.AreaId);
@@ -186,7 +186,7 @@ namespace JT808.Protocol.Test.MessageBody
{
new JT808_0x8604
{ AreaId = 1234,
- AreaProperty = JT808SettingProperty.追加区域.ToByteValue(),
+ AreaProperty = JT808SettingProperty.append_region.ToByteValue(),
StartTime = DateTime.Parse("2020-01-07 00:00:12"),
EndTime = DateTime.Parse("2020-01-07 00:00:13"),
HighestSpeed = 62,
@@ -222,7 +222,7 @@ namespace JT808.Protocol.Test.MessageBody
Assert.Equal(1u, value.Count);
var jT808_0X8604 = value.JT808_0x8604s[0];
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.OverspeedDuration);
Assert.Equal(DateTime.Parse("2020-01-07 00:00:12"), jT808_0X8604.StartTime);
diff --git a/src/JT808.Protocol.Test/MessageBody/JT808_0x0801Test.cs b/src/JT808.Protocol.Test/MessageBody/JT808_0x0801Test.cs
index 016bdbb..f51ac29 100644
--- a/src/JT808.Protocol.Test/MessageBody/JT808_0x0801Test.cs
+++ b/src/JT808.Protocol.Test/MessageBody/JT808_0x0801Test.cs
@@ -30,7 +30,7 @@ namespace JT808.Protocol.Test.MessageBody
EventItemCoding = JT808EventItemCoding.regular_action.ToByteValue(),
MultimediaCodingFormat = JT808MultimediaCodingFormat.JPEG.ToByteValue(),
MultimediaId = 2567,
- MultimediaType = JT808MultimediaType.图像.ToByteValue(),
+ MultimediaType = JT808MultimediaType.image.ToByteValue(),
MultimediaDataPackage = new byte[] { 0x01, 0x02, 0x03, 0x04 },
Position = new JT808_0x0200
{
@@ -57,7 +57,7 @@ namespace JT808.Protocol.Test.MessageBody
Assert.Equal(JT808EventItemCoding.regular_action.ToByteValue(), jT808_0X0801.EventItemCoding);
Assert.Equal(JT808MultimediaCodingFormat.JPEG.ToByteValue(), jT808_0X0801.MultimediaCodingFormat);
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((uint)1, jT808_0X0801.Position.AlarmFlag);
Assert.Equal(40, jT808_0X0801.Position.Altitude);
@@ -107,7 +107,7 @@ namespace JT808.Protocol.Test.MessageBody
EventItemCoding = JT808EventItemCoding.regular_action.ToByteValue(),
MultimediaCodingFormat = JT808MultimediaCodingFormat.JPEG.ToByteValue(),
MultimediaId = 2567,
- MultimediaType = JT808MultimediaType.图像.ToByteValue(),
+ MultimediaType = JT808MultimediaType.image.ToByteValue(),
MultimediaDataPackage = new byte[] { 0x01, 0x02, 0x03, 0x04 }
};
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(JT808MultimediaCodingFormat.JPEG.ToByteValue(), jT808_0X0801.MultimediaCodingFormat);
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);
}
diff --git a/src/JT808.Protocol.Test/MessageBody/JT808_0x0802Test.cs b/src/JT808.Protocol.Test/MessageBody/JT808_0x0802Test.cs
index c10f67e..cee9115 100644
--- a/src/JT808.Protocol.Test/MessageBody/JT808_0x0802Test.cs
+++ b/src/JT808.Protocol.Test/MessageBody/JT808_0x0802Test.cs
@@ -25,7 +25,7 @@ namespace JT808.Protocol.Test.MessageBody
ChannelId = 123,
EventItemCoding = JT808EventItemCoding.regular_action.ToByteValue(),
MultimediaId = 258,
- MultimediaType = JT808MultimediaType.图像.ToByteValue(),
+ MultimediaType = JT808MultimediaType.image.ToByteValue(),
Position = new JT808_0x0200()
{
AlarmFlag = 1,
@@ -44,7 +44,7 @@ namespace JT808.Protocol.Test.MessageBody
ChannelId = 124,
EventItemCoding = JT808EventItemCoding.platform_delivery_order.ToByteValue(),
MultimediaId = 259,
- MultimediaType = JT808MultimediaType.视频.ToByteValue(),
+ MultimediaType = JT808MultimediaType.video.ToByteValue(),
Position = new JT808_0x0200()
{
AlarmFlag = 1,
@@ -73,7 +73,7 @@ namespace JT808.Protocol.Test.MessageBody
Assert.Equal(123, jT808_0X0802.MultimediaSearchItems[0].ChannelId);
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)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(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)1, jT808_0X0802.MultimediaSearchItems[1].Position.AlarmFlag);
@@ -120,7 +120,7 @@ namespace JT808.Protocol.Test.MessageBody
{
ChannelId = 123,
EventItemCoding = JT808EventItemCoding.regular_action.ToByteValue(),
- MultimediaType = JT808MultimediaType.图像.ToByteValue(),
+ MultimediaType = JT808MultimediaType.image.ToByteValue(),
Position = new JT808_0x0200()
{
AlarmFlag = 1,
@@ -138,7 +138,7 @@ namespace JT808.Protocol.Test.MessageBody
{
ChannelId = 124,
EventItemCoding = JT808EventItemCoding.platform_delivery_order.ToByteValue(),
- MultimediaType = JT808MultimediaType.视频.ToByteValue(),
+ MultimediaType = JT808MultimediaType.video.ToByteValue(),
Position = new JT808_0x0200()
{
AlarmFlag = 1,
@@ -167,7 +167,7 @@ namespace JT808.Protocol.Test.MessageBody
Assert.Equal(123, jT808_0X0802.MultimediaSearchItems[0].ChannelId);
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((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(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((ushort)40, jT808_0X0802.MultimediaSearchItems[1].Position.Altitude);
diff --git a/src/JT808.Protocol.Test/MessageBody/JT808_0x8001Test.cs b/src/JT808.Protocol.Test/MessageBody/JT808_0x8001Test.cs
index 7b78d2f..8415615 100644
--- a/src/JT808.Protocol.Test/MessageBody/JT808_0x8001Test.cs
+++ b/src/JT808.Protocol.Test/MessageBody/JT808_0x8001Test.cs
@@ -21,7 +21,7 @@ namespace JT808.Protocol.Test.MessageBody
Bodies = new JT808_0x8001
{
AckMsgId = Enums.JT808MsgId.位置信息汇报.ToUInt16Value(),
- JT808PlatformResult = Enums.JT808PlatformResult.成功,
+ JT808PlatformResult = Enums.JT808PlatformResult.succeed,
MsgNum = 100
}
};
@@ -51,7 +51,7 @@ namespace JT808.Protocol.Test.MessageBody
JT808_0x8001 JT808Bodies = (JT808_0x8001)jT808Package.Bodies;
Assert.Equal(Enums.JT808MsgId.位置信息汇报.ToUInt16Value(), JT808Bodies.AckMsgId);
Assert.Equal(100, JT808Bodies.MsgNum);
- Assert.Equal(Enums.JT808PlatformResult.成功, JT808Bodies.JT808PlatformResult);
+ Assert.Equal(Enums.JT808PlatformResult.succeed, JT808Bodies.JT808PlatformResult);
}
[Fact]
diff --git a/src/JT808.Protocol.Test/MessageBody/JT808_0x8100Test.cs b/src/JT808.Protocol.Test/MessageBody/JT808_0x8100Test.cs
index d717918..5b6855b 100644
--- a/src/JT808.Protocol.Test/MessageBody/JT808_0x8100Test.cs
+++ b/src/JT808.Protocol.Test/MessageBody/JT808_0x8100Test.cs
@@ -21,7 +21,7 @@ namespace JT808.Protocol.Test.MessageBody
Bodies = new JT808_0x8100
{
Code = "123456",
- JT808TerminalRegisterResult = Enums.JT808TerminalRegisterResult.成功,
+ JT808TerminalRegisterResult = Enums.JT808TerminalRegisterResult.success,
AckMsgNum = 100
}
};
@@ -51,7 +51,7 @@ namespace JT808.Protocol.Test.MessageBody
JT808_0x8100 JT808Bodies = (JT808_0x8100)jT808Package.Bodies;
Assert.Equal("123456", JT808Bodies.Code);
Assert.Equal(100, JT808Bodies.AckMsgNum);
- Assert.Equal(Enums.JT808TerminalRegisterResult.成功, JT808Bodies.JT808TerminalRegisterResult);
+ Assert.Equal(Enums.JT808TerminalRegisterResult.success, JT808Bodies.JT808TerminalRegisterResult);
}
[Fact]
@@ -68,7 +68,7 @@ namespace JT808.Protocol.Test.MessageBody
Bodies = new JT808_0x8100
{
Code = "123456",
- JT808TerminalRegisterResult = Enums.JT808TerminalRegisterResult.数据库中无该终端,
+ JT808TerminalRegisterResult = Enums.JT808TerminalRegisterResult.terminal_not_database,
AckMsgNum = 100
}
};
@@ -97,7 +97,7 @@ namespace JT808.Protocol.Test.MessageBody
JT808_0x8100 JT808Bodies = (JT808_0x8100)jT808Package.Bodies;
Assert.Null(JT808Bodies.Code);
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
{
Code = "zssdaf23124sfdsc",
- JT808TerminalRegisterResult = Enums.JT808TerminalRegisterResult.成功,
+ JT808TerminalRegisterResult = Enums.JT808TerminalRegisterResult.success,
AckMsgNum = 100
}
};
@@ -136,7 +136,7 @@ namespace JT808.Protocol.Test.MessageBody
JT808_0x8100 JT808Bodies = (JT808_0x8100)jT808Package.Bodies;
Assert.Equal("zssdaf23124sfdsc", JT808Bodies.Code);
Assert.Equal(100, JT808Bodies.AckMsgNum);
- Assert.Equal(Enums.JT808TerminalRegisterResult.成功, JT808Bodies.JT808TerminalRegisterResult);
+ Assert.Equal(Enums.JT808TerminalRegisterResult.success, JT808Bodies.JT808TerminalRegisterResult);
}
[Fact]
diff --git a/src/JT808.Protocol.Test/MessageBody/JT808_0x8108Test.cs b/src/JT808.Protocol.Test/MessageBody/JT808_0x8108Test.cs
index e77d8a9..7981d0f 100644
--- a/src/JT808.Protocol.Test/MessageBody/JT808_0x8108Test.cs
+++ b/src/JT808.Protocol.Test/MessageBody/JT808_0x8108Test.cs
@@ -13,7 +13,7 @@ namespace JT808.Protocol.Test.MessageBody
{
JT808_0x8108 jT808_0X8108 = new JT808_0x8108
{
- UpgradeType = JT808UpgradeType.北斗卫星定位模块,
+ UpgradeType = JT808UpgradeType.beidou_module,
MakerId = "asdfg",
VersionNum = "qscvhiuytrew",
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();
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("qscvhiuytrew", jT808_0X8108.VersionNum);
Assert.Equal(new byte[] { 1, 2, 3, 4, 5 }, jT808_0X8108.UpgradePackage);
diff --git a/src/JT808.Protocol.Test/MessageBody/JT808_0x8401Test.cs b/src/JT808.Protocol.Test/MessageBody/JT808_0x8401Test.cs
index 412945b..9ec05e8 100644
--- a/src/JT808.Protocol.Test/MessageBody/JT808_0x8401Test.cs
+++ b/src/JT808.Protocol.Test/MessageBody/JT808_0x8401Test.cs
@@ -14,18 +14,18 @@ namespace JT808.Protocol.Test.MessageBody
{
JT808_0x8401 jT808_0X8401 = new JT808_0x8401
{
- SettingTelephoneBook = Enums.JT808SettingTelephoneBook.追加电话本
+ SettingTelephoneBook = Enums.JT808SettingTelephoneBook.append_phone_book
};
List<JT808ContactProperty> jT808ContactProperties = new List<JT808ContactProperty>();
jT808ContactProperties.Add(new JT808ContactProperty
{
- TelephoneBookContactType= Enums.JT808TelephoneBookContactType.呼入,
+ TelephoneBookContactType= Enums.JT808TelephoneBookContactType.callin,
Contact="smallchi",
PhoneNumber="13456smallch"
});
jT808ContactProperties.Add(new JT808ContactProperty
{
- TelephoneBookContactType = Enums.JT808TelephoneBookContactType.呼入_呼出,
+ TelephoneBookContactType = Enums.JT808TelephoneBookContactType.call_in_out,
Contact = "koike",
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();
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("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("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);
}
diff --git a/src/JT808.Protocol.Test/MessageBody/JT808_0x8600Test.cs b/src/JT808.Protocol.Test/MessageBody/JT808_0x8600Test.cs
index d8d5be8..625900c 100644
--- a/src/JT808.Protocol.Test/MessageBody/JT808_0x8600Test.cs
+++ b/src/JT808.Protocol.Test/MessageBody/JT808_0x8600Test.cs
@@ -16,7 +16,7 @@ namespace JT808.Protocol.Test.MessageBody
{
JT808_0x8600 jT808_0X8600 = new JT808_0x8600
{
- SettingAreaProperty = JT808SettingProperty.追加区域.ToByteValue(),
+ SettingAreaProperty = JT808SettingProperty.append_region.ToByteValue(),
AreaItems = new List<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();
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);
var item0 = jT808_0X8600.AreaItems[0];
@@ -118,7 +118,7 @@ namespace JT808.Protocol.Test.MessageBody
{
JT808_0x8600 jT808_0X8600 = new JT808_0x8600
{
- SettingAreaProperty = JT808SettingProperty.追加区域.ToByteValue(),
+ SettingAreaProperty = JT808SettingProperty.append_region.ToByteValue(),
AreaItems = new List<JT808CircleAreaProperty>()
};
jT808_0X8600.AreaItems.Add(new JT808CircleAreaProperty
@@ -146,7 +146,7 @@ namespace JT808.Protocol.Test.MessageBody
byte[] bytes = "0101000005F200DE075BCD15075BCD15000000C8003CC8029A0008536D616C6C436869".ToHexBytes();
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);
var item0 = jT808_0X8600.AreaItems[0];
Assert.Equal((uint)1522, item0.AreaId);
diff --git a/src/JT808.Protocol.Test/MessageBody/JT808_0x8602Test.cs b/src/JT808.Protocol.Test/MessageBody/JT808_0x8602Test.cs
index 624749e..b56a210 100644
--- a/src/JT808.Protocol.Test/MessageBody/JT808_0x8602Test.cs
+++ b/src/JT808.Protocol.Test/MessageBody/JT808_0x8602Test.cs
@@ -16,7 +16,7 @@ namespace JT808.Protocol.Test.MessageBody
{
JT808_0x8602 jT808_0X8602 = new JT808_0x8602
{
- SettingAreaProperty = JT808SettingProperty.追加区域.ToByteValue(),
+ SettingAreaProperty = JT808SettingProperty.append_region.ToByteValue(),
AreaItems = new List<JT808RectangleAreaProperty>()
};
jT808_0X8602.AreaItems.Add(new JT808RectangleAreaProperty
@@ -55,7 +55,7 @@ namespace JT808.Protocol.Test.MessageBody
byte[] bytes = "0102000005F200DE075BCD13075BCD12075BCD15075BCD14003CC8000005F3000A075BCCBE075BCCBF075BCCBC075BCCBD003CC8".ToHexBytes();
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);
var item0 = jT808_0X8602.AreaItems[0];
diff --git a/src/JT808.Protocol.Test/MessageBody/JT808_0x8604Test.cs b/src/JT808.Protocol.Test/MessageBody/JT808_0x8604Test.cs
index eb5fb12..63f4973 100644
--- a/src/JT808.Protocol.Test/MessageBody/JT808_0x8604Test.cs
+++ b/src/JT808.Protocol.Test/MessageBody/JT808_0x8604Test.cs
@@ -17,7 +17,7 @@ namespace JT808.Protocol.Test.MessageBody
JT808_0x8604 jT808_0X8604 = new JT808_0x8604
{
AreaId = 1234,
- AreaProperty = JT808SettingProperty.追加区域.ToByteValue(),
+ AreaProperty = JT808SettingProperty.append_region.ToByteValue(),
StartTime = DateTime.Parse("2018-11-20 00:00:12"),
EndTime = DateTime.Parse("2018-11-21 00:00:12"),
HighestSpeed = 62,
@@ -44,7 +44,7 @@ namespace JT808.Protocol.Test.MessageBody
byte[] bytes = "000004D200011811200000121811210000120002075BCD15075BCD14075BCCBC075BCCBD".ToHexBytes();
JT808_0x8604 jT808_0X8604 = JT808Serializer.Deserialize<JT808_0x8604>(bytes);
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.OverspeedDuration);
diff --git a/src/JT808.Protocol.Test/MessageBody/JT808_0x8802Test.cs b/src/JT808.Protocol.Test/MessageBody/JT808_0x8802Test.cs
index 4a7af95..0124c70 100644
--- a/src/JT808.Protocol.Test/MessageBody/JT808_0x8802Test.cs
+++ b/src/JT808.Protocol.Test/MessageBody/JT808_0x8802Test.cs
@@ -16,7 +16,7 @@ namespace JT808.Protocol.Test.MessageBody
{
ChannelId = 123,
EventItemCoding = JT808EventItemCoding.collision_rollover_alarm_triggered.ToByteValue(),
- MultimediaType = JT808MultimediaType.视频.ToByteValue(),
+ MultimediaType = JT808MultimediaType.video.ToByteValue(),
StartTime = DateTime.Parse("2018-11-16 21: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);
Assert.Equal(123, jT808_0X8802.ChannelId);
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 22:00:08"), jT808_0X8802.EndTime);
}
diff --git a/src/JT808.Protocol.Test/MessageBody/JT808_0x8803Test.cs b/src/JT808.Protocol.Test/MessageBody/JT808_0x8803Test.cs
index 08349ba..3e3dbbb 100644
--- a/src/JT808.Protocol.Test/MessageBody/JT808_0x8803Test.cs
+++ b/src/JT808.Protocol.Test/MessageBody/JT808_0x8803Test.cs
@@ -16,8 +16,8 @@ namespace JT808.Protocol.Test.MessageBody
{
ChannelId = 128,
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"),
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);
Assert.Equal(128, jT808_0X8803.ChannelId);
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 23:00:21"), jT808_0X8803.EndTime);
}
diff --git a/src/JT808.Protocol.Test/MessageBody/JT808_0x8804Test.cs b/src/JT808.Protocol.Test/MessageBody/JT808_0x8804Test.cs
index a9878fe..5f3adf5 100644
--- a/src/JT808.Protocol.Test/MessageBody/JT808_0x8804Test.cs
+++ b/src/JT808.Protocol.Test/MessageBody/JT808_0x8804Test.cs
@@ -13,9 +13,9 @@ namespace JT808.Protocol.Test.MessageBody
{
JT808_0x8804 jT808_0X8804 = new JT808_0x8804
{
- RecordCmd = JT808RecordCmd.停止录音,
+ RecordCmd = JT808RecordCmd.stop,
RecordTime = 30,
- RecordSave = JT808RecordSave.实时上传,
+ RecordSave = JT808RecordSave.realtime_upload,
AudioSampleRate = 1
};
string hex = JT808Serializer.Serialize(jT808_0X8804).ToHexString();
@@ -28,9 +28,9 @@ namespace JT808.Protocol.Test.MessageBody
{
byte[] bytes = "00 00 1E 00 01".ToHexBytes();
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(JT808RecordSave.实时上传, jT808_0X8804.RecordSave);
+ Assert.Equal(JT808RecordSave.realtime_upload, jT808_0X8804.RecordSave);
Assert.Equal(1, jT808_0X8804.AudioSampleRate);
}
[Fact]
diff --git a/src/JT808.Protocol.Test/MessageBody/JT808_0x8805Test.cs b/src/JT808.Protocol.Test/MessageBody/JT808_0x8805Test.cs
index 24c9e84..5ebcc20 100644
--- a/src/JT808.Protocol.Test/MessageBody/JT808_0x8805Test.cs
+++ b/src/JT808.Protocol.Test/MessageBody/JT808_0x8805Test.cs
@@ -13,7 +13,7 @@ namespace JT808.Protocol.Test.MessageBody
JT808_0x8805 jT808_0X8805 = new JT808_0x8805
{
MultimediaId = 10000,
- MultimediaDeleted = Enums.JT808MultimediaDeleted.保留.ToByteValue()
+ MultimediaDeleted = Enums.JT808MultimediaDeleted.reserve.ToByteValue()
};
string hex = JT808Serializer.Serialize(jT808_0X8805).ToHexString();
Assert.Equal("0000271000", hex);
@@ -24,7 +24,7 @@ namespace JT808.Protocol.Test.MessageBody
{
byte[] bytes = "00 00 27 10 00".ToHexBytes();
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);
}
[Fact]
diff --git a/src/JT808.Protocol.Test/Simples/Demo16.cs b/src/JT808.Protocol.Test/Simples/Demo16.cs
index 9c3883a..c73a694 100644
--- a/src/JT808.Protocol.Test/Simples/Demo16.cs
+++ b/src/JT808.Protocol.Test/Simples/Demo16.cs
@@ -49,7 +49,7 @@ namespace JT808.Protocol.Test.Simples
{
var bodies = new JT808_0x8108
{
- UpgradeType = JT808UpgradeType.终端,
+ UpgradeType = JT808UpgradeType.terminal,
VersionNum = "v1.2.1",
MakerId = "1234",
UpgradePackage = splitPackage[i - 1].Data
diff --git a/src/JT808.Protocol/Enums/JT808IOStatus.cs b/src/JT808.Protocol/Enums/JT808IOStatus.cs
index b1c9c82..836fa74 100644
--- a/src/JT808.Protocol/Enums/JT808IOStatus.cs
+++ b/src/JT808.Protocol/Enums/JT808IOStatus.cs
@@ -6,17 +6,20 @@ namespace JT808.Protocol.Enums
{
/// <summary>
/// IO状态位
+ /// IO status bits
/// </summary>
[Flags]
public enum JT808IOStatus:ushort
{
/// <summary>
/// 深度休眠状态
+ /// Deep dormant state
/// </summary>
- 深度休眠状态 = 1,
+ deep_dormant_state = 1,
/// <summary>
/// 休眠状态
+ /// dormant state
/// </summary>
- 休眠状态 = 2
+ dormant_state = 2
}
}
diff --git a/src/JT808.Protocol/Enums/JT808MultimediaCodingFormat.cs b/src/JT808.Protocol/Enums/JT808MultimediaCodingFormat.cs
index 4e0f27e..b097c65 100644
--- a/src/JT808.Protocol/Enums/JT808MultimediaCodingFormat.cs
+++ b/src/JT808.Protocol/Enums/JT808MultimediaCodingFormat.cs
@@ -2,6 +2,7 @@
{
/// <summary>
/// 多媒体格式编码
+ /// Multimedia format coding
/// </summary>
public enum JT808MultimediaCodingFormat : byte
{
diff --git a/src/JT808.Protocol/Enums/JT808MultimediaDeleted.cs b/src/JT808.Protocol/Enums/JT808MultimediaDeleted.cs
index 1113dc8..261d812 100644
--- a/src/JT808.Protocol/Enums/JT808MultimediaDeleted.cs
+++ b/src/JT808.Protocol/Enums/JT808MultimediaDeleted.cs
@@ -3,16 +3,19 @@
/// <summary>
/// 删除标志
/// 单条存储多媒体数据检索上传命令
+ /// Single storage multimedia data retrieval upload command
/// </summary>
public enum JT808MultimediaDeleted : byte
{
/// <summary>
/// 保留
+ /// reserve
/// </summary>
- 保留 = 0,
+ reserve = 0,
/// <summary>
/// 删除
+ /// delete
/// </summary>
- 删除 = 1
+ delete = 1
}
}
diff --git a/src/JT808.Protocol/Enums/JT808MultimediaType.cs b/src/JT808.Protocol/Enums/JT808MultimediaType.cs
index f2c49c9..212b108 100644
--- a/src/JT808.Protocol/Enums/JT808MultimediaType.cs
+++ b/src/JT808.Protocol/Enums/JT808MultimediaType.cs
@@ -2,20 +2,24 @@
{
/// <summary>
/// 多媒体类型
+ /// Multimedia Type
/// </summary>
public enum JT808MultimediaType : byte
{
/// <summary>
/// 图像
+ /// image
/// </summary>
- 图像 = 0x00,
+ image = 0x00,
/// <summary>
/// 音频
+ /// audio
/// </summary>
- 音频 = 0x01,
+ audio = 0x01,
/// <summary>
/// 视频
+ /// video
/// </summary>
- 视频 = 0x02
+ video = 0x02
}
}
diff --git a/src/JT808.Protocol/Enums/JT808PhoneNumberType.cs b/src/JT808.Protocol/Enums/JT808PhoneNumberType.cs
index 908128b..ee5f8eb 100644
--- a/src/JT808.Protocol/Enums/JT808PhoneNumberType.cs
+++ b/src/JT808.Protocol/Enums/JT808PhoneNumberType.cs
@@ -12,15 +12,16 @@
{
/// <summary>
/// 大陆
+ /// china
/// </summary>
- 大陆 = 11,
+ china = 11,
/// <summary>
/// 香港|澳门
/// </summary>
- 香港_澳门 = 8,
+ china_hongkong_macao = 8,
/// <summary>
/// 台湾
/// </summary>
- 台湾 = 10
+ china_taiwan = 10
}
}
diff --git a/src/JT808.Protocol/Enums/JT808PlatformResult.cs b/src/JT808.Protocol/Enums/JT808PlatformResult.cs
index 4fb6bdd..4a89c9b 100644
--- a/src/JT808.Protocol/Enums/JT808PlatformResult.cs
+++ b/src/JT808.Protocol/Enums/JT808PlatformResult.cs
@@ -2,28 +2,34 @@
{
/// <summary>
/// 返回结果
+ /// return to the result
/// </summary>
public enum JT808PlatformResult : byte
{
/// <summary>
/// 成功/确认
+ /// succeed
/// </summary>
- 成功 = 0x00,
+ succeed = 0x00,
/// <summary>
/// 失败
+ /// fail
/// </summary>
- 失败 = 0x01,
+ fail = 0x01,
/// <summary>
/// 消息有误
+ /// The message is wrong
/// </summary>
- 消息有误 = 0x02,
+ message_wrong = 0x02,
/// <summary>
/// 不支持
+ /// nonsupport
/// </summary>
- 不支持 = 0x03,
+ nonsupport = 0x03,
/// <summary>
/// 报警处理确认
+ /// Alarm processing confirmation
/// </summary>
- 报警处理确认 = 0x04
+ alarm_processing_confirmation = 0x04
}
}
diff --git a/src/JT808.Protocol/Enums/JT808PositionType.cs b/src/JT808.Protocol/Enums/JT808PositionType.cs
index 2e54e71..743a7de 100644
--- a/src/JT808.Protocol/Enums/JT808PositionType.cs
+++ b/src/JT808.Protocol/Enums/JT808PositionType.cs
@@ -2,28 +2,33 @@
{
/// <summary>
/// 位置类型
+ /// Position type
/// </summary>
public enum JT808PositionType : byte
{
/// <summary>
/// 无特定位置
+ /// No specific position
/// </summary>
- 无特定位置 = 0x00,
+ no_specific_position = 0x00,
/// <summary>
/// 圆形区域
+ /// circular region
/// </summary>
- 圆形区域 = 0x01,
+ circular_region = 0x01,
/// <summary>
/// 矩形区域
/// </summary>
- 矩形区域 = 0x02,
+ rectangular_region = 0x02,
/// <summary>
/// 多边形区域
+ /// polyarea
/// </summary>
- 多边形区域 = 0x03,
+ polyarea = 0x03,
/// <summary>
/// 路段
+ /// Road Segment
/// </summary>
- 路段 = 0x04
+ road_segment = 0x04
}
}
diff --git a/src/JT808.Protocol/Enums/JT808RecordCmd.cs b/src/JT808.Protocol/Enums/JT808RecordCmd.cs
index c62dc44..0a1a961 100644
--- a/src/JT808.Protocol/Enums/JT808RecordCmd.cs
+++ b/src/JT808.Protocol/Enums/JT808RecordCmd.cs
@@ -2,16 +2,19 @@
{
/// <summary>
/// 录音命令
+ /// The recording command
/// </summary>
public enum JT808RecordCmd : byte
{
/// <summary>
/// 停止录音
+ /// stop
/// </summary>
- 停止录音 = 0x00,
+ stop = 0x00,
/// <summary>
- /// 停止录音
+ /// 开始录音
+ /// start
/// </summary>
- 开始录音 = 0x01
+ start = 0x01
}
}
diff --git a/src/JT808.Protocol/Enums/JT808RecordSave.cs b/src/JT808.Protocol/Enums/JT808RecordSave.cs
index ee640d9..948d4ae 100644
--- a/src/JT808.Protocol/Enums/JT808RecordSave.cs
+++ b/src/JT808.Protocol/Enums/JT808RecordSave.cs
@@ -2,16 +2,19 @@
{
/// <summary>
/// 保存标志
+ /// Save the logo
/// </summary>
public enum JT808RecordSave : byte
{
/// <summary>
/// 实时上传
+ /// In real time to upload
/// </summary>
- 实时上传 = 0,
+ realtime_upload = 0,
/// <summary>
/// 保存
+ /// Save
/// </summary>
- 保存 = 1
+ save = 1
}
}
diff --git a/src/JT808.Protocol/Enums/JT808SettingProperty.cs b/src/JT808.Protocol/Enums/JT808SettingProperty.cs
index 779cf7c..96db4b3 100644
--- a/src/JT808.Protocol/Enums/JT808SettingProperty.cs
+++ b/src/JT808.Protocol/Enums/JT808SettingProperty.cs
@@ -2,20 +2,24 @@
{
/// <summary>
/// 设置属性
+ /// set attributes
/// </summary>
public enum JT808SettingProperty : byte
{
/// <summary>
/// 更新区域
+ /// update region
/// </summary>
- 更新区域 = 0x00,
+ update_region = 0x00,
/// <summary>
/// 追加区域
+ /// append region
/// </summary>
- 追加区域 = 0x01,
+ append_region = 0x01,
/// <summary>
/// 修改区域
+ /// modify region
/// </summary>
- 修改区域 = 0x02
+ modify_region = 0x02
}
}
diff --git a/src/JT808.Protocol/Enums/JT808SettingTelephoneBook.cs b/src/JT808.Protocol/Enums/JT808SettingTelephoneBook.cs
index d7fb971..ca36fbc 100644
--- a/src/JT808.Protocol/Enums/JT808SettingTelephoneBook.cs
+++ b/src/JT808.Protocol/Enums/JT808SettingTelephoneBook.cs
@@ -1,25 +1,30 @@
namespace JT808.Protocol.Enums
{
/// <summary>
- /// 设置电话本 设置类型
+ /// 设置电话本设置类型
+ /// Set the phone book setting type
/// </summary>
public enum JT808SettingTelephoneBook : byte
{
/// <summary>
/// 删除终端上所有存储的联系人
+ /// Delete all contacts stored on the terminal
/// </summary>
- 删除终端上所有存储的联系人 = 0,
+ delete_all = 0,
/// <summary>
/// 更新电话本_删除终端中已有全部联系人并追加消息中的联系人
+ /// Update the phone book _ Delete all contacts from the terminal and add contacts to the message
/// </summary>
- 更新电话本_删除终端中已有全部联系人并追加消息中的联系人 = 1,
+ update_phone_book=1,
/// <summary>
/// 追加电话本
+ /// Append phone book
/// </summary>
- 追加电话本 = 2,
+ append_phone_book = 2,
/// <summary>
/// 修改电话本_以联系人为索引
+ /// Modify the phone book to index contacts
/// </summary>
- 修改电话本_以联系人为索引 = 3
+ modify_phone_book = 3
}
}
diff --git a/src/JT808.Protocol/Enums/JT808TelephoneBookContactType.cs b/src/JT808.Protocol/Enums/JT808TelephoneBookContactType.cs
index 5781fcd..baa985f 100644
--- a/src/JT808.Protocol/Enums/JT808TelephoneBookContactType.cs
+++ b/src/JT808.Protocol/Enums/JT808TelephoneBookContactType.cs
@@ -2,20 +2,24 @@
{
/// <summary>
/// 电话本联系人标志
+ /// Phone book contact mark
/// </summary>
public enum JT808TelephoneBookContactType : byte
{
/// <summary>
/// 呼入
+ /// call_in
/// </summary>
- 呼入 = 1,
+ callin = 1,
/// <summary>
/// 呼出
+ /// call_out
/// </summary>
- 呼出 = 2,
+ callout = 2,
/// <summary>
/// 呼入_呼出
+ /// call_in|call_out
/// </summary>
- 呼入_呼出 = 3
+ call_in_out = 3
}
}
diff --git a/src/JT808.Protocol/Enums/JT808TerminalRegisterResult.cs b/src/JT808.Protocol/Enums/JT808TerminalRegisterResult.cs
index bc25a68..bdb8ded 100644
--- a/src/JT808.Protocol/Enums/JT808TerminalRegisterResult.cs
+++ b/src/JT808.Protocol/Enums/JT808TerminalRegisterResult.cs
@@ -2,28 +2,34 @@
{
/// <summary>
/// 终端注册返回结果
+ /// The terminal registration result is returned
/// </summary>
public enum JT808TerminalRegisterResult : byte
{
/// <summary>
/// 成功
+ /// success
/// </summary>
- 成功 = 0x00,
+ success = 0x00,
/// <summary>
/// 车辆已被注册
+ /// The vehicle has been registered
/// </summary>
- 车辆已被注册 = 0x01,
+ vehicle_registered = 0x01,
/// <summary>
/// 数据库中无该车辆
+ /// The vehicle is not in the database
/// </summary>
- 数据库中无该车辆 = 0x02,
+ vehicle_not_database = 0x02,
/// <summary>
/// 终端已被注册
+ /// The terminal has been registered
/// </summary>
- 终端已被注册 = 0x03,
+ terminal_registered = 0x03,
/// <summary>
/// 数据库中无该终端
+ /// The terminal is not in the database
/// </summary>
- 数据库中无该终端 = 0x04
+ terminal_not_database = 0x04
}
}
diff --git a/src/JT808.Protocol/Enums/JT808TerminalResult.cs b/src/JT808.Protocol/Enums/JT808TerminalResult.cs
index e602767..71d4a40 100644
--- a/src/JT808.Protocol/Enums/JT808TerminalResult.cs
+++ b/src/JT808.Protocol/Enums/JT808TerminalResult.cs
@@ -2,6 +2,7 @@
{
/// <summary>
/// 通用应答返回
+ /// Universal reply return
/// </summary>
public enum JT808TerminalResult : byte
{
diff --git a/src/JT808.Protocol/Enums/JT808UpgradeResult.cs b/src/JT808.Protocol/Enums/JT808UpgradeResult.cs
index 43b27af..d37acf1 100644
--- a/src/JT808.Protocol/Enums/JT808UpgradeResult.cs
+++ b/src/JT808.Protocol/Enums/JT808UpgradeResult.cs
@@ -2,36 +2,44 @@
{
/// <summary>
/// 升级结果
+ /// Upgrade Result
/// </summary>
public enum JT808UpgradeResult : byte
{
/// <summary>
/// 成功
+ /// success
/// </summary>
- 成功 = 0x00,
+ success = 0x00,
/// <summary>
/// 失败
+ /// fail
/// </summary>
- 失败 = 0x01,
+ fail = 0x01,
/// <summary>
/// 取消
+ /// cancel
/// </summary>
- 取消 = 0x02,
+ cancel = 0x02,
/// <summary>
/// 粤标主动安全-未找到目标设备
+ /// Yue Biao active Safety. - Target device not found
/// </summary>
- 未找到目标设备 = 0x10,
+ yue_biao_active_safety_target_device_not_found = 0x10,
/// <summary>
/// 粤标主动安全-硬件型号不支持
+ /// Yue Biao Active Safety - hardware models not supported
/// </summary>
- 硬件型号不支持 = 0x11,
+ yue_biao_active_safety_hardware_not_supported = 0x11,
/// <summary>
/// 粤标主动安全-软件版本相同
+ /// Yue Biao Active Safety - Same Software Version
/// </summary>
- 软件版本相同 = 0x12,
+ yue_biao_active_safety_same_software_version = 0x12,
/// <summary>
/// 粤标主动安全-软件版本不支持
+ /// Yue Biao Active Safety - The software version is not supported
/// </summary>
- 软件版本不支持 = 0x13
+ yue_biao_active_safety_same_software_version_not_supported = 0x13
}
}
diff --git a/src/JT808.Protocol/Enums/JT808UpgradeType.cs b/src/JT808.Protocol/Enums/JT808UpgradeType.cs
index dff1a4d..aeb0a79 100644
--- a/src/JT808.Protocol/Enums/JT808UpgradeType.cs
+++ b/src/JT808.Protocol/Enums/JT808UpgradeType.cs
@@ -2,36 +2,44 @@
{
/// <summary>
/// 升级类型
+ /// Upgrade Type
/// </summary>
public enum JT808UpgradeType : byte
{
/// <summary>
/// 终端
+ /// terminal
/// </summary>
- 终端 = 0,
+ terminal = 0,
/// <summary>
/// 道路运输证IC卡读卡器
+ /// Road transport certificate IC card reader
/// </summary>
- 道路运输证IC卡读卡器 = 0x0C,
+ road_transport_cert_ic_card_reader = 0x0C,
/// <summary>
/// 北斗卫星定位模块
+ /// Beidou satellite positioning module
/// </summary>
- 北斗卫星定位模块 = 0x34,
+ beidou_module = 0x34,
/// <summary>
/// 粤标主动安全-高级驾驶辅助系统
+ /// Advanced driver assistance system
/// </summary>
- 高级驾驶辅助系统 = 0x64,
+ adas = 0x64,
/// <summary>
/// 粤标主动安全-驾驶状态监控系统
+ /// Driving condition monitoring system
/// </summary>
- 驾驶状态监控系统 = 0x65,
+ dsm = 0x65,
/// <summary>
/// 粤标主动安全-胎压监测系统
+ /// tire pressure monitoring system
/// </summary>
- 胎压监测系统 = 0x66,
+ tpms = 0x66,
/// <summary>
/// 粤标主动安全-盲点监测系统
+ /// Blind Spot Monitoring system
/// </summary>
- 盲点监测系统 = 0x67,
+ bsd = 0x67,
}
}
diff --git a/src/JT808.Protocol/Enums/JT808Version.cs b/src/JT808.Protocol/Enums/JT808Version.cs
index fe7730c..80bfeb8 100644
--- a/src/JT808.Protocol/Enums/JT808Version.cs
+++ b/src/JT808.Protocol/Enums/JT808Version.cs
@@ -6,6 +6,7 @@ namespace JT808.Protocol.Enums
{
/// <summary>
/// JT808版本号
+ /// JT808 Version
/// </summary>
public enum JT808Version:byte
{
diff --git a/src/JT808.Protocol/JT808.Protocol.xml b/src/JT808.Protocol/JT808.Protocol.xml
index e361850..1218776 100644
--- a/src/JT808.Protocol/JT808.Protocol.xml
+++ b/src/JT808.Protocol/JT808.Protocol.xml
@@ -813,16 +813,19 @@
<member name="T:JT808.Protocol.Enums.JT808IOStatus">
<summary>
IO状态位
+ IO status bits
</summary>
</member>
- <member name="F:JT808.Protocol.Enums.JT808IOStatus.深度休眠状态">
+ <member name="F:JT808.Protocol.Enums.JT808IOStatus.deep_dormant_state">
<summary>
深度休眠状态
+ Deep dormant state
</summary>
</member>
- <member name="F:JT808.Protocol.Enums.JT808IOStatus.休眠状态">
+ <member name="F:JT808.Protocol.Enums.JT808IOStatus.dormant_state">
<summary>
休眠状态
+ dormant state
</summary>
</member>
<member name="T:JT808.Protocol.Enums.JT808MsgId">
@@ -1259,6 +1262,7 @@
<member name="T:JT808.Protocol.Enums.JT808MultimediaCodingFormat">
<summary>
多媒体格式编码
+ Multimedia format coding
</summary>
</member>
<member name="F:JT808.Protocol.Enums.JT808MultimediaCodingFormat.JPEG">
@@ -1290,36 +1294,43 @@
<summary>
删除标志
单条存储多媒体数据检索上传命令
+ Single storage multimedia data retrieval upload command
</summary>
</member>
- <member name="F:JT808.Protocol.Enums.JT808MultimediaDeleted.保留">
+ <member name="F:JT808.Protocol.Enums.JT808MultimediaDeleted.reserve">
<summary>
保留
+ reserve
</summary>
</member>
- <member name="F:JT808.Protocol.Enums.JT808MultimediaDeleted.删除">
+ <member name="F:JT808.Protocol.Enums.JT808MultimediaDeleted.delete">
<summary>
删除
+ delete
</summary>
</member>
<member name="T:JT808.Protocol.Enums.JT808MultimediaType">
<summary>
多媒体类型
+ Multimedia Type
</summary>
</member>
- <member name="F:JT808.Protocol.Enums.JT808MultimediaType.图像">
+ <member name="F:JT808.Protocol.Enums.JT808MultimediaType.image">
<summary>
图像
+ image
</summary>
</member>
- <member name="F:JT808.Protocol.Enums.JT808MultimediaType.音频">
+ <member name="F:JT808.Protocol.Enums.JT808MultimediaType.audio">
<summary>
音频
+ audio
</summary>
</member>
- <member name="F:JT808.Protocol.Enums.JT808MultimediaType.视频">
+ <member name="F:JT808.Protocol.Enums.JT808MultimediaType.video">
<summary>
视频
+ video
</summary>
</member>
<member name="T:JT808.Protocol.Enums.JT808PhoneNumberType">
@@ -1332,17 +1343,18 @@
假如是其他地方打来要改成打 +886912345678
</summary>
</member>
- <member name="F:JT808.Protocol.Enums.JT808PhoneNumberType.大陆">
+ <member name="F:JT808.Protocol.Enums.JT808PhoneNumberType.china">
<summary>
大陆
+ china
</summary>
</member>
- <member name="F:JT808.Protocol.Enums.JT808PhoneNumberType.香港_澳门">
+ <member name="F:JT808.Protocol.Enums.JT808PhoneNumberType.china_hongkong_macao">
<summary>
香港|澳门
</summary>
</member>
- <member name="F:JT808.Protocol.Enums.JT808PhoneNumberType.台湾">
+ <member name="F:JT808.Protocol.Enums.JT808PhoneNumberType.china_taiwan">
<summary>
台湾
</summary>
@@ -1350,136 +1362,162 @@
<member name="T:JT808.Protocol.Enums.JT808PlatformResult">
<summary>
返回结果
+ return to the result
</summary>
</member>
- <member name="F:JT808.Protocol.Enums.JT808PlatformResult.成功">
+ <member name="F:JT808.Protocol.Enums.JT808PlatformResult.succeed">
<summary>
成功/确认
+ succeed
</summary>
</member>
- <member name="F:JT808.Protocol.Enums.JT808PlatformResult.失败">
+ <member name="F:JT808.Protocol.Enums.JT808PlatformResult.fail">
<summary>
失败
+ fail
</summary>
</member>
- <member name="F:JT808.Protocol.Enums.JT808PlatformResult.消息有误">
+ <member name="F:JT808.Protocol.Enums.JT808PlatformResult.message_wrong">
<summary>
消息有误
+ The message is wrong
</summary>
</member>
- <member name="F:JT808.Protocol.Enums.JT808PlatformResult.不支持">
+ <member name="F:JT808.Protocol.Enums.JT808PlatformResult.nonsupport">
<summary>
不支持
+ nonsupport
</summary>
</member>
- <member name="F:JT808.Protocol.Enums.JT808PlatformResult.报警处理确认">
+ <member name="F:JT808.Protocol.Enums.JT808PlatformResult.alarm_processing_confirmation">
<summary>
报警处理确认
+ Alarm processing confirmation
</summary>
</member>
<member name="T:JT808.Protocol.Enums.JT808PositionType">
<summary>
位置类型
+ Position type
</summary>
</member>
- <member name="F:JT808.Protocol.Enums.JT808PositionType.无特定位置">
+ <member name="F:JT808.Protocol.Enums.JT808PositionType.no_specific_position">
<summary>
无特定位置
+ No specific position
</summary>
</member>
- <member name="F:JT808.Protocol.Enums.JT808PositionType.圆形区域">
+ <member name="F:JT808.Protocol.Enums.JT808PositionType.circular_region">
<summary>
圆形区域
+ circular region
</summary>
</member>
- <member name="F:JT808.Protocol.Enums.JT808PositionType.矩形区域">
+ <member name="F:JT808.Protocol.Enums.JT808PositionType.rectangular_region">
<summary>
矩形区域
</summary>
</member>
- <member name="F:JT808.Protocol.Enums.JT808PositionType.多边形区域">
+ <member name="F:JT808.Protocol.Enums.JT808PositionType.polyarea">
<summary>
多边形区域
+ polyarea
</summary>
</member>
- <member name="F:JT808.Protocol.Enums.JT808PositionType.路段">
+ <member name="F:JT808.Protocol.Enums.JT808PositionType.road_segment">
<summary>
路段
+ Road Segment
</summary>
</member>
<member name="T:JT808.Protocol.Enums.JT808RecordCmd">
<summary>
录音命令
+ The recording command
</summary>
</member>
- <member name="F:JT808.Protocol.Enums.JT808RecordCmd.停止录音">
+ <member name="F:JT808.Protocol.Enums.JT808RecordCmd.stop">
<summary>
停止录音
+ stop
</summary>
</member>
- <member name="F:JT808.Protocol.Enums.JT808RecordCmd.开始录音">
+ <member name="F:JT808.Protocol.Enums.JT808RecordCmd.start">
<summary>
- 停止录音
+ 开始录音
+ start
</summary>
</member>
<member name="T:JT808.Protocol.Enums.JT808RecordSave">
<summary>
保存标志
+ Save the logo
</summary>
</member>
- <member name="F:JT808.Protocol.Enums.JT808RecordSave.实时上传">
+ <member name="F:JT808.Protocol.Enums.JT808RecordSave.realtime_upload">
<summary>
实时上传
+ In real time to upload
</summary>
</member>
- <member name="F:JT808.Protocol.Enums.JT808RecordSave.保存">
+ <member name="F:JT808.Protocol.Enums.JT808RecordSave.save">
<summary>
保存
+ Save
</summary>
</member>
<member name="T:JT808.Protocol.Enums.JT808SettingProperty">
<summary>
设置属性
+ set attributes
</summary>
</member>
- <member name="F:JT808.Protocol.Enums.JT808SettingProperty.更新区域">
+ <member name="F:JT808.Protocol.Enums.JT808SettingProperty.update_region">
<summary>
更新区域
+ update region
</summary>
</member>
- <member name="F:JT808.Protocol.Enums.JT808SettingProperty.追加区域">
+ <member name="F:JT808.Protocol.Enums.JT808SettingProperty.append_region">
<summary>
追加区域
+ append region
</summary>
</member>
- <member name="F:JT808.Protocol.Enums.JT808SettingProperty.修改区域">
+ <member name="F:JT808.Protocol.Enums.JT808SettingProperty.modify_region">
<summary>
修改区域
+ modify region
</summary>
</member>
<member name="T:JT808.Protocol.Enums.JT808SettingTelephoneBook">
<summary>
- 设置电话本 设置类型
+ 设置电话本设置类型
+ Set the phone book setting type
</summary>
</member>
- <member name="F:JT808.Protocol.Enums.JT808SettingTelephoneBook.删除终端上所有存储的联系人">
+ <member name="F:JT808.Protocol.Enums.JT808SettingTelephoneBook.delete_all">
<summary>
删除终端上所有存储的联系人
+ Delete all contacts stored on the terminal
</summary>
</member>
- <member name="F:JT808.Protocol.Enums.JT808SettingTelephoneBook.更新电话本_删除终端中已有全部联系人并追加消息中的联系人">
+ <member name="F:JT808.Protocol.Enums.JT808SettingTelephoneBook.update_phone_book">
<summary>
更新电话本_删除终端中已有全部联系人并追加消息中的联系人
+ Update the phone book _ Delete all contacts from the terminal and add contacts to the message
</summary>
</member>
- <member name="F:JT808.Protocol.Enums.JT808SettingTelephoneBook.追加电话本">
+ <member name="F:JT808.Protocol.Enums.JT808SettingTelephoneBook.append_phone_book">
<summary>
追加电话本
+ Append phone book
</summary>
</member>
- <member name="F:JT808.Protocol.Enums.JT808SettingTelephoneBook.修改电话本_以联系人为索引">
+ <member name="F:JT808.Protocol.Enums.JT808SettingTelephoneBook.modify_phone_book">
<summary>
修改电话本_以联系人为索引
+ Modify the phone book to index contacts
</summary>
</member>
<member name="T:JT808.Protocol.Enums.JT808Status">
@@ -1590,56 +1628,67 @@
<member name="T:JT808.Protocol.Enums.JT808TelephoneBookContactType">
<summary>
电话本联系人标志
+ Phone book contact mark
</summary>
</member>
- <member name="F:JT808.Protocol.Enums.JT808TelephoneBookContactType.呼入">
+ <member name="F:JT808.Protocol.Enums.JT808TelephoneBookContactType.callin">
<summary>
呼入
+ call_in
</summary>
</member>
- <member name="F:JT808.Protocol.Enums.JT808TelephoneBookContactType.呼出">
+ <member name="F:JT808.Protocol.Enums.JT808TelephoneBookContactType.callout">
<summary>
呼出
+ call_out
</summary>
</member>
- <member name="F:JT808.Protocol.Enums.JT808TelephoneBookContactType.呼入_呼出">
+ <member name="F:JT808.Protocol.Enums.JT808TelephoneBookContactType.call_in_out">
<summary>
呼入_呼出
+ call_in|call_out
</summary>
</member>
<member name="T:JT808.Protocol.Enums.JT808TerminalRegisterResult">
<summary>
终端注册返回结果
+ The terminal registration result is returned
</summary>
</member>
- <member name="F:JT808.Protocol.Enums.JT808TerminalRegisterResult.成功">
+ <member name="F:JT808.Protocol.Enums.JT808TerminalRegisterResult.success">
<summary>
成功
+ success
</summary>
</member>
- <member name="F:JT808.Protocol.Enums.JT808TerminalRegisterResult.车辆已被注册">
+ <member name="F:JT808.Protocol.Enums.JT808TerminalRegisterResult.vehicle_registered">
<summary>
车辆已被注册
+ The vehicle has been registered
</summary>
</member>
- <member name="F:JT808.Protocol.Enums.JT808TerminalRegisterResult.数据库中无该车辆">
+ <member name="F:JT808.Protocol.Enums.JT808TerminalRegisterResult.vehicle_not_database">
<summary>
数据库中无该车辆
+ The vehicle is not in the database
</summary>
</member>
- <member name="F:JT808.Protocol.Enums.JT808TerminalRegisterResult.终端已被注册">
+ <member name="F:JT808.Protocol.Enums.JT808TerminalRegisterResult.terminal_registered">
<summary>
终端已被注册
+ The terminal has been registered
</summary>
</member>
- <member name="F:JT808.Protocol.Enums.JT808TerminalRegisterResult.数据库中无该终端">
+ <member name="F:JT808.Protocol.Enums.JT808TerminalRegisterResult.terminal_not_database">
<summary>
数据库中无该终端
+ The terminal is not in the database
</summary>
</member>
<member name="T:JT808.Protocol.Enums.JT808TerminalResult">
<summary>
通用应答返回
+ Universal reply return
</summary>
</member>
<member name="F:JT808.Protocol.Enums.JT808TerminalResult.Success">
@@ -1665,86 +1714,103 @@
<member name="T:JT808.Protocol.Enums.JT808UpgradeResult">
<summary>
升级结果
+ Upgrade Result
</summary>
</member>
- <member name="F:JT808.Protocol.Enums.JT808UpgradeResult.成功">
+ <member name="F:JT808.Protocol.Enums.JT808UpgradeResult.success">
<summary>
成功
+ success
</summary>
</member>
- <member name="F:JT808.Protocol.Enums.JT808UpgradeResult.失败">
+ <member name="F:JT808.Protocol.Enums.JT808UpgradeResult.fail">
<summary>
失败
+ fail
</summary>
</member>
- <member name="F:JT808.Protocol.Enums.JT808UpgradeResult.取消">
+ <member name="F:JT808.Protocol.Enums.JT808UpgradeResult.cancel">
<summary>
取消
+ cancel
</summary>
</member>
- <member name="F:JT808.Protocol.Enums.JT808UpgradeResult.未找到目标设备">
+ <member name="F:JT808.Protocol.Enums.JT808UpgradeResult.yue_biao_active_safety_target_device_not_found">
<summary>
粤标主动安全-未找到目标设备
+ Yue Biao active Safety. - Target device not found
</summary>
</member>
- <member name="F:JT808.Protocol.Enums.JT808UpgradeResult.硬件型号不支持">
+ <member name="F:JT808.Protocol.Enums.JT808UpgradeResult.yue_biao_active_safety_hardware_not_supported">
<summary>
粤标主动安全-硬件型号不支持
+ Yue Biao Active Safety - hardware models not supported
</summary>
</member>
- <member name="F:JT808.Protocol.Enums.JT808UpgradeResult.软件版本相同">
+ <member name="F:JT808.Protocol.Enums.JT808UpgradeResult.yue_biao_active_safety_same_software_version">
<summary>
粤标主动安全-软件版本相同
+ Yue Biao Active Safety - Same Software Version
</summary>
</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>
粤标主动安全-软件版本不支持
+ Yue Biao Active Safety - The software version is not supported
</summary>
</member>
<member name="T:JT808.Protocol.Enums.JT808UpgradeType">
<summary>
升级类型
+ Upgrade Type
</summary>
</member>
- <member name="F:JT808.Protocol.Enums.JT808UpgradeType.终端">
+ <member name="F:JT808.Protocol.Enums.JT808UpgradeType.terminal">
<summary>
终端
+ terminal
</summary>
</member>
- <member name="F:JT808.Protocol.Enums.JT808UpgradeType.道路运输证IC卡读卡器">
+ <member name="F:JT808.Protocol.Enums.JT808UpgradeType.road_transport_cert_ic_card_reader">
<summary>
道路运输证IC卡读卡器
+ Road transport certificate IC card reader
</summary>
</member>
- <member name="F:JT808.Protocol.Enums.JT808UpgradeType.北斗卫星定位模块">
+ <member name="F:JT808.Protocol.Enums.JT808UpgradeType.beidou_module">
<summary>
北斗卫星定位模块
+ Beidou satellite positioning module
</summary>
</member>
- <member name="F:JT808.Protocol.Enums.JT808UpgradeType.高级驾驶辅助系统">
+ <member name="F:JT808.Protocol.Enums.JT808UpgradeType.adas">
<summary>
粤标主动安全-高级驾驶辅助系统
+ Advanced driver assistance system
</summary>
</member>
- <member name="F:JT808.Protocol.Enums.JT808UpgradeType.驾驶状态监控系统">
+ <member name="F:JT808.Protocol.Enums.JT808UpgradeType.dsm">
<summary>
粤标主动安全-驾驶状态监控系统
+ Driving condition monitoring system
</summary>
</member>
- <member name="F:JT808.Protocol.Enums.JT808UpgradeType.胎压监测系统">
+ <member name="F:JT808.Protocol.Enums.JT808UpgradeType.tpms">
<summary>
粤标主动安全-胎压监测系统
+ tire pressure monitoring system
</summary>
</member>
- <member name="F:JT808.Protocol.Enums.JT808UpgradeType.盲点监测系统">
+ <member name="F:JT808.Protocol.Enums.JT808UpgradeType.bsd">
<summary>
粤标主动安全-盲点监测系统
+ Blind Spot Monitoring system
</summary>
</member>
<member name="T:JT808.Protocol.Enums.JT808Version">
<summary>
JT808版本号
+ JT808 Version
</summary>
</member>
<member name="F:JT808.Protocol.Enums.JT808Version.JTT2011">
diff --git a/src/JT808.Protocol/MessageBody/JT808_0x0200_0x11.cs b/src/JT808.Protocol/MessageBody/JT808_0x0200_0x11.cs
index 829f552..0d073d5 100644
--- a/src/JT808.Protocol/MessageBody/JT808_0x0200_0x11.cs
+++ b/src/JT808.Protocol/MessageBody/JT808_0x0200_0x11.cs
@@ -38,7 +38,7 @@ namespace JT808.Protocol.MessageBody
{
get
{
- if (JT808PositionType != JT808PositionType.无特定位置)
+ if (JT808PositionType != JT808PositionType.no_specific_position)
{
return 5;
}
@@ -64,7 +64,7 @@ namespace JT808.Protocol.MessageBody
writer.WriteNumber($"[{value.AttachInfoLength.ReadNumber()}]附加信息长度", value.AttachInfoLength);
value.JT808PositionType = (JT808PositionType)reader.ReadByte();
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();
writer.WriteNumber($"[{value.AreaId.ReadNumber()}]区域或路段ID", value.AreaId);
@@ -82,7 +82,7 @@ namespace JT808.Protocol.MessageBody
value.AttachInfoId = reader.ReadByte();
value.AttachInfoLength = reader.ReadByte();
value.JT808PositionType = (JT808PositionType)reader.ReadByte();
- if (value.JT808PositionType != JT808PositionType.无特定位置)
+ if (value.JT808PositionType != JT808PositionType.no_specific_position)
{
value.AreaId = reader.ReadUInt32();
}
@@ -99,7 +99,7 @@ namespace JT808.Protocol.MessageBody
writer.WriteByte(value.AttachInfoId);
writer.WriteByte(value.AttachInfoLength);
writer.WriteByte((byte)value.JT808PositionType);
- if (value.JT808PositionType != JT808PositionType.无特定位置)
+ if (value.JT808PositionType != JT808PositionType.no_specific_position)
{
writer.WriteUInt32(value.AreaId);
}
diff --git a/src/JT808.Protocol/MessageBody/JT808_0x8100.cs b/src/JT808.Protocol/MessageBody/JT808_0x8100.cs
index 39e7739..3ae8998 100644
--- a/src/JT808.Protocol/MessageBody/JT808_0x8100.cs
+++ b/src/JT808.Protocol/MessageBody/JT808_0x8100.cs
@@ -50,7 +50,7 @@ namespace JT808.Protocol.MessageBody
value.JT808TerminalRegisterResult = (JT808TerminalRegisterResult)reader.ReadByte();
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();
value.Code = reader.ReadRemainStringContent();
@@ -69,7 +69,7 @@ namespace JT808.Protocol.MessageBody
value.AckMsgNum = reader.ReadUInt16();
value.JT808TerminalRegisterResult = (JT808TerminalRegisterResult)reader.ReadByte();
// 只有在成功后才有该字段
- if (value.JT808TerminalRegisterResult == JT808TerminalRegisterResult.成功)
+ if (value.JT808TerminalRegisterResult == JT808TerminalRegisterResult.success)
{
value.Code = reader.ReadRemainStringContent();
}
@@ -86,7 +86,7 @@ namespace JT808.Protocol.MessageBody
writer.WriteUInt16(value.AckMsgNum);
writer.WriteByte((byte)value.JT808TerminalRegisterResult);
// 只有在成功后才有该字段
- if (value.JT808TerminalRegisterResult == JT808TerminalRegisterResult.成功)
+ if (value.JT808TerminalRegisterResult == JT808TerminalRegisterResult.success)
{
writer.WriteString(value.Code);
}