From 9e135235763ba4aac17676dee0a3e99a9218611e Mon Sep 17 00:00:00 2001 From: SmallChi <564952747@qq.com> Date: Wed, 20 Feb 2019 11:55:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=9F=E4=B8=80=E7=9A=84?= =?UTF-8?q?=E5=91=BD=E4=BB=A4=E7=A9=BA=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../JT809SerializerContext.cs | 14 ++-- .../Program.cs | 7 +- .../DependencyInjectionExtensions.cs | 4 +- .../Options/JT809Options.cs | 2 +- .../JT809Encrypt/JT809EncryptTest.cs | 6 +- .../JT809BinaryExtensionsTest.cs | 4 +- src/JT809.Protocol.Test/JT809HeaderTest.cs | 9 ++- .../JT809MessageBody/JT809_0x1001Test.cs | 6 +- .../JT809MessageBody/JT809_0x1002Test.cs | 11 +-- .../JT809MessageBody/JT809_0x1003Test.cs | 6 +- .../JT809MessageBody/JT809_0x1005Test.cs | 4 +- .../JT809MessageBody/JT809_0x1006Test.cs | 6 +- .../JT809MessageBody/JT809_0x1007Test.cs | 11 +-- .../JT809MessageBody/JT809_0x1008Test.cs | 11 +-- .../JT809MessageBody/JT809_0x1200Test.cs | 17 ++-- .../JT809MessageBody/JT809_0x1300Test.cs | 17 ++-- .../JT809MessageBody/JT809_0x1600Test.cs | 17 ++-- .../JT809MessageBody/JT809_0x9001Test.cs | 6 +- .../JT809MessageBody/JT809_0x9002Test.cs | 11 +-- .../JT809MessageBody/JT809_0x9003Test.cs | 6 +- .../JT809MessageBody/JT809_0x9007Test.cs | 11 +-- .../JT809MessageBody/JT809_0x9008Test.cs | 11 +-- .../JT809MessageBody/JT809_0x9101Test.cs | 6 +- .../JT809_0x1001EncryptPackageTest.cs | 14 ++-- .../JT809Packages/JT809_0x1001PackageTest.cs | 9 ++- .../JT809_0x9400_0x9401PackageTest.cs | 27 ++++--- .../JT809_0x1200_0x1201Test.cs | 8 +- .../JT809_0x1200_0x1202Test.cs | 8 +- .../JT809_0x1200_0x1203Test.cs | 8 +- .../JT809_0x1200_0x1207Test.cs | 8 +- .../JT809_0x1200_0x1209Test.cs | 8 +- .../JT809_0x1200_0x120ATest.cs | 8 +- .../JT809_0x1200_0x120BTest.cs | 8 +- .../JT809_0x1200_0x120CTest.cs | 8 +- .../JT809_0x1200_0x120DTest.cs | 8 +- .../JT809_0x1300_0x1301Test.cs | 13 +-- .../JT809_0x1300_0x1302Test.cs | 8 +- .../JT809_0x1400_0x1401Test.cs | 10 +-- .../JT809_0x1400_0x1402Test.cs | 14 ++-- .../JT809_0x1400_0x1403Test.cs | 10 +-- .../JT809_0x1500_0x1501Test.cs | 10 +-- .../JT809_0x1500_0x1502Test.cs | 13 +-- .../JT809_0x1500_0x1503Test.cs | 10 +-- .../JT809_0x1500_0x1504Test.cs | 10 +-- .../JT809_0x1500_0x1505Test.cs | 10 +-- .../JT809_0x1600_0x1601Test.cs | 10 +-- .../JT809_0x9200_0x9204Test.cs | 10 +-- .../JT809_0x9200_0x9205Test.cs | 10 +-- .../JT809_0x9200_0x9206Test.cs | 10 +-- .../JT809_0x9200_0x9207Test.cs | 10 +-- .../JT809_0x9200_0x9208Test.cs | 10 +-- .../JT809_0x9200_0x9209Test.cs | 10 +-- .../JT809_0x9300_0x9301Test.cs | 10 +-- .../JT809_0x9300_0x9302Test.cs | 10 +-- .../JT809_0x9400_0x9401Test.cs | 10 +-- .../JT809_0x9400_0x9402Test.cs | 10 +-- .../JT809_0x9400_0x9403Test.cs | 10 +-- .../JT809_0x9500_0x9501Test.cs | 8 +- .../JT809_0x9500_0x9502Test.cs | 8 +- .../JT809_0x9500_0x9503Test.cs | 8 +- .../JT809_0x9500_0x9504Test.cs | 10 +-- .../JT809_0x9500_0x9505Test.cs | 10 +-- .../JT809BodiesTypeAttribute.cs | 2 +- .../JT809BusinessTypeDescriptionAttribute.cs | 2 +- .../JT809FormatterAttribute.cs | 2 +- ...T809SubBusinessTypeDescriptionAttribute.cs | 4 +- .../JT809EncryptOptions.cs | 2 +- .../JT809HeaderOptions.cs | 2 +- .../JT809EncryptImpl.cs | 4 +- .../{JT809Enums => Enums}/JT808_Alarm.cs | 2 +- .../{JT809Enums => Enums}/JT808_Status.cs | 2 +- .../JT809BusinessType.cs | 6 +- .../{JT809Enums => Enums}/JT809CommandType.cs | 2 +- .../{JT809Enums => Enums}/JT809ErrorCode.cs | 2 +- .../JT809SubBusinessType.cs | 6 +- .../JT809VehicleColorType.cs | 2 +- .../{JT809Enums => Enums}/JT809WarnSrc.cs | 2 +- .../{JT809Enums => Enums}/JT809WarnType.cs | 2 +- .../JT809_0x1002_Result.cs | 2 +- .../JT809_0x1007_ErrorCode.cs | 2 +- .../JT809_0x1008_ReasonCode.cs | 2 +- .../JT809_0x1301_ObjectType.cs | 2 +- .../JT809_0x1401_Result.cs | 2 +- .../JT809_0x1403_Result.cs | 2 +- .../JT809_0x1501_Result.cs | 2 +- .../JT809_0x1502_PhotoRspFlag.cs | 2 +- .../JT809_0x1503_Result.cs | 2 +- .../JT809_0x1505_Result.cs | 2 +- .../JT809_0x9002_Result.cs | 2 +- .../JT809_0x9007_ReasonCode.cs | 2 +- .../JT809_0x9008_ReasonCode.cs | 2 +- .../JT809_0x9205_ReasonCode.cs | 2 +- .../JT809_0x9206_ReasonCode.cs | 2 +- .../JT809_0x9207_Result.cs | 2 +- .../JT809_0x9208_Result.cs | 2 +- .../JT809_0x9209_Result.cs | 2 +- .../JT809_0x9301_ObjectType.cs | 2 +- .../JT809_0x9302_ObjectType.cs | 2 +- .../JT809_VehiclePositionEncrypt.cs | 2 +- .../JT809Exception.cs | 4 +- .../JT809BCDExtensions.cs | 2 +- .../JT809BinaryExtensions.cs | 2 +- .../JT809CRCExtensions.cs | 2 +- .../JT809DateTimeExtensions.cs | 2 +- .../JT809EnumExtensions.cs | 2 +- .../JT809FormatterExtensions.cs | 10 +-- .../JT809FormatterResolverExtensions.cs | 4 +- .../JT809HexExtensions.cs | 2 +- .../JT809PackageExtensions.cs | 4 +- .../JT809StringExtensions.cs | 2 +- .../IJT809FormatterOfT.cs | 2 +- .../JT809BodiesFormatter.cs | 14 ++-- .../JT809HeaderFormatter.cs | 6 +- .../JT809PackageFormatter.cs | 12 +-- .../JT809_0x1001Formatter.cs | 6 +- .../JT809_0x1002Formatter.cs | 8 +- .../JT809_0x1003Formatter.cs | 8 +- .../JT809_0x1007Formatter.cs | 8 +- .../JT809_0x1008Formatter.cs | 9 ++- .../JT809_0x1300Formatter.cs | 16 ++-- .../JT809_0x9001Formatter.cs | 6 +- .../JT809_0x9002Formatter.cs | 8 +- .../JT809_0x9003Formatter.cs | 6 +- .../JT809_0x9007Formatter.cs | 9 ++- .../JT809_0x9008Formatter.cs | 9 ++- .../JT809_0x9101Formatter.cs | 6 +- .../JT809_0x9300Formatter.cs | 16 ++-- .../JT809_0x1200_0x1201Formatter.cs | 8 +- .../JT809_0x1200_0x1202Formatter.cs | 8 +- .../JT809_0x1200_0x1203Formatter.cs | 10 +-- .../JT809_0x1200_0x1207Formatter.cs | 6 +- .../JT809_0x1200_0x1209Formatter.cs | 6 +- .../JT809_0x1200_0x120AFormatter.cs | 6 +- .../JT809_0x1200_0x120BFormatter.cs | 6 +- .../JT809_0x1200_0x120CFormatter.cs | 6 +- .../JT809_0x1200_0x120DFormatter.cs | 6 +- .../JT809_0x1300_0x1301Formatter.cs | 9 ++- .../JT809_0x1300_0x1302Formatter.cs | 6 +- .../JT809_0x1400_0x1401Formatter.cs | 9 ++- .../JT809_0x1400_0x1402Formatter.cs | 11 +-- .../JT809_0x1400_0x1403Formatter.cs | 9 ++- .../JT809_0x1500_0x1501Formatter.cs | 9 ++- .../JT809_0x1500_0x1502Formatter.cs | 8 +- .../JT809_0x1500_0x1503Formatter.cs | 9 ++- .../JT809_0x1500_0x1504Formatter.cs | 8 +- .../JT809_0x1500_0x1505Formatter.cs | 9 ++- .../JT809_0x9200_0x9202Formatter.cs | 8 +- .../JT809_0x9200_0x9203Formatter.cs | 10 +-- .../JT809_0x9200_0x9204Formatter.cs | 6 +- .../JT809_0x9200_0x9205Formatter.cs | 8 +- .../JT809_0x9200_0x9206Formatter.cs | 8 +- .../JT809_0x9200_0x9207Formatter.cs | 8 +- .../JT809_0x9200_0x9208Formatter.cs | 8 +- .../JT809_0x9200_0x9209Formatter.cs | 8 +- .../JT809_0x9300_0x9301Formatter.cs | 9 ++- .../JT809_0x9300_0x9302Formatter.cs | 9 ++- .../JT809_0x9400_0x9401Formatter.cs | 11 +-- .../JT809_0x9400_0x9402Formatter.cs | 11 +-- .../JT809_0x9400_0x9403Formatter.cs | 11 +-- .../JT809_0x9500_0x9501Formatter.cs | 6 +- .../JT809_0x9500_0x9502Formatter.cs | 6 +- .../JT809_0x9500_0x9503Formatter.cs | 6 +- .../JT809_0x9500_0x9504Formatter.cs | 76 ++++++++++++++++++ .../JT809_0x9500_0x9505Formatter.cs | 6 +- .../JT809_0x9600_0x1601Formatter.cs | 6 +- .../DefaultMsgSNDistributedImpl.cs | 2 +- src/JT809.Protocol/JT809.Protocol.csproj | 79 +++++++++---------- src/JT809.Protocol/JT809Bodies.cs | 6 +- .../JT809ExchangeMessageBodies.cs | 6 +- .../JT809_0x9500_0x9504Formatter.cs | 75 ------------------ src/JT809.Protocol/JT809GlobalConfig.cs | 6 +- src/JT809.Protocol/JT809Header.cs | 6 +- src/JT809.Protocol/JT809Package.cs | 4 +- src/JT809.Protocol/JT809Serializer.cs | 2 +- src/JT809.Protocol/JT809SubBodies.cs | 2 +- .../JT809_0x1001.cs | 6 +- .../JT809_0x1002.cs | 8 +- .../JT809_0x1003.cs | 6 +- .../JT809_0x1004.cs | 4 +- .../JT809_0x1005.cs | 2 +- .../JT809_0x1006.cs | 6 +- .../JT809_0x1007.cs | 8 +- .../JT809_0x1008.cs | 8 +- .../JT809_0x1200.cs | 6 +- .../JT809_0x1300.cs | 8 +- .../JT809_0x1400.cs | 6 +- .../JT809_0x1500.cs | 6 +- .../JT809_0x1600.cs | 6 +- .../JT809_0x9001.cs | 6 +- .../JT809_0x9002.cs | 8 +- .../JT809_0x9003.cs | 6 +- .../JT809_0x9004.cs | 2 +- .../JT809_0x9005.cs | 2 +- .../JT809_0x9006.cs | 2 +- .../JT809_0x9007.cs | 8 +- .../JT809_0x9008.cs | 8 +- .../JT809_0x9101.cs | 6 +- .../JT809_0x9200.cs | 6 +- .../JT809_0x9300.cs | 8 +- .../JT809_0x9400.cs | 10 +-- .../JT809_0x9500.cs | 6 +- .../JT809_0x9600.cs | 10 +-- .../JT809VehiclePositionProperties.cs | 4 +- .../JT809_0x1200_0x1201.cs | 8 +- .../JT809_0x1200_0x1202.cs | 8 +- .../JT809_0x1200_0x1203.cs | 8 +- .../JT809_0x1200_0x1205.cs | 2 +- .../JT809_0x1200_0x1206.cs | 2 +- .../JT809_0x1200_0x1207.cs | 6 +- .../JT809_0x1200_0x1208.cs | 2 +- .../JT809_0x1200_0x1209.cs | 6 +- .../JT809_0x1200_0x120A.cs | 6 +- .../JT809_0x1200_0x120B.cs | 6 +- .../JT809_0x1200_0x120C.cs | 6 +- .../JT809_0x1200_0x120D.cs | 6 +- .../JT809_0x1300_0x1301.cs | 8 +- .../JT809_0x1300_0x1302.cs | 6 +- .../JT809_0x1400_0x1401.cs | 8 +- .../JT809_0x1400_0x1402.cs | 8 +- .../JT809_0x1400_0x1403.cs | 8 +- .../JT809_0x1500_0x1501.cs | 8 +- .../JT809_0x1500_0x1502.cs | 10 +-- .../JT809_0x1500_0x1503.cs | 8 +- .../JT809_0x1500_0x1504.cs | 8 +- .../JT809_0x1500_0x1505.cs | 8 +- .../JT809_0x1600_0x1601.cs | 6 +- .../JT809_0x9200_0x9202.cs | 8 +- .../JT809_0x9200_0x9203.cs | 6 +- .../JT809_0x9200_0x9204.cs | 6 +- .../JT809_0x9200_0x9205.cs | 8 +- .../JT809_0x9200_0x9206.cs | 8 +- .../JT809_0x9200_0x9207.cs | 8 +- .../JT809_0x9200_0x9208.cs | 8 +- .../JT809_0x9200_0x9209.cs | 8 +- .../JT809_0x9200_0x920A.cs | 2 +- .../JT809_0x9200_0x920B.cs | 2 +- .../JT809_0x9300_0x9301.cs | 8 +- .../JT809_0x9300_0x9302.cs | 8 +- .../JT809_0x9400_0x9401.cs | 8 +- .../JT809_0x9400_0x9402.cs | 8 +- .../JT809_0x9400_0x9403.cs | 8 +- .../JT809_0x9500_0x9501.cs | 6 +- .../JT809_0x9500_0x9502.cs | 6 +- .../JT809_0x9500_0x9503.cs | 6 +- .../JT809_0x9500_0x9504.cs | 8 +- .../JT809_0x9500_0x9505.cs | 6 +- .../JT809_0x9600_0x9601.cs | 2 +- 247 files changed, 959 insertions(+), 929 deletions(-) rename src/JT809.Protocol/{JT809Attributes => Attributes}/JT809BodiesTypeAttribute.cs (89%) rename src/JT809.Protocol/{JT809Attributes => Attributes}/JT809BusinessTypeDescriptionAttribute.cs (92%) rename src/JT809.Protocol/{JT809Attributes => Attributes}/JT809FormatterAttribute.cs (94%) rename src/JT809.Protocol/{JT809Attributes => Attributes}/JT809SubBusinessTypeDescriptionAttribute.cs (88%) rename src/JT809.Protocol/{JT809Configs => Configs}/JT809EncryptOptions.cs (80%) rename src/JT809.Protocol/{JT809Configs => Configs}/JT809HeaderOptions.cs (96%) rename src/JT809.Protocol/{JT809Encrypt => Encrypt}/JT809EncryptImpl.cs (93%) rename src/JT809.Protocol/{JT809Enums => Enums}/JT808_Alarm.cs (99%) rename src/JT809.Protocol/{JT809Enums => Enums}/JT808_Status.cs (95%) rename src/JT809.Protocol/{JT809Enums => Enums}/JT809BusinessType.cs (98%) rename src/JT809.Protocol/{JT809Enums => Enums}/JT809CommandType.cs (96%) rename src/JT809.Protocol/{JT809Enums => Enums}/JT809ErrorCode.cs (92%) rename src/JT809.Protocol/{JT809Enums => Enums}/JT809SubBusinessType.cs (99%) rename src/JT809.Protocol/{JT809Enums => Enums}/JT809VehicleColorType.cs (90%) rename src/JT809.Protocol/{JT809Enums => Enums}/JT809WarnSrc.cs (89%) rename src/JT809.Protocol/{JT809Enums => Enums}/JT809WarnType.cs (95%) rename src/JT809.Protocol/{JT809Enums => Enums}/JT809_0x1002_Result.cs (91%) rename src/JT809.Protocol/{JT809Enums => Enums}/JT809_0x1007_ErrorCode.cs (87%) rename src/JT809.Protocol/{JT809Enums => Enums}/JT809_0x1008_ReasonCode.cs (87%) rename src/JT809.Protocol/{JT809Enums => Enums}/JT809_0x1301_ObjectType.cs (90%) rename src/JT809.Protocol/{JT809Enums => Enums}/JT809_0x1401_Result.cs (89%) rename src/JT809.Protocol/{JT809Enums => Enums}/JT809_0x1403_Result.cs (89%) rename src/JT809.Protocol/{JT809Enums => Enums}/JT809_0x1501_Result.cs (87%) rename src/JT809.Protocol/{JT809Enums => Enums}/JT809_0x1502_PhotoRspFlag.cs (92%) rename src/JT809.Protocol/{JT809Enums => Enums}/JT809_0x1503_Result.cs (87%) rename src/JT809.Protocol/{JT809Enums => Enums}/JT809_0x1505_Result.cs (89%) rename src/JT809.Protocol/{JT809Enums => Enums}/JT809_0x9002_Result.cs (89%) rename src/JT809.Protocol/{JT809Enums => Enums}/JT809_0x9007_ReasonCode.cs (90%) rename src/JT809.Protocol/{JT809Enums => Enums}/JT809_0x9008_ReasonCode.cs (87%) rename src/JT809.Protocol/{JT809Enums => Enums}/JT809_0x9205_ReasonCode.cs (90%) rename src/JT809.Protocol/{JT809Enums => Enums}/JT809_0x9206_ReasonCode.cs (90%) rename src/JT809.Protocol/{JT809Enums => Enums}/JT809_0x9207_Result.cs (90%) rename src/JT809.Protocol/{JT809Enums => Enums}/JT809_0x9208_Result.cs (89%) rename src/JT809.Protocol/{JT809Enums => Enums}/JT809_0x9209_Result.cs (92%) rename src/JT809.Protocol/{JT809Enums => Enums}/JT809_0x9301_ObjectType.cs (90%) rename src/JT809.Protocol/{JT809Enums => Enums}/JT809_0x9302_ObjectType.cs (95%) rename src/JT809.Protocol/{JT809Enums => Enums}/JT809_VehiclePositionEncrypt.cs (89%) rename src/JT809.Protocol/{JT809Exceptions => Exceptions}/JT809Exception.cs (90%) rename src/JT809.Protocol/{JT809Extensions => Extensions}/JT809BCDExtensions.cs (97%) rename src/JT809.Protocol/{JT809Extensions => Extensions}/JT809BinaryExtensions.cs (99%) rename src/JT809.Protocol/{JT809Extensions => Extensions}/JT809CRCExtensions.cs (97%) rename src/JT809.Protocol/{JT809Extensions => Extensions}/JT809DateTimeExtensions.cs (99%) rename src/JT809.Protocol/{JT809Extensions => Extensions}/JT809EnumExtensions.cs (99%) rename src/JT809.Protocol/{JT809Extensions => Extensions}/JT809FormatterExtensions.cs (89%) rename src/JT809.Protocol/{JT809Extensions => Extensions}/JT809FormatterResolverExtensions.cs (98%) rename src/JT809.Protocol/{JT809Extensions => Extensions}/JT809HexExtensions.cs (99%) rename src/JT809.Protocol/{JT809Extensions => Extensions}/JT809PackageExtensions.cs (95%) rename src/JT809.Protocol/{JT809Extensions => Extensions}/JT809StringExtensions.cs (98%) rename src/JT809.Protocol/{JT809Formatters => Formatters}/IJT809FormatterOfT.cs (84%) rename src/JT809.Protocol/{JT809Formatters => Formatters}/JT809BodiesFormatter.cs (90%) rename src/JT809.Protocol/{JT809Formatters => Formatters}/JT809HeaderFormatter.cs (94%) rename src/JT809.Protocol/{JT809Formatters => Formatters}/JT809PackageFormatter.cs (97%) rename src/JT809.Protocol/{JT809Formatters/JT809MessageBodyFormatters => Formatters/MessageBodyFormatters}/JT809_0x1001Formatter.cs (90%) rename src/JT809.Protocol/{JT809Formatters/JT809MessageBodyFormatters => Formatters/MessageBodyFormatters}/JT809_0x1002Formatter.cs (84%) rename src/JT809.Protocol/{JT809Formatters/JT809MessageBodyFormatters => Formatters/MessageBodyFormatters}/JT809_0x1003Formatter.cs (83%) rename src/JT809.Protocol/{JT809Formatters/JT809MessageBodyFormatters => Formatters/MessageBodyFormatters}/JT809_0x1007Formatter.cs (81%) rename src/JT809.Protocol/{JT809Formatters/JT809MessageBodyFormatters => Formatters/MessageBodyFormatters}/JT809_0x1008Formatter.cs (70%) rename src/JT809.Protocol/{JT809Formatters/JT809MessageBodyFormatters => Formatters/MessageBodyFormatters}/JT809_0x1300Formatter.cs (87%) rename src/JT809.Protocol/{JT809Formatters/JT809MessageBodyFormatters => Formatters/MessageBodyFormatters}/JT809_0x9001Formatter.cs (83%) rename src/JT809.Protocol/{JT809Formatters/JT809MessageBodyFormatters => Formatters/MessageBodyFormatters}/JT809_0x9002Formatter.cs (80%) rename src/JT809.Protocol/{JT809Formatters/JT809MessageBodyFormatters => Formatters/MessageBodyFormatters}/JT809_0x9003Formatter.cs (83%) rename src/JT809.Protocol/{JT809Formatters/JT809MessageBodyFormatters => Formatters/MessageBodyFormatters}/JT809_0x9007Formatter.cs (70%) rename src/JT809.Protocol/{JT809Formatters/JT809MessageBodyFormatters => Formatters/MessageBodyFormatters}/JT809_0x9008Formatter.cs (70%) rename src/JT809.Protocol/{JT809Formatters/JT809MessageBodyFormatters => Formatters/MessageBodyFormatters}/JT809_0x9101Formatter.cs (88%) rename src/JT809.Protocol/{JT809Formatters/JT809MessageBodyFormatters => Formatters/MessageBodyFormatters}/JT809_0x9300Formatter.cs (87%) rename src/JT809.Protocol/{JT809Formatters/JT809SubMessageBodyFormatters => Formatters/SubMessageBodyFormatters}/JT809_0x1200_0x1201Formatter.cs (90%) rename src/JT809.Protocol/{JT809Formatters/JT809SubMessageBodyFormatters => Formatters/SubMessageBodyFormatters}/JT809_0x1200_0x1202Formatter.cs (95%) rename src/JT809.Protocol/{JT809Formatters/JT809SubMessageBodyFormatters => Formatters/SubMessageBodyFormatters}/JT809_0x1200_0x1203Formatter.cs (92%) rename src/JT809.Protocol/{JT809Formatters/JT809SubMessageBodyFormatters => Formatters/SubMessageBodyFormatters}/JT809_0x1200_0x1207Formatter.cs (86%) rename src/JT809.Protocol/{JT809Formatters/JT809SubMessageBodyFormatters => Formatters/SubMessageBodyFormatters}/JT809_0x1200_0x1209Formatter.cs (86%) rename src/JT809.Protocol/{JT809Formatters/JT809SubMessageBodyFormatters => Formatters/SubMessageBodyFormatters}/JT809_0x1200_0x120AFormatter.cs (90%) rename src/JT809.Protocol/{JT809Formatters/JT809SubMessageBodyFormatters => Formatters/SubMessageBodyFormatters}/JT809_0x1200_0x120BFormatter.cs (87%) rename src/JT809.Protocol/{JT809Formatters/JT809SubMessageBodyFormatters => Formatters/SubMessageBodyFormatters}/JT809_0x1200_0x120CFormatter.cs (90%) rename src/JT809.Protocol/{JT809Formatters/JT809SubMessageBodyFormatters => Formatters/SubMessageBodyFormatters}/JT809_0x1200_0x120DFormatter.cs (87%) rename src/JT809.Protocol/{JT809Formatters/JT809SubMessageBodyFormatters => Formatters/SubMessageBodyFormatters}/JT809_0x1300_0x1301Formatter.cs (85%) rename src/JT809.Protocol/{JT809Formatters/JT809SubMessageBodyFormatters => Formatters/SubMessageBodyFormatters}/JT809_0x1300_0x1302Formatter.cs (83%) rename src/JT809.Protocol/{JT809Formatters/JT809SubMessageBodyFormatters => Formatters/SubMessageBodyFormatters}/JT809_0x1400_0x1401Formatter.cs (76%) rename src/JT809.Protocol/{JT809Formatters/JT809SubMessageBodyFormatters => Formatters/SubMessageBodyFormatters}/JT809_0x1400_0x1402Formatter.cs (81%) rename src/JT809.Protocol/{JT809Formatters/JT809SubMessageBodyFormatters => Formatters/SubMessageBodyFormatters}/JT809_0x1400_0x1403Formatter.cs (76%) rename src/JT809.Protocol/{JT809Formatters/JT809SubMessageBodyFormatters => Formatters/SubMessageBodyFormatters}/JT809_0x1500_0x1501Formatter.cs (71%) rename src/JT809.Protocol/{JT809Formatters/JT809SubMessageBodyFormatters => Formatters/SubMessageBodyFormatters}/JT809_0x1500_0x1502Formatter.cs (96%) rename src/JT809.Protocol/{JT809Formatters/JT809SubMessageBodyFormatters => Formatters/SubMessageBodyFormatters}/JT809_0x1500_0x1503Formatter.cs (76%) rename src/JT809.Protocol/{JT809Formatters/JT809SubMessageBodyFormatters => Formatters/SubMessageBodyFormatters}/JT809_0x1500_0x1504Formatter.cs (88%) rename src/JT809.Protocol/{JT809Formatters/JT809SubMessageBodyFormatters => Formatters/SubMessageBodyFormatters}/JT809_0x1500_0x1505Formatter.cs (71%) rename src/JT809.Protocol/{JT809Formatters/JT809SubMessageBodyFormatters => Formatters/SubMessageBodyFormatters}/JT809_0x9200_0x9202Formatter.cs (95%) rename src/JT809.Protocol/{JT809Formatters/JT809SubMessageBodyFormatters => Formatters/SubMessageBodyFormatters}/JT809_0x9200_0x9203Formatter.cs (92%) rename src/JT809.Protocol/{JT809Formatters/JT809SubMessageBodyFormatters => Formatters/SubMessageBodyFormatters}/JT809_0x9200_0x9204Formatter.cs (84%) rename src/JT809.Protocol/{JT809Formatters/JT809SubMessageBodyFormatters => Formatters/SubMessageBodyFormatters}/JT809_0x9200_0x9205Formatter.cs (81%) rename src/JT809.Protocol/{JT809Formatters/JT809SubMessageBodyFormatters => Formatters/SubMessageBodyFormatters}/JT809_0x9200_0x9206Formatter.cs (81%) rename src/JT809.Protocol/{JT809Formatters/JT809SubMessageBodyFormatters => Formatters/SubMessageBodyFormatters}/JT809_0x9200_0x9207Formatter.cs (81%) rename src/JT809.Protocol/{JT809Formatters/JT809SubMessageBodyFormatters => Formatters/SubMessageBodyFormatters}/JT809_0x9200_0x9208Formatter.cs (81%) rename src/JT809.Protocol/{JT809Formatters/JT809SubMessageBodyFormatters => Formatters/SubMessageBodyFormatters}/JT809_0x9200_0x9209Formatter.cs (81%) rename src/JT809.Protocol/{JT809Formatters/JT809SubMessageBodyFormatters => Formatters/SubMessageBodyFormatters}/JT809_0x9300_0x9301Formatter.cs (85%) rename src/JT809.Protocol/{JT809Formatters/JT809SubMessageBodyFormatters => Formatters/SubMessageBodyFormatters}/JT809_0x9300_0x9302Formatter.cs (85%) rename src/JT809.Protocol/{JT809Formatters/JT809SubMessageBodyFormatters => Formatters/SubMessageBodyFormatters}/JT809_0x9400_0x9401Formatter.cs (85%) rename src/JT809.Protocol/{JT809Formatters/JT809SubMessageBodyFormatters => Formatters/SubMessageBodyFormatters}/JT809_0x9400_0x9402Formatter.cs (79%) rename src/JT809.Protocol/{JT809Formatters/JT809SubMessageBodyFormatters => Formatters/SubMessageBodyFormatters}/JT809_0x9400_0x9403Formatter.cs (79%) rename src/JT809.Protocol/{JT809Formatters/JT809SubMessageBodyFormatters => Formatters/SubMessageBodyFormatters}/JT809_0x9500_0x9501Formatter.cs (84%) rename src/JT809.Protocol/{JT809Formatters/JT809SubMessageBodyFormatters => Formatters/SubMessageBodyFormatters}/JT809_0x9500_0x9502Formatter.cs (86%) rename src/JT809.Protocol/{JT809Formatters/JT809SubMessageBodyFormatters => Formatters/SubMessageBodyFormatters}/JT809_0x9500_0x9503Formatter.cs (91%) create mode 100644 src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x9500_0x9504Formatter.cs rename src/JT809.Protocol/{JT809Formatters/JT809SubMessageBodyFormatters => Formatters/SubMessageBodyFormatters}/JT809_0x9500_0x9505Formatter.cs (93%) rename src/JT809.Protocol/{JT809Formatters/JT809SubMessageBodyFormatters => Formatters/SubMessageBodyFormatters}/JT809_0x9600_0x1601Formatter.cs (84%) rename src/JT809.Protocol/{JT809Internal => Internal}/DefaultMsgSNDistributedImpl.cs (89%) delete mode 100644 src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x9500_0x9504Formatter.cs rename src/JT809.Protocol/{JT809MessageBody => MessageBody}/JT809_0x1001.cs (88%) rename src/JT809.Protocol/{JT809MessageBody => MessageBody}/JT809_0x1002.cs (85%) rename src/JT809.Protocol/{JT809MessageBody => MessageBody}/JT809_0x1003.cs (84%) rename src/JT809.Protocol/{JT809MessageBody => MessageBody}/JT809_0x1004.cs (89%) rename src/JT809.Protocol/{JT809MessageBody => MessageBody}/JT809_0x1005.cs (93%) rename src/JT809.Protocol/{JT809MessageBody => MessageBody}/JT809_0x1006.cs (82%) rename src/JT809.Protocol/{JT809MessageBody => MessageBody}/JT809_0x1007.cs (82%) rename src/JT809.Protocol/{JT809MessageBody => MessageBody}/JT809_0x1008.cs (81%) rename src/JT809.Protocol/{JT809MessageBody => MessageBody}/JT809_0x1200.cs (80%) rename src/JT809.Protocol/{JT809MessageBody => MessageBody}/JT809_0x1300.cs (71%) rename src/JT809.Protocol/{JT809MessageBody => MessageBody}/JT809_0x1400.cs (81%) rename src/JT809.Protocol/{JT809MessageBody => MessageBody}/JT809_0x1500.cs (79%) rename src/JT809.Protocol/{JT809MessageBody => MessageBody}/JT809_0x1600.cs (79%) rename src/JT809.Protocol/{JT809MessageBody => MessageBody}/JT809_0x9001.cs (85%) rename src/JT809.Protocol/{JT809MessageBody => MessageBody}/JT809_0x9002.cs (79%) rename src/JT809.Protocol/{JT809MessageBody => MessageBody}/JT809_0x9003.cs (81%) rename src/JT809.Protocol/{JT809MessageBody => MessageBody}/JT809_0x9004.cs (93%) rename src/JT809.Protocol/{JT809MessageBody => MessageBody}/JT809_0x9005.cs (93%) rename src/JT809.Protocol/{JT809MessageBody => MessageBody}/JT809_0x9006.cs (93%) rename src/JT809.Protocol/{JT809MessageBody => MessageBody}/JT809_0x9007.cs (84%) rename src/JT809.Protocol/{JT809MessageBody => MessageBody}/JT809_0x9008.cs (72%) rename src/JT809.Protocol/{JT809MessageBody => MessageBody}/JT809_0x9101.cs (90%) rename src/JT809.Protocol/{JT809MessageBody => MessageBody}/JT809_0x9200.cs (81%) rename src/JT809.Protocol/{JT809MessageBody => MessageBody}/JT809_0x9300.cs (71%) rename src/JT809.Protocol/{JT809MessageBody => MessageBody}/JT809_0x9400.cs (71%) rename src/JT809.Protocol/{JT809MessageBody => MessageBody}/JT809_0x9500.cs (79%) rename src/JT809.Protocol/{JT809MessageBody => MessageBody}/JT809_0x9600.cs (71%) rename src/JT809.Protocol/{JT809Properties => Metadata}/JT809VehiclePositionProperties.cs (97%) rename src/JT809.Protocol/{JT809SubMessageBody => SubMessageBody}/JT809_0x1200_0x1201.cs (87%) rename src/JT809.Protocol/{JT809SubMessageBody => SubMessageBody}/JT809_0x1200_0x1202.cs (76%) rename src/JT809.Protocol/{JT809SubMessageBody => SubMessageBody}/JT809_0x1200_0x1203.cs (86%) rename src/JT809.Protocol/{JT809SubMessageBody => SubMessageBody}/JT809_0x1200_0x1205.cs (90%) rename src/JT809.Protocol/{JT809SubMessageBody => SubMessageBody}/JT809_0x1200_0x1206.cs (86%) rename src/JT809.Protocol/{JT809SubMessageBody => SubMessageBody}/JT809_0x1200_0x1207.cs (86%) rename src/JT809.Protocol/{JT809SubMessageBody => SubMessageBody}/JT809_0x1200_0x1208.cs (90%) rename src/JT809.Protocol/{JT809SubMessageBody => SubMessageBody}/JT809_0x1200_0x1209.cs (85%) rename src/JT809.Protocol/{JT809SubMessageBody => SubMessageBody}/JT809_0x1200_0x120A.cs (87%) rename src/JT809.Protocol/{JT809SubMessageBody => SubMessageBody}/JT809_0x1200_0x120B.cs (83%) rename src/JT809.Protocol/{JT809SubMessageBody => SubMessageBody}/JT809_0x1200_0x120C.cs (84%) rename src/JT809.Protocol/{JT809SubMessageBody => SubMessageBody}/JT809_0x1200_0x120D.cs (80%) rename src/JT809.Protocol/{JT809SubMessageBody => SubMessageBody}/JT809_0x1300_0x1301.cs (84%) rename src/JT809.Protocol/{JT809SubMessageBody => SubMessageBody}/JT809_0x1300_0x1302.cs (78%) rename src/JT809.Protocol/{JT809SubMessageBody => SubMessageBody}/JT809_0x1400_0x1401.cs (79%) rename src/JT809.Protocol/{JT809SubMessageBody => SubMessageBody}/JT809_0x1400_0x1402.cs (86%) rename src/JT809.Protocol/{JT809SubMessageBody => SubMessageBody}/JT809_0x1400_0x1403.cs (79%) rename src/JT809.Protocol/{JT809SubMessageBody => SubMessageBody}/JT809_0x1500_0x1501.cs (75%) rename src/JT809.Protocol/{JT809SubMessageBody => SubMessageBody}/JT809_0x1500_0x1502.cs (86%) rename src/JT809.Protocol/{JT809SubMessageBody => SubMessageBody}/JT809_0x1500_0x1503.cs (79%) rename src/JT809.Protocol/{JT809SubMessageBody => SubMessageBody}/JT809_0x1500_0x1504.cs (82%) rename src/JT809.Protocol/{JT809SubMessageBody => SubMessageBody}/JT809_0x1500_0x1505.cs (76%) rename src/JT809.Protocol/{JT809SubMessageBody => SubMessageBody}/JT809_0x1600_0x1601.cs (78%) rename src/JT809.Protocol/{JT809SubMessageBody => SubMessageBody}/JT809_0x9200_0x9202.cs (80%) rename src/JT809.Protocol/{JT809SubMessageBody => SubMessageBody}/JT809_0x9200_0x9203.cs (83%) rename src/JT809.Protocol/{JT809SubMessageBody => SubMessageBody}/JT809_0x9200_0x9204.cs (81%) rename src/JT809.Protocol/{JT809SubMessageBody => SubMessageBody}/JT809_0x9200_0x9205.cs (81%) rename src/JT809.Protocol/{JT809SubMessageBody => SubMessageBody}/JT809_0x9200_0x9206.cs (81%) rename src/JT809.Protocol/{JT809SubMessageBody => SubMessageBody}/JT809_0x9200_0x9207.cs (77%) rename src/JT809.Protocol/{JT809SubMessageBody => SubMessageBody}/JT809_0x9200_0x9208.cs (72%) rename src/JT809.Protocol/{JT809SubMessageBody => SubMessageBody}/JT809_0x9200_0x9209.cs (72%) rename src/JT809.Protocol/{JT809SubMessageBody => SubMessageBody}/JT809_0x9200_0x920A.cs (87%) rename src/JT809.Protocol/{JT809SubMessageBody => SubMessageBody}/JT809_0x9200_0x920B.cs (86%) rename src/JT809.Protocol/{JT809SubMessageBody => SubMessageBody}/JT809_0x9300_0x9301.cs (84%) rename src/JT809.Protocol/{JT809SubMessageBody => SubMessageBody}/JT809_0x9300_0x9302.cs (84%) rename src/JT809.Protocol/{JT809SubMessageBody => SubMessageBody}/JT809_0x9400_0x9401.cs (89%) rename src/JT809.Protocol/{JT809SubMessageBody => SubMessageBody}/JT809_0x9400_0x9402.cs (85%) rename src/JT809.Protocol/{JT809SubMessageBody => SubMessageBody}/JT809_0x9400_0x9403.cs (85%) rename src/JT809.Protocol/{JT809SubMessageBody => SubMessageBody}/JT809_0x9500_0x9501.cs (78%) rename src/JT809.Protocol/{JT809SubMessageBody => SubMessageBody}/JT809_0x9500_0x9502.cs (85%) rename src/JT809.Protocol/{JT809SubMessageBody => SubMessageBody}/JT809_0x9500_0x9503.cs (85%) rename src/JT809.Protocol/{JT809SubMessageBody => SubMessageBody}/JT809_0x9500_0x9504.cs (83%) rename src/JT809.Protocol/{JT809SubMessageBody => SubMessageBody}/JT809_0x9500_0x9505.cs (90%) rename src/JT809.Protocol/{JT809SubMessageBody => SubMessageBody}/JT809_0x9600_0x9601.cs (91%) diff --git a/src/JT809.Protocol.Benchmark/JT809SerializerContext.cs b/src/JT809.Protocol.Benchmark/JT809SerializerContext.cs index b96c4bb..f205b0a 100644 --- a/src/JT809.Protocol.Benchmark/JT809SerializerContext.cs +++ b/src/JT809.Protocol.Benchmark/JT809SerializerContext.cs @@ -3,10 +3,10 @@ using BenchmarkDotNet.Configs; using BenchmarkDotNet.Environments; using BenchmarkDotNet.Jobs; using BenchmarkDotNet.Toolchains.CsProj; -using JT809.Protocol.JT809Enums; -using JT809.Protocol.JT809MessageBody; -using JT809.Protocol.JT809SubMessageBody; -using JT809.Protocol.JT809Extensions; +using JT809.Protocol.Enums; +using JT809.Protocol.MessageBody; +using JT809.Protocol.SubMessageBody; +using JT809.Protocol.Extensions; using System; using System.Collections.Generic; using System.Text; @@ -51,15 +51,15 @@ namespace JT809.Protocol.Benchmark EncryptKey = 9999, EncryptFlag = JT809Header_Encrypt.None, Version = new JT809Header_Version(1, 0, 0), - BusinessType = JT809Enums.JT809BusinessType.从链路报警信息交互消息, + BusinessType = JT809BusinessType.从链路报警信息交互消息, MsgGNSSCENTERID = 20180920, }; JT809_0x9400 bodies = new JT809_0x9400 { VehicleNo = "粤A12345", - VehicleColor = JT809Enums.JT809VehicleColorType.黄色, - SubBusinessType = JT809Enums.JT809SubBusinessType.报警督办请求, + VehicleColor = JT809VehicleColorType.黄色, + SubBusinessType = JT809SubBusinessType.报警督办请求, }; JT809_0x9400_0x9401 jT809_0x9400_0x9401 = new JT809_0x9400_0x9401 diff --git a/src/JT809.Protocol.Extensions.DependencyInjection.Test/Program.cs b/src/JT809.Protocol.Extensions.DependencyInjection.Test/Program.cs index a2176ca..044e80d 100644 --- a/src/JT809.Protocol.Extensions.DependencyInjection.Test/Program.cs +++ b/src/JT809.Protocol.Extensions.DependencyInjection.Test/Program.cs @@ -1,4 +1,5 @@ -using JT809.Protocol.Extensions.DependencyInjection.Options; +using JT809.Protocol.Configs; +using JT809.Protocol.Extensions.DependencyInjection.Options; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; @@ -24,7 +25,7 @@ namespace JT809.Protocol.Extensions.DependencyInjection.Test // 方式2: services.AddJT809Configure(new JT809Options { - HeaderOptions=new JT809Configs.JT809HeaderOptions { + HeaderOptions=new JT809HeaderOptions { MsgGNSSCENTERID=20181012, EncryptFlag= JT809Header_Encrypt.Common, EncryptKey= 9999, @@ -34,7 +35,7 @@ namespace JT809.Protocol.Extensions.DependencyInjection.Test Build= 2 } }, - EncryptOptions = new JT809Configs.JT809EncryptOptions { + EncryptOptions = new JT809EncryptOptions { M1= 10000000, IA1=20000000, IC1=30000000 diff --git a/src/JT809.Protocol.Extensions.DependencyInjection/DependencyInjectionExtensions.cs b/src/JT809.Protocol.Extensions.DependencyInjection/DependencyInjectionExtensions.cs index 2f754a6..01cfb76 100644 --- a/src/JT809.Protocol.Extensions.DependencyInjection/DependencyInjectionExtensions.cs +++ b/src/JT809.Protocol.Extensions.DependencyInjection/DependencyInjectionExtensions.cs @@ -3,9 +3,9 @@ using Microsoft.Extensions.DependencyInjection.Extensions; using System; using System.Collections.Generic; using System.Text; -using JT809.Protocol.JT809Configs; +using JT809.Protocol.Configs; using Microsoft.Extensions.Configuration; -using JT809.Protocol.JT809Encrypt; +using JT809.Protocol.Encrypt; using JT809.Protocol.Extensions.DependencyInjection.Options; using Microsoft.Extensions.Options; diff --git a/src/JT809.Protocol.Extensions.DependencyInjection/Options/JT809Options.cs b/src/JT809.Protocol.Extensions.DependencyInjection/Options/JT809Options.cs index c6578a4..47bf883 100644 --- a/src/JT809.Protocol.Extensions.DependencyInjection/Options/JT809Options.cs +++ b/src/JT809.Protocol.Extensions.DependencyInjection/Options/JT809Options.cs @@ -1,4 +1,4 @@ -using JT809.Protocol.JT809Configs; +using JT809.Protocol.Configs; using Microsoft.Extensions.Options; using System; using System.Collections.Generic; diff --git a/src/JT809.Protocol.Test/JT809Encrypt/JT809EncryptTest.cs b/src/JT809.Protocol.Test/JT809Encrypt/JT809EncryptTest.cs index 5151ec5..ce72f07 100644 --- a/src/JT809.Protocol.Test/JT809Encrypt/JT809EncryptTest.cs +++ b/src/JT809.Protocol.Test/JT809Encrypt/JT809EncryptTest.cs @@ -1,10 +1,10 @@ -using JT809.Protocol.JT809Configs; -using JT809.Protocol.JT809Encrypt; +using JT809.Protocol.Configs; +using JT809.Protocol.Encrypt; using System; using System.Collections.Generic; using System.Text; using Xunit; -using JT809.Protocol.JT809Extensions; +using JT809.Protocol.Extensions; namespace JT809.Protocol.Test.JT809Encrypt { diff --git a/src/JT809.Protocol.Test/JT809Extensions/JT809BinaryExtensionsTest.cs b/src/JT809.Protocol.Test/JT809Extensions/JT809BinaryExtensionsTest.cs index b8eba89..fad9476 100644 --- a/src/JT809.Protocol.Test/JT809Extensions/JT809BinaryExtensionsTest.cs +++ b/src/JT809.Protocol.Test/JT809Extensions/JT809BinaryExtensionsTest.cs @@ -1,5 +1,5 @@ -using JT809.Protocol.JT809Enums; -using JT809.Protocol.JT809Extensions; +using JT809.Protocol.Enums; +using JT809.Protocol.Extensions; using System; using System.Collections.Generic; using System.Text; diff --git a/src/JT809.Protocol.Test/JT809HeaderTest.cs b/src/JT809.Protocol.Test/JT809HeaderTest.cs index a26a4cd..05b26d6 100644 --- a/src/JT809.Protocol.Test/JT809HeaderTest.cs +++ b/src/JT809.Protocol.Test/JT809HeaderTest.cs @@ -3,9 +3,10 @@ using System.Collections.Generic; using System.Text; using Xunit; using JT809.Protocol; -using JT809.Protocol.JT809Extensions; +using JT809.Protocol.Extensions; using System.Threading.Tasks; using System.Diagnostics; +using JT809.Protocol.Enums; namespace JT809.Protocol.Test { @@ -17,7 +18,7 @@ namespace JT809.Protocol.Test JT809Header jT809Header = new JT809Header(); jT809Header.MsgLength = 24; jT809Header.MsgSN = 1024; - jT809Header.BusinessType = JT809Enums.JT809BusinessType.从链路静态信息交换消息; + jT809Header.BusinessType = JT809BusinessType.从链路静态信息交换消息; jT809Header.MsgGNSSCENTERID = 1200; jT809Header.Version = new JT809Header_Version(); jT809Header.EncryptFlag = JT809Header_Encrypt.None; @@ -34,7 +35,7 @@ namespace JT809.Protocol.Test JT809Header jT809Header= JT809Serializer.Deserialize(bytes); Assert.Equal((uint)24, jT809Header.MsgLength); Assert.Equal((uint)1024, jT809Header.MsgSN); - Assert.Equal(JT809Enums.JT809BusinessType.从链路静态信息交换消息, jT809Header.BusinessType); + Assert.Equal(JT809BusinessType.从链路静态信息交换消息, jT809Header.BusinessType); Assert.Equal((uint)1200, jT809Header.MsgGNSSCENTERID); Assert.Equal(new JT809Header_Version().ToString(), jT809Header.Version.ToString()); Assert.Equal(JT809Header_Encrypt.None, jT809Header.EncryptFlag); @@ -61,7 +62,7 @@ namespace JT809.Protocol.Test JT809Header jT809Header = new JT809Header(); jT809Header.MsgLength = 24; jT809Header.MsgSN = 1024; - jT809Header.BusinessType = JT809Enums.JT809BusinessType.从链路静态信息交换消息; + jT809Header.BusinessType = JT809BusinessType.从链路静态信息交换消息; jT809Header.MsgGNSSCENTERID = 1200; jT809Header.Version = new JT809Header_Version (0xFF,0xAA,0xBB); jT809Header.EncryptFlag = JT809Header_Encrypt.None; diff --git a/src/JT809.Protocol.Test/JT809MessageBody/JT809_0x1001Test.cs b/src/JT809.Protocol.Test/JT809MessageBody/JT809_0x1001Test.cs index 82217ec..8b50f53 100644 --- a/src/JT809.Protocol.Test/JT809MessageBody/JT809_0x1001Test.cs +++ b/src/JT809.Protocol.Test/JT809MessageBody/JT809_0x1001Test.cs @@ -3,9 +3,9 @@ using System.Collections.Generic; using System.Text; using Xunit; using JT809.Protocol; -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809MessageBody; -using JT809.Protocol.JT809Exceptions; +using JT809.Protocol.Extensions; +using JT809.Protocol.MessageBody; +using JT809.Protocol.Exceptions; namespace JT809.Protocol.Test.JT809MessageBody { diff --git a/src/JT809.Protocol.Test/JT809MessageBody/JT809_0x1002Test.cs b/src/JT809.Protocol.Test/JT809MessageBody/JT809_0x1002Test.cs index 5f3b775..4706f24 100644 --- a/src/JT809.Protocol.Test/JT809MessageBody/JT809_0x1002Test.cs +++ b/src/JT809.Protocol.Test/JT809MessageBody/JT809_0x1002Test.cs @@ -3,9 +3,10 @@ using System.Collections.Generic; using System.Text; using Xunit; using JT809.Protocol; -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809MessageBody; -using JT809.Protocol.JT809Exceptions; +using JT809.Protocol.Extensions; +using JT809.Protocol.MessageBody; +using JT809.Protocol.Exceptions; +using JT809.Protocol.Enums; namespace JT809.Protocol.Test.JT809MessageBody { @@ -15,7 +16,7 @@ namespace JT809.Protocol.Test.JT809MessageBody public void Test1() { JT809_0x1002 jT809_0X1002 = new JT809_0x1002(); - jT809_0X1002.Result = JT809Enums.JT809_0x1002_Result.成功; + jT809_0X1002.Result = JT809_0x1002_Result.成功; jT809_0X1002.VerifyCode = 54456; var hex = JT809Serializer.Serialize(jT809_0X1002).ToHexString(); //"00 00 00 D4 B8" @@ -27,7 +28,7 @@ namespace JT809.Protocol.Test.JT809MessageBody { var bytes = "00 00 00 D4 B8".ToHexBytes(); JT809_0x1002 jT809_0X1002 = JT809Serializer.Deserialize(bytes); - Assert.Equal(JT809Enums.JT809_0x1002_Result.成功, jT809_0X1002.Result); + Assert.Equal(JT809_0x1002_Result.成功, jT809_0X1002.Result); Assert.Equal((uint)54456, jT809_0X1002.VerifyCode); } } diff --git a/src/JT809.Protocol.Test/JT809MessageBody/JT809_0x1003Test.cs b/src/JT809.Protocol.Test/JT809MessageBody/JT809_0x1003Test.cs index 8053eb4..2eaaaf9 100644 --- a/src/JT809.Protocol.Test/JT809MessageBody/JT809_0x1003Test.cs +++ b/src/JT809.Protocol.Test/JT809MessageBody/JT809_0x1003Test.cs @@ -3,9 +3,9 @@ using System.Collections.Generic; using System.Text; using Xunit; using JT809.Protocol; -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809MessageBody; -using JT809.Protocol.JT809Exceptions; +using JT809.Protocol.Extensions; +using JT809.Protocol.MessageBody; +using JT809.Protocol.Exceptions; namespace JT809.Protocol.Test.JT809MessageBody { diff --git a/src/JT809.Protocol.Test/JT809MessageBody/JT809_0x1005Test.cs b/src/JT809.Protocol.Test/JT809MessageBody/JT809_0x1005Test.cs index 4759586..4e08e05 100644 --- a/src/JT809.Protocol.Test/JT809MessageBody/JT809_0x1005Test.cs +++ b/src/JT809.Protocol.Test/JT809MessageBody/JT809_0x1005Test.cs @@ -1,5 +1,5 @@ -using JT809.Protocol.JT809Enums; -using JT809.Protocol.JT809Extensions; +using JT809.Protocol.Enums; +using JT809.Protocol.Extensions; using System; using System.Collections.Generic; using System.Text; diff --git a/src/JT809.Protocol.Test/JT809MessageBody/JT809_0x1006Test.cs b/src/JT809.Protocol.Test/JT809MessageBody/JT809_0x1006Test.cs index 67f6aa0..52a6511 100644 --- a/src/JT809.Protocol.Test/JT809MessageBody/JT809_0x1006Test.cs +++ b/src/JT809.Protocol.Test/JT809MessageBody/JT809_0x1006Test.cs @@ -1,7 +1,7 @@ using JT809.Protocol; -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809MessageBody; -using JT809.Protocol.JT809Exceptions; +using JT809.Protocol.Extensions; +using JT809.Protocol.MessageBody; +using JT809.Protocol.Exceptions; using System; using System.Collections.Generic; using System.Text; diff --git a/src/JT809.Protocol.Test/JT809MessageBody/JT809_0x1007Test.cs b/src/JT809.Protocol.Test/JT809MessageBody/JT809_0x1007Test.cs index a16f14e..8b21e0e 100644 --- a/src/JT809.Protocol.Test/JT809MessageBody/JT809_0x1007Test.cs +++ b/src/JT809.Protocol.Test/JT809MessageBody/JT809_0x1007Test.cs @@ -1,11 +1,12 @@ using JT809.Protocol; -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809MessageBody; -using JT809.Protocol.JT809Exceptions; +using JT809.Protocol.Extensions; +using JT809.Protocol.MessageBody; +using JT809.Protocol.Exceptions; using System; using System.Collections.Generic; using System.Text; using Xunit; +using JT809.Protocol.Enums; namespace JT809.Protocol.Test.JT809MessageBody { @@ -15,7 +16,7 @@ namespace JT809.Protocol.Test.JT809MessageBody public void Test1() { JT809_0x1007 jT809_0X1007 = new JT809_0x1007(); - jT809_0X1007.ErrorCode = JT809Enums.JT809_0x1007_ErrorCode.主链路断开; + jT809_0X1007.ErrorCode = JT809_0x1007_ErrorCode.主链路断开; var hex = JT809Serializer.Serialize(jT809_0X1007).ToHexString(); Assert.Equal("00", hex); } @@ -25,7 +26,7 @@ namespace JT809.Protocol.Test.JT809MessageBody { var bytes = "00".ToHexBytes(); JT809_0x1007 jT809_0X1007 = JT809Serializer.Deserialize(bytes); - Assert.Equal(JT809Enums.JT809_0x1007_ErrorCode.主链路断开, jT809_0X1007.ErrorCode); + Assert.Equal(JT809_0x1007_ErrorCode.主链路断开, jT809_0X1007.ErrorCode); } } } diff --git a/src/JT809.Protocol.Test/JT809MessageBody/JT809_0x1008Test.cs b/src/JT809.Protocol.Test/JT809MessageBody/JT809_0x1008Test.cs index 6cf21da..80537b7 100644 --- a/src/JT809.Protocol.Test/JT809MessageBody/JT809_0x1008Test.cs +++ b/src/JT809.Protocol.Test/JT809MessageBody/JT809_0x1008Test.cs @@ -1,11 +1,12 @@ using JT809.Protocol; -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809MessageBody; -using JT809.Protocol.JT809Exceptions; +using JT809.Protocol.Extensions; +using JT809.Protocol.MessageBody; +using JT809.Protocol.Exceptions; using System; using System.Collections.Generic; using System.Text; using Xunit; +using JT809.Protocol.Enums; namespace JT809.Protocol.Test.JT809MessageBody { @@ -15,7 +16,7 @@ namespace JT809.Protocol.Test.JT809MessageBody public void Test1() { JT809_0x1008 jT809_0X1008 = new JT809_0x1008(); - jT809_0X1008.ReasonCode = JT809Enums.JT809_0x1008_ReasonCode.网关重启; + jT809_0X1008.ReasonCode = JT809_0x1008_ReasonCode.网关重启; var hex = JT809Serializer.Serialize(jT809_0X1008).ToHexString(); Assert.Equal("00", hex); } @@ -25,7 +26,7 @@ namespace JT809.Protocol.Test.JT809MessageBody { var bytes = "00".ToHexBytes(); JT809_0x1008 jT809_0X1008 = JT809Serializer.Deserialize(bytes); - Assert.Equal(JT809Enums.JT809_0x1008_ReasonCode.网关重启, jT809_0X1008.ReasonCode); + Assert.Equal(JT809_0x1008_ReasonCode.网关重启, jT809_0X1008.ReasonCode); } } } diff --git a/src/JT809.Protocol.Test/JT809MessageBody/JT809_0x1200Test.cs b/src/JT809.Protocol.Test/JT809MessageBody/JT809_0x1200Test.cs index aea5e7f..7b6751f 100644 --- a/src/JT809.Protocol.Test/JT809MessageBody/JT809_0x1200Test.cs +++ b/src/JT809.Protocol.Test/JT809MessageBody/JT809_0x1200Test.cs @@ -1,12 +1,13 @@ using JT809.Protocol; -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809MessageBody; -using JT809.Protocol.JT809SubMessageBody; -using JT809.Protocol.JT809Exceptions; +using JT809.Protocol.Extensions; +using JT809.Protocol.MessageBody; +using JT809.Protocol.SubMessageBody; +using JT809.Protocol.Exceptions; using System; using System.Collections.Generic; using System.Text; using Xunit; +using JT809.Protocol.Enums; namespace JT809.Protocol.Test.JT809MessageBody { @@ -17,8 +18,8 @@ namespace JT809.Protocol.Test.JT809MessageBody { JT809_0x1200 jT809_0X1200 = new JT809_0x1200(); jT809_0X1200.VehicleNo= "粤A12345"; - jT809_0X1200.VehicleColor = JT809Enums.JT809VehicleColorType.蓝色; - jT809_0X1200.SubBusinessType = JT809Enums.JT809SubBusinessType.上传车辆注册信息; + jT809_0X1200.VehicleColor = JT809VehicleColorType.蓝色; + jT809_0X1200.SubBusinessType = JT809SubBusinessType.上传车辆注册信息; jT809_0X1200.DataLength = 61; JT809_0x1200_0x1201 jT809_0X1200_0X1201 = new JT809_0x1200_0x1201 { @@ -41,8 +42,8 @@ namespace JT809.Protocol.Test.JT809MessageBody var bytes = "D4 C1 41 31 32 33 34 35 00 00 00 00 00 00 00 00 00 00 00 00 00 01 12 01 00 00 00 3D 00 00 00 00 00 00 00 42 3A 35 C7 00 00 00 00 00 00 00 42 3A 35 C7 31 31 31 31 31 31 31 31 00 00 00 00 00 00 00 00 00 00 00 00 31 31 31 31 31 41 41 32 32 32 32 32 32 32 32 32 32 32 32".ToHexBytes(); JT809_0x1200 jT809_0X9001 = JT809Serializer.Deserialize(bytes); Assert.Equal("粤A12345", jT809_0X9001.VehicleNo); - Assert.Equal(JT809Enums.JT809VehicleColorType.蓝色, jT809_0X9001.VehicleColor); - Assert.Equal(JT809Enums.JT809SubBusinessType.上传车辆注册信息, jT809_0X9001.SubBusinessType); + Assert.Equal(JT809VehicleColorType.蓝色, jT809_0X9001.VehicleColor); + Assert.Equal(JT809SubBusinessType.上传车辆注册信息, jT809_0X9001.SubBusinessType); Assert.Equal((ushort)61, jT809_0X9001.DataLength); JT809_0x1200_0x1201 jT809_0X1200_0X1201 = jT809_0X9001.SubBodies as JT809_0x1200_0x1201; Assert.Equal("1111111111", jT809_0X1200_0X1201.PlateformId); diff --git a/src/JT809.Protocol.Test/JT809MessageBody/JT809_0x1300Test.cs b/src/JT809.Protocol.Test/JT809MessageBody/JT809_0x1300Test.cs index b2a9558..a1e59a3 100644 --- a/src/JT809.Protocol.Test/JT809MessageBody/JT809_0x1300Test.cs +++ b/src/JT809.Protocol.Test/JT809MessageBody/JT809_0x1300Test.cs @@ -1,12 +1,13 @@ using JT809.Protocol; -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809MessageBody; -using JT809.Protocol.JT809Exceptions; +using JT809.Protocol.Extensions; +using JT809.Protocol.MessageBody; +using JT809.Protocol.Exceptions; using System; using System.Collections.Generic; using System.Text; using Xunit; -using JT809.Protocol.JT809SubMessageBody; +using JT809.Protocol.SubMessageBody; +using JT809.Protocol.Enums; namespace JT809.Protocol.Test.JT809MessageBody { @@ -16,13 +17,13 @@ namespace JT809.Protocol.Test.JT809MessageBody public void Test1() { JT809_0x1300 jT809Bodies = new JT809_0x1300(); - jT809Bodies.SubBusinessType = JT809Enums.JT809SubBusinessType.平台查岗应答; + jT809Bodies.SubBusinessType = JT809SubBusinessType.平台查岗应答; jT809Bodies.SubBodies = new JT809_0x1300_0x1301 { ObjectID="111", InfoContent= "22ha22", InfoID= 1234, - ObjectType= JT809Enums.JT809_0x1301_ObjectType.当前连接的下级平台 + ObjectType= JT809_0x1301_ObjectType.当前连接的下级平台 }; var hex = JT809Serializer.Serialize(jT809Bodies).ToHexString(); //"13 01 00 00 00 1B 01 31 31 31 00 00 00 00 00 00 00 00 00 00 00 04 D2 00 00 00 06 32 32 68 61 32 32" @@ -34,12 +35,12 @@ namespace JT809.Protocol.Test.JT809MessageBody { var bytes = "13 01 00 00 00 1B 01 31 31 31 00 00 00 00 00 00 00 00 00 00 00 04 D2 00 00 00 06 32 32 68 61 32 32".ToHexBytes(); JT809_0x1300 jT809Bodies = JT809Serializer.Deserialize(bytes); - Assert.Equal(JT809Enums.JT809SubBusinessType.平台查岗应答, jT809Bodies.SubBusinessType); + Assert.Equal(JT809SubBusinessType.平台查岗应答, jT809Bodies.SubBusinessType); JT809_0x1300_0x1301 jT809SubBodies = (JT809_0x1300_0x1301)jT809Bodies.SubBodies; Assert.Equal("111", jT809SubBodies.ObjectID); Assert.Equal("22ha22", jT809SubBodies.InfoContent); Assert.Equal((uint)1234, jT809SubBodies.InfoID); - Assert.Equal(JT809Enums.JT809_0x1301_ObjectType.当前连接的下级平台, jT809SubBodies.ObjectType); + Assert.Equal(JT809_0x1301_ObjectType.当前连接的下级平台, jT809SubBodies.ObjectType); } } } diff --git a/src/JT809.Protocol.Test/JT809MessageBody/JT809_0x1600Test.cs b/src/JT809.Protocol.Test/JT809MessageBody/JT809_0x1600Test.cs index bb88c87..b6b8c56 100644 --- a/src/JT809.Protocol.Test/JT809MessageBody/JT809_0x1600Test.cs +++ b/src/JT809.Protocol.Test/JT809MessageBody/JT809_0x1600Test.cs @@ -1,12 +1,13 @@ using JT809.Protocol; -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809MessageBody; -using JT809.Protocol.JT809Exceptions; +using JT809.Protocol.Extensions; +using JT809.Protocol.MessageBody; +using JT809.Protocol.Exceptions; using System; using System.Collections.Generic; using System.Text; using Xunit; -using JT809.Protocol.JT809SubMessageBody; +using JT809.Protocol.SubMessageBody; +using JT809.Protocol.Enums; namespace JT809.Protocol.Test.JT809MessageBody { @@ -17,8 +18,8 @@ namespace JT809.Protocol.Test.JT809MessageBody { JT809_0x1600 jT809Bodies = new JT809_0x1600(); jT809Bodies.VehicleNo = "粤A12345"; - jT809Bodies.VehicleColor = JT809Enums.JT809VehicleColorType.蓝色; - jT809Bodies.SubBusinessType = JT809Enums.JT809SubBusinessType.补报车辆静态信息应答; + jT809Bodies.VehicleColor = JT809VehicleColorType.蓝色; + jT809Bodies.SubBusinessType = JT809SubBusinessType.补报车辆静态信息应答; jT809Bodies.SubBodies = new JT809_0x1600_0x1601 { CarInfo = "什么鬼" @@ -34,8 +35,8 @@ namespace JT809.Protocol.Test.JT809MessageBody var bytes = "D4 C1 41 31 32 33 34 35 00 00 00 00 00 00 00 00 00 00 00 00 00 01 16 01 00 00 00 06 CA B2 C3 B4 B9 ED".ToHexBytes(); JT809_0x1600 jT809Bodies = JT809Serializer.Deserialize(bytes); Assert.Equal("粤A12345", jT809Bodies.VehicleNo); - Assert.Equal(JT809Enums.JT809VehicleColorType.蓝色, jT809Bodies.VehicleColor); - Assert.Equal(JT809Enums.JT809SubBusinessType.补报车辆静态信息应答, jT809Bodies.SubBusinessType); + Assert.Equal(JT809VehicleColorType.蓝色, jT809Bodies.VehicleColor); + Assert.Equal(JT809SubBusinessType.补报车辆静态信息应答, jT809Bodies.SubBusinessType); Assert.Equal("什么鬼", ((JT809_0x1600_0x1601)jT809Bodies.SubBodies).CarInfo); } } diff --git a/src/JT809.Protocol.Test/JT809MessageBody/JT809_0x9001Test.cs b/src/JT809.Protocol.Test/JT809MessageBody/JT809_0x9001Test.cs index e1e2c5e..2f75ea7 100644 --- a/src/JT809.Protocol.Test/JT809MessageBody/JT809_0x9001Test.cs +++ b/src/JT809.Protocol.Test/JT809MessageBody/JT809_0x9001Test.cs @@ -1,7 +1,7 @@ using JT809.Protocol; -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809MessageBody; -using JT809.Protocol.JT809Exceptions; +using JT809.Protocol.Extensions; +using JT809.Protocol.MessageBody; +using JT809.Protocol.Exceptions; using System; using System.Collections.Generic; using System.Text; diff --git a/src/JT809.Protocol.Test/JT809MessageBody/JT809_0x9002Test.cs b/src/JT809.Protocol.Test/JT809MessageBody/JT809_0x9002Test.cs index b503f40..a88e906 100644 --- a/src/JT809.Protocol.Test/JT809MessageBody/JT809_0x9002Test.cs +++ b/src/JT809.Protocol.Test/JT809MessageBody/JT809_0x9002Test.cs @@ -1,11 +1,12 @@ using JT809.Protocol; -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809MessageBody; -using JT809.Protocol.JT809Exceptions; +using JT809.Protocol.Extensions; +using JT809.Protocol.MessageBody; +using JT809.Protocol.Exceptions; using System; using System.Collections.Generic; using System.Text; using Xunit; +using JT809.Protocol.Enums; namespace JT809.Protocol.Test.JT809MessageBody { @@ -15,7 +16,7 @@ namespace JT809.Protocol.Test.JT809MessageBody public void Test1() { JT809_0x9002 jT809_0X9002 = new JT809_0x9002(); - jT809_0X9002.Result = JT809Enums.JT809_0x9002_Result.成功; + jT809_0X9002.Result = JT809_0x9002_Result.成功; var hex = JT809Serializer.Serialize(jT809_0X9002).ToHexString(); Assert.Equal("00", hex); } @@ -25,7 +26,7 @@ namespace JT809.Protocol.Test.JT809MessageBody { var bytes = "00".ToHexBytes(); JT809_0x9002 jT809_0X9002 = JT809Serializer.Deserialize(bytes); - Assert.Equal(JT809Enums.JT809_0x9002_Result.成功, jT809_0X9002.Result); + Assert.Equal(JT809_0x9002_Result.成功, jT809_0X9002.Result); } } } diff --git a/src/JT809.Protocol.Test/JT809MessageBody/JT809_0x9003Test.cs b/src/JT809.Protocol.Test/JT809MessageBody/JT809_0x9003Test.cs index f64ffa5..4890d95 100644 --- a/src/JT809.Protocol.Test/JT809MessageBody/JT809_0x9003Test.cs +++ b/src/JT809.Protocol.Test/JT809MessageBody/JT809_0x9003Test.cs @@ -1,7 +1,7 @@ using JT809.Protocol; -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809MessageBody; -using JT809.Protocol.JT809Exceptions; +using JT809.Protocol.Extensions; +using JT809.Protocol.MessageBody; +using JT809.Protocol.Exceptions; using System; using System.Collections.Generic; using System.Text; diff --git a/src/JT809.Protocol.Test/JT809MessageBody/JT809_0x9007Test.cs b/src/JT809.Protocol.Test/JT809MessageBody/JT809_0x9007Test.cs index a218b7e..7fe7568 100644 --- a/src/JT809.Protocol.Test/JT809MessageBody/JT809_0x9007Test.cs +++ b/src/JT809.Protocol.Test/JT809MessageBody/JT809_0x9007Test.cs @@ -1,11 +1,12 @@ using JT809.Protocol; -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809MessageBody; -using JT809.Protocol.JT809Exceptions; +using JT809.Protocol.Extensions; +using JT809.Protocol.MessageBody; +using JT809.Protocol.Exceptions; using System; using System.Collections.Generic; using System.Text; using Xunit; +using JT809.Protocol.Enums; namespace JT809.Protocol.Test.JT809MessageBody { @@ -15,7 +16,7 @@ namespace JT809.Protocol.Test.JT809MessageBody public void Test1() { JT809_0x9007 jT809_0X9007 = new JT809_0x9007(); - jT809_0X9007.ReasonCode = JT809Enums.JT809_0x9007_ReasonCode.无法连接下级平台指定的服务IP与端口; + jT809_0X9007.ReasonCode = JT809_0x9007_ReasonCode.无法连接下级平台指定的服务IP与端口; var hex = JT809Serializer.Serialize(jT809_0X9007).ToHexString(); Assert.Equal("00", hex); } @@ -25,7 +26,7 @@ namespace JT809.Protocol.Test.JT809MessageBody { var bytes = "00".ToHexBytes(); JT809_0x9007 jT809_0X9007 = JT809Serializer.Deserialize(bytes); - Assert.Equal(JT809Enums.JT809_0x9007_ReasonCode.无法连接下级平台指定的服务IP与端口, jT809_0X9007.ReasonCode); + Assert.Equal(JT809_0x9007_ReasonCode.无法连接下级平台指定的服务IP与端口, jT809_0X9007.ReasonCode); } } } diff --git a/src/JT809.Protocol.Test/JT809MessageBody/JT809_0x9008Test.cs b/src/JT809.Protocol.Test/JT809MessageBody/JT809_0x9008Test.cs index 51d64fe..fea720a 100644 --- a/src/JT809.Protocol.Test/JT809MessageBody/JT809_0x9008Test.cs +++ b/src/JT809.Protocol.Test/JT809MessageBody/JT809_0x9008Test.cs @@ -1,11 +1,12 @@ using JT809.Protocol; -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809MessageBody; -using JT809.Protocol.JT809Exceptions; +using JT809.Protocol.Extensions; +using JT809.Protocol.MessageBody; +using JT809.Protocol.Exceptions; using System; using System.Collections.Generic; using System.Text; using Xunit; +using JT809.Protocol.Enums; namespace JT809.Protocol.Test.JT809MessageBody { @@ -15,7 +16,7 @@ namespace JT809.Protocol.Test.JT809MessageBody public void Test1() { JT809_0x9008 jT809_0X9008 = new JT809_0x9008(); - jT809_0X9008.ReasonCode = JT809Enums.JT809_0x9008_ReasonCode.其它原因; + jT809_0X9008.ReasonCode = JT809_0x9008_ReasonCode.其它原因; var hex = JT809Serializer.Serialize(jT809_0X9008).ToHexString(); Assert.Equal("01", hex); } @@ -25,7 +26,7 @@ namespace JT809.Protocol.Test.JT809MessageBody { var bytes = "01".ToHexBytes(); JT809_0x9008 jT809_0X9008 = JT809Serializer.Deserialize(bytes); - Assert.Equal(JT809Enums.JT809_0x9008_ReasonCode.其它原因, jT809_0X9008.ReasonCode); + Assert.Equal(JT809_0x9008_ReasonCode.其它原因, jT809_0X9008.ReasonCode); } } } diff --git a/src/JT809.Protocol.Test/JT809MessageBody/JT809_0x9101Test.cs b/src/JT809.Protocol.Test/JT809MessageBody/JT809_0x9101Test.cs index d238d59..bb02ed9 100644 --- a/src/JT809.Protocol.Test/JT809MessageBody/JT809_0x9101Test.cs +++ b/src/JT809.Protocol.Test/JT809MessageBody/JT809_0x9101Test.cs @@ -1,7 +1,7 @@ using JT809.Protocol; -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809MessageBody; -using JT809.Protocol.JT809Exceptions; +using JT809.Protocol.Extensions; +using JT809.Protocol.MessageBody; +using JT809.Protocol.Exceptions; using System; using System.Collections.Generic; using System.Text; diff --git a/src/JT809.Protocol.Test/JT809Packages/JT809_0x1001EncryptPackageTest.cs b/src/JT809.Protocol.Test/JT809Packages/JT809_0x1001EncryptPackageTest.cs index 8d66cea..5e46485 100644 --- a/src/JT809.Protocol.Test/JT809Packages/JT809_0x1001EncryptPackageTest.cs +++ b/src/JT809.Protocol.Test/JT809Packages/JT809_0x1001EncryptPackageTest.cs @@ -3,9 +3,11 @@ using System.Collections.Generic; using System.Text; using Xunit; using JT809.Protocol; -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809MessageBody; -using JT809.Protocol.JT809Encrypt; +using JT809.Protocol.Extensions; +using JT809.Protocol.MessageBody; +using JT809.Protocol.Encrypt; +using JT809.Protocol.Enums; +using JT809.Protocol.Configs; namespace JT809.Protocol.Test.JT809Packages { @@ -13,7 +15,7 @@ namespace JT809.Protocol.Test.JT809Packages { public JT809_0x1001EncryptPackageTest() { - JT809GlobalConfig.Instance.SetEncrypt(new JT809EncryptImpl(new JT809Configs.JT809EncryptOptions() + JT809GlobalConfig.Instance.SetEncrypt(new JT809EncryptImpl(new JT809EncryptOptions() { IA1 = 20000000, IC1 = 20000000, @@ -30,7 +32,7 @@ namespace JT809.Protocol.Test.JT809Packages EncryptFlag = JT809Header_Encrypt.Common, MsgSN = 133, EncryptKey = 256178, - BusinessType = JT809Enums.JT809BusinessType.主链路登录请求消息, + BusinessType = JT809BusinessType.主链路登录请求消息, MsgGNSSCENTERID = 20180920, }; JT809_0x1001 jT809_0X1001 = new JT809_0x1001(); @@ -54,7 +56,7 @@ namespace JT809.Protocol.Test.JT809Packages Assert.Equal((uint)72, jT809Package.Header.MsgLength); Assert.Equal((uint)133, jT809Package.Header.MsgSN); Assert.Equal((uint)20180920, jT809Package.Header.MsgGNSSCENTERID); - Assert.Equal(JT809Enums.JT809BusinessType.主链路登录请求消息, jT809Package.Header.BusinessType); + Assert.Equal(JT809BusinessType.主链路登录请求消息, jT809Package.Header.BusinessType); Assert.Equal("1.0.0", jT809Package.Header.Version.ToString()); JT809_0x1001 jT809_0X1001 = (JT809_0x1001)jT809Package.Bodies; Assert.Equal((uint)20180920, jT809_0X1001.UserId); diff --git a/src/JT809.Protocol.Test/JT809Packages/JT809_0x1001PackageTest.cs b/src/JT809.Protocol.Test/JT809Packages/JT809_0x1001PackageTest.cs index a5a88de..03ae2fb 100644 --- a/src/JT809.Protocol.Test/JT809Packages/JT809_0x1001PackageTest.cs +++ b/src/JT809.Protocol.Test/JT809Packages/JT809_0x1001PackageTest.cs @@ -3,8 +3,9 @@ using System.Collections.Generic; using System.Text; using Xunit; using JT809.Protocol; -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809MessageBody; +using JT809.Protocol.Extensions; +using JT809.Protocol.MessageBody; +using JT809.Protocol.Enums; namespace JT809.Protocol.Test.JT809Packages { @@ -18,7 +19,7 @@ namespace JT809.Protocol.Test.JT809Packages { MsgSN= 133, EncryptKey=9999, - BusinessType= JT809Enums.JT809BusinessType.主链路登录请求消息, + BusinessType= JT809BusinessType.主链路登录请求消息, MsgGNSSCENTERID= 20180920, }; JT809_0x1001 jT809_0X1001 = new JT809_0x1001(); @@ -54,7 +55,7 @@ namespace JT809.Protocol.Test.JT809Packages Assert.Equal((uint)133, jT809Package.Header.MsgSN); Assert.Equal((uint)9999, jT809Package.Header.EncryptKey); Assert.Equal((uint)20180920, jT809Package.Header.MsgGNSSCENTERID); - Assert.Equal(JT809Enums.JT809BusinessType.主链路登录请求消息, jT809Package.Header.BusinessType); + Assert.Equal(JT809BusinessType.主链路登录请求消息, jT809Package.Header.BusinessType); Assert.Equal(new JT809Header_Version().ToString(), jT809Package.Header.Version.ToString()); JT809_0x1001 jT809_0X1001 = (JT809_0x1001)jT809Package.Bodies; Assert.Equal((uint)20180920, jT809_0X1001.UserId); diff --git a/src/JT809.Protocol.Test/JT809Packages/JT809_0x9400_0x9401PackageTest.cs b/src/JT809.Protocol.Test/JT809Packages/JT809_0x9400_0x9401PackageTest.cs index 5712c99..98e385c 100644 --- a/src/JT809.Protocol.Test/JT809Packages/JT809_0x9400_0x9401PackageTest.cs +++ b/src/JT809.Protocol.Test/JT809Packages/JT809_0x9400_0x9401PackageTest.cs @@ -3,10 +3,11 @@ using System.Collections.Generic; using System.Text; using Xunit; using JT809.Protocol; -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809MessageBody; -using JT809.Protocol.JT809SubMessageBody; -using JT809.Protocol.JT809Enums; +using JT809.Protocol.Extensions; +using JT809.Protocol.MessageBody; +using JT809.Protocol.SubMessageBody; +using JT809.Protocol.Enums; +using JT809.Protocol.Configs; namespace JT809.Protocol.Test.JT809Packages { @@ -23,15 +24,15 @@ namespace JT809.Protocol.Test.JT809Packages EncryptKey = 9999, EncryptFlag= JT809Header_Encrypt.None, Version = new JT809Header_Version(1, 0, 0), - BusinessType = JT809Enums.JT809BusinessType.从链路报警信息交互消息, + BusinessType = JT809BusinessType.从链路报警信息交互消息, MsgGNSSCENTERID = 20180920, }; JT809_0x9400 bodies = new JT809_0x9400 { VehicleNo="粤A12345", - VehicleColor= JT809Enums.JT809VehicleColorType.黄色, - SubBusinessType= JT809Enums.JT809SubBusinessType.报警督办请求, + VehicleColor= JT809VehicleColorType.黄色, + SubBusinessType= JT809SubBusinessType.报警督办请求, }; JT809_0x9400_0x9401 jT809_0x9400_0x9401 = new JT809_0x9400_0x9401 @@ -64,13 +65,13 @@ namespace JT809.Protocol.Test.JT809Packages Assert.Equal((uint)9999, jT809Package.Header.EncryptKey); Assert.Equal(JT809Header_Encrypt.None, jT809Package.Header.EncryptFlag); Assert.Equal((uint)20180920, jT809Package.Header.MsgGNSSCENTERID); - Assert.Equal(JT809Enums.JT809BusinessType.从链路报警信息交互消息, jT809Package.Header.BusinessType); + Assert.Equal(JT809BusinessType.从链路报警信息交互消息, jT809Package.Header.BusinessType); Assert.Equal(new JT809Header_Version().ToString(), jT809Package.Header.Version.ToString()); JT809_0x9400 jT809_0X400 = (JT809_0x9400)jT809Package.Bodies; Assert.Equal("粤A12345", jT809_0X400.VehicleNo); - Assert.Equal(JT809Enums.JT809VehicleColorType.黄色, jT809_0X400.VehicleColor); - Assert.Equal(JT809Enums.JT809SubBusinessType.报警督办请求, jT809_0X400.SubBusinessType); + Assert.Equal(JT809VehicleColorType.黄色, jT809_0X400.VehicleColor); + Assert.Equal(JT809SubBusinessType.报警督办请求, jT809_0X400.SubBusinessType); Assert.Equal((uint)92, jT809_0X400.DataLength); JT809_0x9400_0x9401 jT809_0x9400_0x9401 = (JT809_0x9400_0x9401)jT809_0X400.SubBodies; @@ -88,7 +89,7 @@ namespace JT809.Protocol.Test.JT809Packages [Fact] public void Test3() { - JT809GlobalConfig.Instance.SetHeaderOptions(new JT809Configs.JT809HeaderOptions + JT809GlobalConfig.Instance.SetHeaderOptions(new JT809HeaderOptions { EncryptKey= 9999, MsgGNSSCENTERID= 20180920 @@ -96,8 +97,8 @@ namespace JT809.Protocol.Test.JT809Packages JT809Package jT809Package = JT809BusinessType.从链路报警信息交互消息.Create(new JT809_0x9400 { VehicleNo = "粤A12345", - VehicleColor = JT809Enums.JT809VehicleColorType.黄色, - SubBusinessType = JT809Enums.JT809SubBusinessType.报警督办请求, + VehicleColor = JT809VehicleColorType.黄色, + SubBusinessType = JT809SubBusinessType.报警督办请求, SubBodies = new JT809_0x9400_0x9401 { WarnSrc = JT809WarnSrc.车载终端, diff --git a/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1200_0x1201Test.cs b/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1200_0x1201Test.cs index 54c6cb1..7928e50 100644 --- a/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1200_0x1201Test.cs +++ b/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1200_0x1201Test.cs @@ -3,10 +3,10 @@ using System.Collections.Generic; using System.Text; using Xunit; using JT809.Protocol; -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809MessageBody; -using JT809.Protocol.JT809Exceptions; -using JT809.Protocol.JT809SubMessageBody; +using JT809.Protocol.Extensions; +using JT809.Protocol.MessageBody; +using JT809.Protocol.Exceptions; +using JT809.Protocol.SubMessageBody; namespace JT809.Protocol.Test.JT809SubMessageBody { diff --git a/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1200_0x1202Test.cs b/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1200_0x1202Test.cs index ccbc265..633bf92 100644 --- a/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1200_0x1202Test.cs +++ b/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1200_0x1202Test.cs @@ -3,10 +3,10 @@ using System.Collections.Generic; using System.Text; using Xunit; using JT809.Protocol; -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809MessageBody; -using JT809.Protocol.JT809Exceptions; -using JT809.Protocol.JT809SubMessageBody; +using JT809.Protocol.Extensions; +using JT809.Protocol.MessageBody; +using JT809.Protocol.Exceptions; +using JT809.Protocol.SubMessageBody; namespace JT809.Protocol.Test.JT809SubMessageBody { diff --git a/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1200_0x1203Test.cs b/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1200_0x1203Test.cs index 071d220..1ff4056 100644 --- a/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1200_0x1203Test.cs +++ b/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1200_0x1203Test.cs @@ -3,10 +3,10 @@ using System.Collections.Generic; using System.Text; using Xunit; using JT809.Protocol; -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809MessageBody; -using JT809.Protocol.JT809Exceptions; -using JT809.Protocol.JT809SubMessageBody; +using JT809.Protocol.Extensions; +using JT809.Protocol.MessageBody; +using JT809.Protocol.Exceptions; +using JT809.Protocol.SubMessageBody; namespace JT809.Protocol.Test.JT809SubMessageBody { diff --git a/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1200_0x1207Test.cs b/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1200_0x1207Test.cs index 306e796..c3d00c0 100644 --- a/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1200_0x1207Test.cs +++ b/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1200_0x1207Test.cs @@ -3,10 +3,10 @@ using System.Collections.Generic; using System.Text; using Xunit; using JT809.Protocol; -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809MessageBody; -using JT809.Protocol.JT809Exceptions; -using JT809.Protocol.JT809SubMessageBody; +using JT809.Protocol.Extensions; +using JT809.Protocol.MessageBody; +using JT809.Protocol.Exceptions; +using JT809.Protocol.SubMessageBody; namespace JT809.Protocol.Test.JT809SubMessageBody { diff --git a/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1200_0x1209Test.cs b/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1200_0x1209Test.cs index cd59933..3305075 100644 --- a/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1200_0x1209Test.cs +++ b/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1200_0x1209Test.cs @@ -3,10 +3,10 @@ using System.Collections.Generic; using System.Text; using Xunit; using JT809.Protocol; -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809MessageBody; -using JT809.Protocol.JT809Exceptions; -using JT809.Protocol.JT809SubMessageBody; +using JT809.Protocol.Extensions; +using JT809.Protocol.MessageBody; +using JT809.Protocol.Exceptions; +using JT809.Protocol.SubMessageBody; namespace JT809.Protocol.Test.JT809SubMessageBody { diff --git a/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1200_0x120ATest.cs b/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1200_0x120ATest.cs index c9e18bb..59c0671 100644 --- a/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1200_0x120ATest.cs +++ b/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1200_0x120ATest.cs @@ -3,10 +3,10 @@ using System.Collections.Generic; using System.Text; using Xunit; using JT809.Protocol; -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809MessageBody; -using JT809.Protocol.JT809Exceptions; -using JT809.Protocol.JT809SubMessageBody; +using JT809.Protocol.Extensions; +using JT809.Protocol.MessageBody; +using JT809.Protocol.Exceptions; +using JT809.Protocol.SubMessageBody; namespace JT809.Protocol.Test.JT809SubMessageBody { diff --git a/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1200_0x120BTest.cs b/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1200_0x120BTest.cs index 8ec6ac3..d4b2886 100644 --- a/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1200_0x120BTest.cs +++ b/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1200_0x120BTest.cs @@ -3,10 +3,10 @@ using System.Collections.Generic; using System.Text; using Xunit; using JT809.Protocol; -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809MessageBody; -using JT809.Protocol.JT809Exceptions; -using JT809.Protocol.JT809SubMessageBody; +using JT809.Protocol.Extensions; +using JT809.Protocol.MessageBody; +using JT809.Protocol.Exceptions; +using JT809.Protocol.SubMessageBody; namespace JT809.Protocol.Test.JT809SubMessageBody { diff --git a/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1200_0x120CTest.cs b/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1200_0x120CTest.cs index e799992..8aa5501 100644 --- a/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1200_0x120CTest.cs +++ b/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1200_0x120CTest.cs @@ -3,10 +3,10 @@ using System.Collections.Generic; using System.Text; using Xunit; using JT809.Protocol; -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809MessageBody; -using JT809.Protocol.JT809Exceptions; -using JT809.Protocol.JT809SubMessageBody; +using JT809.Protocol.Extensions; +using JT809.Protocol.MessageBody; +using JT809.Protocol.Exceptions; +using JT809.Protocol.SubMessageBody; namespace JT809.Protocol.Test.JT809SubMessageBody { diff --git a/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1200_0x120DTest.cs b/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1200_0x120DTest.cs index 3c82737..16b89e6 100644 --- a/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1200_0x120DTest.cs +++ b/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1200_0x120DTest.cs @@ -3,10 +3,10 @@ using System.Collections.Generic; using System.Text; using Xunit; using JT809.Protocol; -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809MessageBody; -using JT809.Protocol.JT809Exceptions; -using JT809.Protocol.JT809SubMessageBody; +using JT809.Protocol.Extensions; +using JT809.Protocol.MessageBody; +using JT809.Protocol.Exceptions; +using JT809.Protocol.SubMessageBody; namespace JT809.Protocol.Test.JT809SubMessageBody { diff --git a/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1300_0x1301Test.cs b/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1300_0x1301Test.cs index 33c496d..2df9752 100644 --- a/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1300_0x1301Test.cs +++ b/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1300_0x1301Test.cs @@ -3,10 +3,11 @@ using System.Collections.Generic; using System.Text; using Xunit; using JT809.Protocol; -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809MessageBody; -using JT809.Protocol.JT809Exceptions; -using JT809.Protocol.JT809SubMessageBody; +using JT809.Protocol.Extensions; +using JT809.Protocol.MessageBody; +using JT809.Protocol.Exceptions; +using JT809.Protocol.SubMessageBody; +using JT809.Protocol.Enums; namespace JT809.Protocol.Test.JT809SubMessageBody { @@ -20,7 +21,7 @@ namespace JT809.Protocol.Test.JT809SubMessageBody ObjectID = "111", InfoContent = "22ha22", InfoID = 1234, - ObjectType = JT809Enums.JT809_0x1301_ObjectType.当前连接的下级平台 + ObjectType = JT809_0x1301_ObjectType.当前连接的下级平台 }; var hex = JT809Serializer.Serialize(jT809_0x1300_0x1301).ToHexString(); //"01 31 31 31 00 00 00 00 00 00 00 00 00 00 00 04 D2 00 00 00 06 32 32 68 61 32 32" @@ -35,7 +36,7 @@ namespace JT809.Protocol.Test.JT809SubMessageBody Assert.Equal("111", jT809_0x1300_0x1301.ObjectID); Assert.Equal("22ha22", jT809_0x1300_0x1301.InfoContent); Assert.Equal((uint)1234, jT809_0x1300_0x1301.InfoID); - Assert.Equal(JT809Enums.JT809_0x1301_ObjectType.当前连接的下级平台, jT809_0x1300_0x1301.ObjectType); + Assert.Equal(JT809_0x1301_ObjectType.当前连接的下级平台, jT809_0x1300_0x1301.ObjectType); } } } diff --git a/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1300_0x1302Test.cs b/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1300_0x1302Test.cs index ffe1af5..6d41acc 100644 --- a/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1300_0x1302Test.cs +++ b/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1300_0x1302Test.cs @@ -3,10 +3,10 @@ using System.Collections.Generic; using System.Text; using Xunit; using JT809.Protocol; -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809MessageBody; -using JT809.Protocol.JT809Exceptions; -using JT809.Protocol.JT809SubMessageBody; +using JT809.Protocol.Extensions; +using JT809.Protocol.MessageBody; +using JT809.Protocol.Exceptions; +using JT809.Protocol.SubMessageBody; namespace JT809.Protocol.Test.JT809SubMessageBody { diff --git a/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1400_0x1401Test.cs b/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1400_0x1401Test.cs index 7fbe90a..d05f4b4 100644 --- a/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1400_0x1401Test.cs +++ b/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1400_0x1401Test.cs @@ -3,11 +3,11 @@ using System.Collections.Generic; using System.Text; using Xunit; using JT809.Protocol; -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809MessageBody; -using JT809.Protocol.JT809Exceptions; -using JT809.Protocol.JT809SubMessageBody; -using JT809.Protocol.JT809Enums; +using JT809.Protocol.Extensions; +using JT809.Protocol.MessageBody; +using JT809.Protocol.Exceptions; +using JT809.Protocol.SubMessageBody; +using JT809.Protocol.Enums; namespace JT809.Protocol.Test.JT809SubMessageBody { diff --git a/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1400_0x1402Test.cs b/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1400_0x1402Test.cs index 711b797..88d2221 100644 --- a/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1400_0x1402Test.cs +++ b/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1400_0x1402Test.cs @@ -3,11 +3,11 @@ using System.Collections.Generic; using System.Text; using Xunit; using JT809.Protocol; -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809MessageBody; -using JT809.Protocol.JT809Exceptions; -using JT809.Protocol.JT809SubMessageBody; -using JT809.Protocol.JT809Enums; +using JT809.Protocol.Extensions; +using JT809.Protocol.MessageBody; +using JT809.Protocol.Exceptions; +using JT809.Protocol.SubMessageBody; +using JT809.Protocol.Enums; namespace JT809.Protocol.Test.JT809SubMessageBody { @@ -18,7 +18,7 @@ namespace JT809.Protocol.Test.JT809SubMessageBody { JT809_0x1400_0x1402 jT809_0x1400_0x1402 = new JT809_0x1400_0x1402 { - WarnSrc= JT809Enums.JT809WarnSrc.车载终端, + WarnSrc= JT809WarnSrc.车载终端, WarnType = JT809WarnType.偏离路线报警, WarnTime=DateTime.Parse("2018-09-26"), InfoContent = "gfdf454553", @@ -34,7 +34,7 @@ namespace JT809.Protocol.Test.JT809SubMessageBody { var bytes = "01 00 0B 00 00 00 00 5B AA 5B 80 00 00 0D 10 00 00 00 0A 67 66 64 66 34 35 34 35 35 33".ToHexBytes(); JT809_0x1400_0x1402 jT809_0x1400_0x1402 = JT809Serializer.Deserialize(bytes); - Assert.Equal(JT809Enums.JT809WarnSrc.车载终端, jT809_0x1400_0x1402.WarnSrc); + Assert.Equal(JT809WarnSrc.车载终端, jT809_0x1400_0x1402.WarnSrc); Assert.Equal("gfdf454553", jT809_0x1400_0x1402.InfoContent); Assert.Equal(JT809WarnType.偏离路线报警, jT809_0x1400_0x1402.WarnType); Assert.Equal((uint)3344, jT809_0x1400_0x1402.InfoID); diff --git a/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1400_0x1403Test.cs b/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1400_0x1403Test.cs index ef14e8c..c09b4ba 100644 --- a/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1400_0x1403Test.cs +++ b/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1400_0x1403Test.cs @@ -3,11 +3,11 @@ using System.Collections.Generic; using System.Text; using Xunit; using JT809.Protocol; -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809MessageBody; -using JT809.Protocol.JT809Exceptions; -using JT809.Protocol.JT809SubMessageBody; -using JT809.Protocol.JT809Enums; +using JT809.Protocol.Extensions; +using JT809.Protocol.MessageBody; +using JT809.Protocol.Exceptions; +using JT809.Protocol.SubMessageBody; +using JT809.Protocol.Enums; namespace JT809.Protocol.Test.JT809SubMessageBody { diff --git a/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1500_0x1501Test.cs b/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1500_0x1501Test.cs index 06316c1..452a92a 100644 --- a/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1500_0x1501Test.cs +++ b/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1500_0x1501Test.cs @@ -3,11 +3,11 @@ using System.Collections.Generic; using System.Text; using Xunit; using JT809.Protocol; -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809MessageBody; -using JT809.Protocol.JT809Exceptions; -using JT809.Protocol.JT809SubMessageBody; -using JT809.Protocol.JT809Enums; +using JT809.Protocol.Extensions; +using JT809.Protocol.MessageBody; +using JT809.Protocol.Exceptions; +using JT809.Protocol.SubMessageBody; +using JT809.Protocol.Enums; namespace JT809.Protocol.Test.JT809SubMessageBody { diff --git a/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1500_0x1502Test.cs b/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1500_0x1502Test.cs index bc45dc1..a7910b4 100644 --- a/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1500_0x1502Test.cs +++ b/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1500_0x1502Test.cs @@ -3,11 +3,12 @@ using System.Collections.Generic; using System.Text; using Xunit; using JT809.Protocol; -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809MessageBody; -using JT809.Protocol.JT809Exceptions; -using JT809.Protocol.JT809SubMessageBody; -using JT809.Protocol.JT809Enums; +using JT809.Protocol.Extensions; +using JT809.Protocol.MessageBody; +using JT809.Protocol.Exceptions; +using JT809.Protocol.SubMessageBody; +using JT809.Protocol.Enums; +using JT809.Protocol.Metadata; namespace JT809.Protocol.Test.JT809SubMessageBody { @@ -19,7 +20,7 @@ namespace JT809.Protocol.Test.JT809SubMessageBody JT809_0x1500_0x1502 jT809_0x1500_0x1502 = new JT809_0x1500_0x1502 { PhotoRspFlag= JT809_0x1502_PhotoRspFlag.完成拍照, - VehiclePosition=new JT809Properties.JT809VehiclePositionProperties + VehiclePosition=new JT809VehiclePositionProperties { Encrypt= JT809_VehiclePositionEncrypt.未加密, Day=19, diff --git a/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1500_0x1503Test.cs b/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1500_0x1503Test.cs index 2e11bd3..2d22504 100644 --- a/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1500_0x1503Test.cs +++ b/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1500_0x1503Test.cs @@ -3,11 +3,11 @@ using System.Collections.Generic; using System.Text; using Xunit; using JT809.Protocol; -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809MessageBody; -using JT809.Protocol.JT809Exceptions; -using JT809.Protocol.JT809SubMessageBody; -using JT809.Protocol.JT809Enums; +using JT809.Protocol.Extensions; +using JT809.Protocol.MessageBody; +using JT809.Protocol.Exceptions; +using JT809.Protocol.SubMessageBody; +using JT809.Protocol.Enums; namespace JT809.Protocol.Test.JT809SubMessageBody { diff --git a/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1500_0x1504Test.cs b/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1500_0x1504Test.cs index 0549723..7bb6d09 100644 --- a/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1500_0x1504Test.cs +++ b/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1500_0x1504Test.cs @@ -3,11 +3,11 @@ using System.Collections.Generic; using System.Text; using Xunit; using JT809.Protocol; -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809MessageBody; -using JT809.Protocol.JT809Exceptions; -using JT809.Protocol.JT809SubMessageBody; -using JT809.Protocol.JT809Enums; +using JT809.Protocol.Extensions; +using JT809.Protocol.MessageBody; +using JT809.Protocol.Exceptions; +using JT809.Protocol.SubMessageBody; +using JT809.Protocol.Enums; namespace JT809.Protocol.Test.JT809SubMessageBody { diff --git a/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1500_0x1505Test.cs b/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1500_0x1505Test.cs index d34f6cf..ebbca27 100644 --- a/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1500_0x1505Test.cs +++ b/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1500_0x1505Test.cs @@ -3,11 +3,11 @@ using System.Collections.Generic; using System.Text; using Xunit; using JT809.Protocol; -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809MessageBody; -using JT809.Protocol.JT809Exceptions; -using JT809.Protocol.JT809SubMessageBody; -using JT809.Protocol.JT809Enums; +using JT809.Protocol.Extensions; +using JT809.Protocol.MessageBody; +using JT809.Protocol.Exceptions; +using JT809.Protocol.SubMessageBody; +using JT809.Protocol.Enums; namespace JT809.Protocol.Test.JT809SubMessageBody { diff --git a/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1600_0x1601Test.cs b/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1600_0x1601Test.cs index 1a6f19b..2e96afb 100644 --- a/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1600_0x1601Test.cs +++ b/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1600_0x1601Test.cs @@ -3,11 +3,11 @@ using System.Collections.Generic; using System.Text; using Xunit; using JT809.Protocol; -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809MessageBody; -using JT809.Protocol.JT809Exceptions; -using JT809.Protocol.JT809SubMessageBody; -using JT809.Protocol.JT809Enums; +using JT809.Protocol.Extensions; +using JT809.Protocol.MessageBody; +using JT809.Protocol.Exceptions; +using JT809.Protocol.SubMessageBody; +using JT809.Protocol.Enums; namespace JT809.Protocol.Test.JT809SubMessageBody { diff --git a/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x9200_0x9204Test.cs b/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x9200_0x9204Test.cs index 3a86c7e..36edf4e 100644 --- a/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x9200_0x9204Test.cs +++ b/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x9200_0x9204Test.cs @@ -3,11 +3,11 @@ using System.Collections.Generic; using System.Text; using Xunit; using JT809.Protocol; -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809MessageBody; -using JT809.Protocol.JT809Exceptions; -using JT809.Protocol.JT809SubMessageBody; -using JT809.Protocol.JT809Enums; +using JT809.Protocol.Extensions; +using JT809.Protocol.MessageBody; +using JT809.Protocol.Exceptions; +using JT809.Protocol.SubMessageBody; +using JT809.Protocol.Enums; namespace JT809.Protocol.Test.JT809SubMessageBody { diff --git a/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x9200_0x9205Test.cs b/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x9200_0x9205Test.cs index b39623c..134c87f 100644 --- a/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x9200_0x9205Test.cs +++ b/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x9200_0x9205Test.cs @@ -3,11 +3,11 @@ using System.Collections.Generic; using System.Text; using Xunit; using JT809.Protocol; -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809MessageBody; -using JT809.Protocol.JT809Exceptions; -using JT809.Protocol.JT809SubMessageBody; -using JT809.Protocol.JT809Enums; +using JT809.Protocol.Extensions; +using JT809.Protocol.MessageBody; +using JT809.Protocol.Exceptions; +using JT809.Protocol.SubMessageBody; +using JT809.Protocol.Enums; namespace JT809.Protocol.Test.JT809SubMessageBody { diff --git a/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x9200_0x9206Test.cs b/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x9200_0x9206Test.cs index 5dbf355..177e5bd 100644 --- a/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x9200_0x9206Test.cs +++ b/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x9200_0x9206Test.cs @@ -3,11 +3,11 @@ using System.Collections.Generic; using System.Text; using Xunit; using JT809.Protocol; -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809MessageBody; -using JT809.Protocol.JT809Exceptions; -using JT809.Protocol.JT809SubMessageBody; -using JT809.Protocol.JT809Enums; +using JT809.Protocol.Extensions; +using JT809.Protocol.MessageBody; +using JT809.Protocol.Exceptions; +using JT809.Protocol.SubMessageBody; +using JT809.Protocol.Enums; namespace JT809.Protocol.Test.JT809SubMessageBody { diff --git a/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x9200_0x9207Test.cs b/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x9200_0x9207Test.cs index 074d012..29a6146 100644 --- a/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x9200_0x9207Test.cs +++ b/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x9200_0x9207Test.cs @@ -3,11 +3,11 @@ using System.Collections.Generic; using System.Text; using Xunit; using JT809.Protocol; -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809MessageBody; -using JT809.Protocol.JT809Exceptions; -using JT809.Protocol.JT809SubMessageBody; -using JT809.Protocol.JT809Enums; +using JT809.Protocol.Extensions; +using JT809.Protocol.MessageBody; +using JT809.Protocol.Exceptions; +using JT809.Protocol.SubMessageBody; +using JT809.Protocol.Enums; namespace JT809.Protocol.Test.JT809SubMessageBody { diff --git a/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x9200_0x9208Test.cs b/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x9200_0x9208Test.cs index bb7b51e..9feac67 100644 --- a/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x9200_0x9208Test.cs +++ b/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x9200_0x9208Test.cs @@ -3,11 +3,11 @@ using System.Collections.Generic; using System.Text; using Xunit; using JT809.Protocol; -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809MessageBody; -using JT809.Protocol.JT809Exceptions; -using JT809.Protocol.JT809SubMessageBody; -using JT809.Protocol.JT809Enums; +using JT809.Protocol.Extensions; +using JT809.Protocol.MessageBody; +using JT809.Protocol.Exceptions; +using JT809.Protocol.SubMessageBody; +using JT809.Protocol.Enums; namespace JT809.Protocol.Test.JT809SubMessageBody { diff --git a/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x9200_0x9209Test.cs b/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x9200_0x9209Test.cs index 5f921ac..5931e36 100644 --- a/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x9200_0x9209Test.cs +++ b/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x9200_0x9209Test.cs @@ -3,11 +3,11 @@ using System.Collections.Generic; using System.Text; using Xunit; using JT809.Protocol; -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809MessageBody; -using JT809.Protocol.JT809Exceptions; -using JT809.Protocol.JT809SubMessageBody; -using JT809.Protocol.JT809Enums; +using JT809.Protocol.Extensions; +using JT809.Protocol.MessageBody; +using JT809.Protocol.Exceptions; +using JT809.Protocol.SubMessageBody; +using JT809.Protocol.Enums; namespace JT809.Protocol.Test.JT809SubMessageBody { diff --git a/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x9300_0x9301Test.cs b/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x9300_0x9301Test.cs index dca38ef..ad4ea27 100644 --- a/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x9300_0x9301Test.cs +++ b/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x9300_0x9301Test.cs @@ -3,11 +3,11 @@ using System.Collections.Generic; using System.Text; using Xunit; using JT809.Protocol; -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809MessageBody; -using JT809.Protocol.JT809Exceptions; -using JT809.Protocol.JT809SubMessageBody; -using JT809.Protocol.JT809Enums; +using JT809.Protocol.Extensions; +using JT809.Protocol.MessageBody; +using JT809.Protocol.Exceptions; +using JT809.Protocol.SubMessageBody; +using JT809.Protocol.Enums; namespace JT809.Protocol.Test.JT809SubMessageBody { diff --git a/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x9300_0x9302Test.cs b/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x9300_0x9302Test.cs index 5ed9bc4..99bdcb0 100644 --- a/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x9300_0x9302Test.cs +++ b/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x9300_0x9302Test.cs @@ -3,11 +3,11 @@ using System.Collections.Generic; using System.Text; using Xunit; using JT809.Protocol; -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809MessageBody; -using JT809.Protocol.JT809Exceptions; -using JT809.Protocol.JT809SubMessageBody; -using JT809.Protocol.JT809Enums; +using JT809.Protocol.Extensions; +using JT809.Protocol.MessageBody; +using JT809.Protocol.Exceptions; +using JT809.Protocol.SubMessageBody; +using JT809.Protocol.Enums; namespace JT809.Protocol.Test.JT809SubMessageBody { diff --git a/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x9400_0x9401Test.cs b/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x9400_0x9401Test.cs index 4780ed7..78e201e 100644 --- a/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x9400_0x9401Test.cs +++ b/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x9400_0x9401Test.cs @@ -3,11 +3,11 @@ using System.Collections.Generic; using System.Text; using Xunit; using JT809.Protocol; -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809MessageBody; -using JT809.Protocol.JT809Exceptions; -using JT809.Protocol.JT809SubMessageBody; -using JT809.Protocol.JT809Enums; +using JT809.Protocol.Extensions; +using JT809.Protocol.MessageBody; +using JT809.Protocol.Exceptions; +using JT809.Protocol.SubMessageBody; +using JT809.Protocol.Enums; namespace JT809.Protocol.Test.JT809SubMessageBody { diff --git a/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x9400_0x9402Test.cs b/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x9400_0x9402Test.cs index e5cd457..5b4025b 100644 --- a/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x9400_0x9402Test.cs +++ b/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x9400_0x9402Test.cs @@ -3,11 +3,11 @@ using System.Collections.Generic; using System.Text; using Xunit; using JT809.Protocol; -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809MessageBody; -using JT809.Protocol.JT809Exceptions; -using JT809.Protocol.JT809SubMessageBody; -using JT809.Protocol.JT809Enums; +using JT809.Protocol.Extensions; +using JT809.Protocol.MessageBody; +using JT809.Protocol.Exceptions; +using JT809.Protocol.SubMessageBody; +using JT809.Protocol.Enums; namespace JT809.Protocol.Test.JT809SubMessageBody { diff --git a/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x9400_0x9403Test.cs b/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x9400_0x9403Test.cs index 8d4f89b..7091991 100644 --- a/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x9400_0x9403Test.cs +++ b/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x9400_0x9403Test.cs @@ -3,11 +3,11 @@ using System.Collections.Generic; using System.Text; using Xunit; using JT809.Protocol; -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809MessageBody; -using JT809.Protocol.JT809Exceptions; -using JT809.Protocol.JT809SubMessageBody; -using JT809.Protocol.JT809Enums; +using JT809.Protocol.Extensions; +using JT809.Protocol.MessageBody; +using JT809.Protocol.Exceptions; +using JT809.Protocol.SubMessageBody; +using JT809.Protocol.Enums; namespace JT809.Protocol.Test.JT809SubMessageBody { diff --git a/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x9500_0x9501Test.cs b/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x9500_0x9501Test.cs index a9cb181..0657fff 100644 --- a/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x9500_0x9501Test.cs +++ b/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x9500_0x9501Test.cs @@ -3,10 +3,10 @@ using System.Collections.Generic; using System.Text; using Xunit; using JT809.Protocol; -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809MessageBody; -using JT809.Protocol.JT809Exceptions; -using JT809.Protocol.JT809SubMessageBody; +using JT809.Protocol.Extensions; +using JT809.Protocol.MessageBody; +using JT809.Protocol.Exceptions; +using JT809.Protocol.SubMessageBody; namespace JT809.Protocol.Test.JT809SubMessageBody { diff --git a/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x9500_0x9502Test.cs b/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x9500_0x9502Test.cs index 2082786..1ebd244 100644 --- a/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x9500_0x9502Test.cs +++ b/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x9500_0x9502Test.cs @@ -3,10 +3,10 @@ using System.Collections.Generic; using System.Text; using Xunit; using JT809.Protocol; -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809MessageBody; -using JT809.Protocol.JT809Exceptions; -using JT809.Protocol.JT809SubMessageBody; +using JT809.Protocol.Extensions; +using JT809.Protocol.MessageBody; +using JT809.Protocol.Exceptions; +using JT809.Protocol.SubMessageBody; namespace JT809.Protocol.Test.JT809SubMessageBody { diff --git a/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x9500_0x9503Test.cs b/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x9500_0x9503Test.cs index fdbe666..bd496c5 100644 --- a/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x9500_0x9503Test.cs +++ b/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x9500_0x9503Test.cs @@ -3,10 +3,10 @@ using System.Collections.Generic; using System.Text; using Xunit; using JT809.Protocol; -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809MessageBody; -using JT809.Protocol.JT809Exceptions; -using JT809.Protocol.JT809SubMessageBody; +using JT809.Protocol.Extensions; +using JT809.Protocol.MessageBody; +using JT809.Protocol.Exceptions; +using JT809.Protocol.SubMessageBody; namespace JT809.Protocol.Test.JT809SubMessageBody { diff --git a/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x9500_0x9504Test.cs b/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x9500_0x9504Test.cs index b14c759..8094909 100644 --- a/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x9500_0x9504Test.cs +++ b/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x9500_0x9504Test.cs @@ -3,11 +3,11 @@ using System.Collections.Generic; using System.Text; using Xunit; using JT809.Protocol; -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809MessageBody; -using JT809.Protocol.JT809Exceptions; -using JT809.Protocol.JT809SubMessageBody; -using JT809.Protocol.JT809Enums; +using JT809.Protocol.Extensions; +using JT809.Protocol.MessageBody; +using JT809.Protocol.Exceptions; +using JT809.Protocol.SubMessageBody; +using JT809.Protocol.Enums; namespace JT809.Protocol.Test.JT809SubMessageBody { diff --git a/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x9500_0x9505Test.cs b/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x9500_0x9505Test.cs index d8bddb4..392f54b 100644 --- a/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x9500_0x9505Test.cs +++ b/src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x9500_0x9505Test.cs @@ -3,11 +3,11 @@ using System.Collections.Generic; using System.Text; using Xunit; using JT809.Protocol; -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809MessageBody; -using JT809.Protocol.JT809Exceptions; -using JT809.Protocol.JT809SubMessageBody; -using JT809.Protocol.JT809Enums; +using JT809.Protocol.Extensions; +using JT809.Protocol.MessageBody; +using JT809.Protocol.Exceptions; +using JT809.Protocol.SubMessageBody; +using JT809.Protocol.Enums; namespace JT809.Protocol.Test.JT809SubMessageBody { diff --git a/src/JT809.Protocol/JT809Attributes/JT809BodiesTypeAttribute.cs b/src/JT809.Protocol/Attributes/JT809BodiesTypeAttribute.cs similarity index 89% rename from src/JT809.Protocol/JT809Attributes/JT809BodiesTypeAttribute.cs rename to src/JT809.Protocol/Attributes/JT809BodiesTypeAttribute.cs index bf0e710..b7726fd 100644 --- a/src/JT809.Protocol/JT809Attributes/JT809BodiesTypeAttribute.cs +++ b/src/JT809.Protocol/Attributes/JT809BodiesTypeAttribute.cs @@ -1,6 +1,6 @@ using System; -namespace JT809.Protocol.JT809Attributes +namespace JT809.Protocol.Attributes { [AttributeUsage(AttributeTargets.Field, Inherited = false, AllowMultiple = false)] public sealed class JT809BodiesTypeAttribute : Attribute diff --git a/src/JT809.Protocol/JT809Attributes/JT809BusinessTypeDescriptionAttribute.cs b/src/JT809.Protocol/Attributes/JT809BusinessTypeDescriptionAttribute.cs similarity index 92% rename from src/JT809.Protocol/JT809Attributes/JT809BusinessTypeDescriptionAttribute.cs rename to src/JT809.Protocol/Attributes/JT809BusinessTypeDescriptionAttribute.cs index 6b9db66..0a0deae 100644 --- a/src/JT809.Protocol/JT809Attributes/JT809BusinessTypeDescriptionAttribute.cs +++ b/src/JT809.Protocol/Attributes/JT809BusinessTypeDescriptionAttribute.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Attributes +namespace JT809.Protocol.Attributes { [AttributeUsage(AttributeTargets.Field, Inherited = false, AllowMultiple = false)] public sealed class JT809BusinessTypeDescriptionAttribute : Attribute diff --git a/src/JT809.Protocol/JT809Attributes/JT809FormatterAttribute.cs b/src/JT809.Protocol/Attributes/JT809FormatterAttribute.cs similarity index 94% rename from src/JT809.Protocol/JT809Attributes/JT809FormatterAttribute.cs rename to src/JT809.Protocol/Attributes/JT809FormatterAttribute.cs index af1287b..4b33038 100644 --- a/src/JT809.Protocol/JT809Attributes/JT809FormatterAttribute.cs +++ b/src/JT809.Protocol/Attributes/JT809FormatterAttribute.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Attributes +namespace JT809.Protocol.Attributes { [AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Interface, AllowMultiple = false, Inherited = true)] public sealed class JT809FormatterAttribute:Attribute diff --git a/src/JT809.Protocol/JT809Attributes/JT809SubBusinessTypeDescriptionAttribute.cs b/src/JT809.Protocol/Attributes/JT809SubBusinessTypeDescriptionAttribute.cs similarity index 88% rename from src/JT809.Protocol/JT809Attributes/JT809SubBusinessTypeDescriptionAttribute.cs rename to src/JT809.Protocol/Attributes/JT809SubBusinessTypeDescriptionAttribute.cs index ea33ae8..ed89e15 100644 --- a/src/JT809.Protocol/JT809Attributes/JT809SubBusinessTypeDescriptionAttribute.cs +++ b/src/JT809.Protocol/Attributes/JT809SubBusinessTypeDescriptionAttribute.cs @@ -1,9 +1,9 @@ -using JT809.Protocol.JT809Enums; +using JT809.Protocol.Enums; using System; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Attributes +namespace JT809.Protocol.Attributes { [AttributeUsage(AttributeTargets.Field, Inherited = false, AllowMultiple = false)] public sealed class JT809SubBusinessTypeDescriptionAttribute : Attribute diff --git a/src/JT809.Protocol/JT809Configs/JT809EncryptOptions.cs b/src/JT809.Protocol/Configs/JT809EncryptOptions.cs similarity index 80% rename from src/JT809.Protocol/JT809Configs/JT809EncryptOptions.cs rename to src/JT809.Protocol/Configs/JT809EncryptOptions.cs index e00bc99..c8c51b9 100644 --- a/src/JT809.Protocol/JT809Configs/JT809EncryptOptions.cs +++ b/src/JT809.Protocol/Configs/JT809EncryptOptions.cs @@ -1,4 +1,4 @@ -namespace JT809.Protocol.JT809Configs +namespace JT809.Protocol.Configs { public class JT809EncryptOptions { diff --git a/src/JT809.Protocol/JT809Configs/JT809HeaderOptions.cs b/src/JT809.Protocol/Configs/JT809HeaderOptions.cs similarity index 96% rename from src/JT809.Protocol/JT809Configs/JT809HeaderOptions.cs rename to src/JT809.Protocol/Configs/JT809HeaderOptions.cs index ec8be43..2617e82 100644 --- a/src/JT809.Protocol/JT809Configs/JT809HeaderOptions.cs +++ b/src/JT809.Protocol/Configs/JT809HeaderOptions.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Configs +namespace JT809.Protocol.Configs { public class JT809HeaderOptions { diff --git a/src/JT809.Protocol/JT809Encrypt/JT809EncryptImpl.cs b/src/JT809.Protocol/Encrypt/JT809EncryptImpl.cs similarity index 93% rename from src/JT809.Protocol/JT809Encrypt/JT809EncryptImpl.cs rename to src/JT809.Protocol/Encrypt/JT809EncryptImpl.cs index 79e2e49..3c1e912 100644 --- a/src/JT809.Protocol/JT809Encrypt/JT809EncryptImpl.cs +++ b/src/JT809.Protocol/Encrypt/JT809EncryptImpl.cs @@ -1,6 +1,6 @@ -using JT809.Protocol.JT809Configs; +using JT809.Protocol.Configs; -namespace JT809.Protocol.JT809Encrypt +namespace JT809.Protocol.Encrypt { /// /// JT809 异或加密解密为同一算法 diff --git a/src/JT809.Protocol/JT809Enums/JT808_Alarm.cs b/src/JT809.Protocol/Enums/JT808_Alarm.cs similarity index 99% rename from src/JT809.Protocol/JT809Enums/JT808_Alarm.cs rename to src/JT809.Protocol/Enums/JT808_Alarm.cs index d29e845..baefbd9 100644 --- a/src/JT809.Protocol/JT809Enums/JT808_Alarm.cs +++ b/src/JT809.Protocol/Enums/JT808_Alarm.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Enums +namespace JT809.Protocol.Enums { /// /// 报警标志 diff --git a/src/JT809.Protocol/JT809Enums/JT808_Status.cs b/src/JT809.Protocol/Enums/JT808_Status.cs similarity index 95% rename from src/JT809.Protocol/JT809Enums/JT808_Status.cs rename to src/JT809.Protocol/Enums/JT808_Status.cs index 85fab1e..a8beb2d 100644 --- a/src/JT809.Protocol/JT809Enums/JT808_Status.cs +++ b/src/JT809.Protocol/Enums/JT808_Status.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Enums +namespace JT809.Protocol.Enums { [Flags] public enum JT808_Status : uint diff --git a/src/JT809.Protocol/JT809Enums/JT809BusinessType.cs b/src/JT809.Protocol/Enums/JT809BusinessType.cs similarity index 98% rename from src/JT809.Protocol/JT809Enums/JT809BusinessType.cs rename to src/JT809.Protocol/Enums/JT809BusinessType.cs index e748ba3..b747987 100644 --- a/src/JT809.Protocol/JT809Enums/JT809BusinessType.cs +++ b/src/JT809.Protocol/Enums/JT809BusinessType.cs @@ -1,8 +1,8 @@ -using JT809.Protocol.JT809Attributes; -using JT809.Protocol.JT809MessageBody; +using JT809.Protocol.Attributes; +using JT809.Protocol.MessageBody; using System.ComponentModel; -namespace JT809.Protocol.JT809Enums +namespace JT809.Protocol.Enums { /// /// 业务数据类型标识 diff --git a/src/JT809.Protocol/JT809Enums/JT809CommandType.cs b/src/JT809.Protocol/Enums/JT809CommandType.cs similarity index 96% rename from src/JT809.Protocol/JT809Enums/JT809CommandType.cs rename to src/JT809.Protocol/Enums/JT809CommandType.cs index b21ccbf..ce56196 100644 --- a/src/JT809.Protocol/JT809Enums/JT809CommandType.cs +++ b/src/JT809.Protocol/Enums/JT809CommandType.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Enums +namespace JT809.Protocol.Enums { /// /// 命令字ID diff --git a/src/JT809.Protocol/JT809Enums/JT809ErrorCode.cs b/src/JT809.Protocol/Enums/JT809ErrorCode.cs similarity index 92% rename from src/JT809.Protocol/JT809Enums/JT809ErrorCode.cs rename to src/JT809.Protocol/Enums/JT809ErrorCode.cs index d44331e..a369807 100644 --- a/src/JT809.Protocol/JT809Enums/JT809ErrorCode.cs +++ b/src/JT809.Protocol/Enums/JT809ErrorCode.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Enums +namespace JT809.Protocol.Enums { public enum JT809ErrorCode { diff --git a/src/JT809.Protocol/JT809Enums/JT809SubBusinessType.cs b/src/JT809.Protocol/Enums/JT809SubBusinessType.cs similarity index 99% rename from src/JT809.Protocol/JT809Enums/JT809SubBusinessType.cs rename to src/JT809.Protocol/Enums/JT809SubBusinessType.cs index f414d30..e726147 100644 --- a/src/JT809.Protocol/JT809Enums/JT809SubBusinessType.cs +++ b/src/JT809.Protocol/Enums/JT809SubBusinessType.cs @@ -1,8 +1,8 @@ -using JT809.Protocol.JT809Attributes; -using JT809.Protocol.JT809SubMessageBody; +using JT809.Protocol.Attributes; +using JT809.Protocol.SubMessageBody; using System.ComponentModel; -namespace JT809.Protocol.JT809Enums +namespace JT809.Protocol.Enums { /// ///子业务类型标识 diff --git a/src/JT809.Protocol/JT809Enums/JT809VehicleColorType.cs b/src/JT809.Protocol/Enums/JT809VehicleColorType.cs similarity index 90% rename from src/JT809.Protocol/JT809Enums/JT809VehicleColorType.cs rename to src/JT809.Protocol/Enums/JT809VehicleColorType.cs index c66747d..0e9af58 100644 --- a/src/JT809.Protocol/JT809Enums/JT809VehicleColorType.cs +++ b/src/JT809.Protocol/Enums/JT809VehicleColorType.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Enums +namespace JT809.Protocol.Enums { /// /// 车辆颜色，按照 JT/T415-2006 中5.4.12 的规定 diff --git a/src/JT809.Protocol/JT809Enums/JT809WarnSrc.cs b/src/JT809.Protocol/Enums/JT809WarnSrc.cs similarity index 89% rename from src/JT809.Protocol/JT809Enums/JT809WarnSrc.cs rename to src/JT809.Protocol/Enums/JT809WarnSrc.cs index 66b8367..f798118 100644 --- a/src/JT809.Protocol/JT809Enums/JT809WarnSrc.cs +++ b/src/JT809.Protocol/Enums/JT809WarnSrc.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Enums +namespace JT809.Protocol.Enums { /// /// 报警信息来源 diff --git a/src/JT809.Protocol/JT809Enums/JT809WarnType.cs b/src/JT809.Protocol/Enums/JT809WarnType.cs similarity index 95% rename from src/JT809.Protocol/JT809Enums/JT809WarnType.cs rename to src/JT809.Protocol/Enums/JT809WarnType.cs index 2da0e1c..7316532 100644 --- a/src/JT809.Protocol/JT809Enums/JT809WarnType.cs +++ b/src/JT809.Protocol/Enums/JT809WarnType.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Enums +namespace JT809.Protocol.Enums { /// /// 报警类型 diff --git a/src/JT809.Protocol/JT809Enums/JT809_0x1002_Result.cs b/src/JT809.Protocol/Enums/JT809_0x1002_Result.cs similarity index 91% rename from src/JT809.Protocol/JT809Enums/JT809_0x1002_Result.cs rename to src/JT809.Protocol/Enums/JT809_0x1002_Result.cs index d6b8b6e..13f42a2 100644 --- a/src/JT809.Protocol/JT809Enums/JT809_0x1002_Result.cs +++ b/src/JT809.Protocol/Enums/JT809_0x1002_Result.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Enums +namespace JT809.Protocol.Enums { /// /// 验证结果 diff --git a/src/JT809.Protocol/JT809Enums/JT809_0x1007_ErrorCode.cs b/src/JT809.Protocol/Enums/JT809_0x1007_ErrorCode.cs similarity index 87% rename from src/JT809.Protocol/JT809Enums/JT809_0x1007_ErrorCode.cs rename to src/JT809.Protocol/Enums/JT809_0x1007_ErrorCode.cs index 9d362c0..336f7e1 100644 --- a/src/JT809.Protocol/JT809Enums/JT809_0x1007_ErrorCode.cs +++ b/src/JT809.Protocol/Enums/JT809_0x1007_ErrorCode.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Enums +namespace JT809.Protocol.Enums { /// /// 错误代码 diff --git a/src/JT809.Protocol/JT809Enums/JT809_0x1008_ReasonCode.cs b/src/JT809.Protocol/Enums/JT809_0x1008_ReasonCode.cs similarity index 87% rename from src/JT809.Protocol/JT809Enums/JT809_0x1008_ReasonCode.cs rename to src/JT809.Protocol/Enums/JT809_0x1008_ReasonCode.cs index 523a8fd..9d5c924 100644 --- a/src/JT809.Protocol/JT809Enums/JT809_0x1008_ReasonCode.cs +++ b/src/JT809.Protocol/Enums/JT809_0x1008_ReasonCode.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Enums +namespace JT809.Protocol.Enums { /// /// 错误代码 diff --git a/src/JT809.Protocol/JT809Enums/JT809_0x1301_ObjectType.cs b/src/JT809.Protocol/Enums/JT809_0x1301_ObjectType.cs similarity index 90% rename from src/JT809.Protocol/JT809Enums/JT809_0x1301_ObjectType.cs rename to src/JT809.Protocol/Enums/JT809_0x1301_ObjectType.cs index 24c0e04..fb4e568 100644 --- a/src/JT809.Protocol/JT809Enums/JT809_0x1301_ObjectType.cs +++ b/src/JT809.Protocol/Enums/JT809_0x1301_ObjectType.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Enums +namespace JT809.Protocol.Enums { /// /// 查岗对象的类型 diff --git a/src/JT809.Protocol/JT809Enums/JT809_0x1401_Result.cs b/src/JT809.Protocol/Enums/JT809_0x1401_Result.cs similarity index 89% rename from src/JT809.Protocol/JT809Enums/JT809_0x1401_Result.cs rename to src/JT809.Protocol/Enums/JT809_0x1401_Result.cs index 6367243..fd2b19c 100644 --- a/src/JT809.Protocol/JT809Enums/JT809_0x1401_Result.cs +++ b/src/JT809.Protocol/Enums/JT809_0x1401_Result.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Enums +namespace JT809.Protocol.Enums { /// /// 报警处理结果 diff --git a/src/JT809.Protocol/JT809Enums/JT809_0x1403_Result.cs b/src/JT809.Protocol/Enums/JT809_0x1403_Result.cs similarity index 89% rename from src/JT809.Protocol/JT809Enums/JT809_0x1403_Result.cs rename to src/JT809.Protocol/Enums/JT809_0x1403_Result.cs index 2d11de4..e7eaef4 100644 --- a/src/JT809.Protocol/JT809Enums/JT809_0x1403_Result.cs +++ b/src/JT809.Protocol/Enums/JT809_0x1403_Result.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Enums +namespace JT809.Protocol.Enums { /// /// 报警处理结果 diff --git a/src/JT809.Protocol/JT809Enums/JT809_0x1501_Result.cs b/src/JT809.Protocol/Enums/JT809_0x1501_Result.cs similarity index 87% rename from src/JT809.Protocol/JT809Enums/JT809_0x1501_Result.cs rename to src/JT809.Protocol/Enums/JT809_0x1501_Result.cs index b1c640f..5774691 100644 --- a/src/JT809.Protocol/JT809Enums/JT809_0x1501_Result.cs +++ b/src/JT809.Protocol/Enums/JT809_0x1501_Result.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Enums +namespace JT809.Protocol.Enums { /// /// 应答结果 diff --git a/src/JT809.Protocol/JT809Enums/JT809_0x1502_PhotoRspFlag.cs b/src/JT809.Protocol/Enums/JT809_0x1502_PhotoRspFlag.cs similarity index 92% rename from src/JT809.Protocol/JT809Enums/JT809_0x1502_PhotoRspFlag.cs rename to src/JT809.Protocol/Enums/JT809_0x1502_PhotoRspFlag.cs index f53c3d6..691f349 100644 --- a/src/JT809.Protocol/JT809Enums/JT809_0x1502_PhotoRspFlag.cs +++ b/src/JT809.Protocol/Enums/JT809_0x1502_PhotoRspFlag.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Enums +namespace JT809.Protocol.Enums { /// /// 拍照应答标识 diff --git a/src/JT809.Protocol/JT809Enums/JT809_0x1503_Result.cs b/src/JT809.Protocol/Enums/JT809_0x1503_Result.cs similarity index 87% rename from src/JT809.Protocol/JT809Enums/JT809_0x1503_Result.cs rename to src/JT809.Protocol/Enums/JT809_0x1503_Result.cs index 70d5efb..40fcb62 100644 --- a/src/JT809.Protocol/JT809Enums/JT809_0x1503_Result.cs +++ b/src/JT809.Protocol/Enums/JT809_0x1503_Result.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Enums +namespace JT809.Protocol.Enums { /// /// 应答结果 diff --git a/src/JT809.Protocol/JT809Enums/JT809_0x1505_Result.cs b/src/JT809.Protocol/Enums/JT809_0x1505_Result.cs similarity index 89% rename from src/JT809.Protocol/JT809Enums/JT809_0x1505_Result.cs rename to src/JT809.Protocol/Enums/JT809_0x1505_Result.cs index ec5f390..6ebf41d 100644 --- a/src/JT809.Protocol/JT809Enums/JT809_0x1505_Result.cs +++ b/src/JT809.Protocol/Enums/JT809_0x1505_Result.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Enums +namespace JT809.Protocol.Enums { /// /// 应答结果 diff --git a/src/JT809.Protocol/JT809Enums/JT809_0x9002_Result.cs b/src/JT809.Protocol/Enums/JT809_0x9002_Result.cs similarity index 89% rename from src/JT809.Protocol/JT809Enums/JT809_0x9002_Result.cs rename to src/JT809.Protocol/Enums/JT809_0x9002_Result.cs index cd985ab..4dfc1ae 100644 --- a/src/JT809.Protocol/JT809Enums/JT809_0x9002_Result.cs +++ b/src/JT809.Protocol/Enums/JT809_0x9002_Result.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Enums +namespace JT809.Protocol.Enums { /// /// 验证结果 diff --git a/src/JT809.Protocol/JT809Enums/JT809_0x9007_ReasonCode.cs b/src/JT809.Protocol/Enums/JT809_0x9007_ReasonCode.cs similarity index 90% rename from src/JT809.Protocol/JT809Enums/JT809_0x9007_ReasonCode.cs rename to src/JT809.Protocol/Enums/JT809_0x9007_ReasonCode.cs index a9c973c..359378e 100644 --- a/src/JT809.Protocol/JT809Enums/JT809_0x9007_ReasonCode.cs +++ b/src/JT809.Protocol/Enums/JT809_0x9007_ReasonCode.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Enums +namespace JT809.Protocol.Enums { /// /// 错误代码 diff --git a/src/JT809.Protocol/JT809Enums/JT809_0x9008_ReasonCode.cs b/src/JT809.Protocol/Enums/JT809_0x9008_ReasonCode.cs similarity index 87% rename from src/JT809.Protocol/JT809Enums/JT809_0x9008_ReasonCode.cs rename to src/JT809.Protocol/Enums/JT809_0x9008_ReasonCode.cs index 2782428..b7bbdf1 100644 --- a/src/JT809.Protocol/JT809Enums/JT809_0x9008_ReasonCode.cs +++ b/src/JT809.Protocol/Enums/JT809_0x9008_ReasonCode.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Enums +namespace JT809.Protocol.Enums { /// /// 错误代码 diff --git a/src/JT809.Protocol/JT809Enums/JT809_0x9205_ReasonCode.cs b/src/JT809.Protocol/Enums/JT809_0x9205_ReasonCode.cs similarity index 90% rename from src/JT809.Protocol/JT809Enums/JT809_0x9205_ReasonCode.cs rename to src/JT809.Protocol/Enums/JT809_0x9205_ReasonCode.cs index be9138d..e8428ea 100644 --- a/src/JT809.Protocol/JT809Enums/JT809_0x9205_ReasonCode.cs +++ b/src/JT809.Protocol/Enums/JT809_0x9205_ReasonCode.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Enums +namespace JT809.Protocol.Enums { /// /// 错误代码 diff --git a/src/JT809.Protocol/JT809Enums/JT809_0x9206_ReasonCode.cs b/src/JT809.Protocol/Enums/JT809_0x9206_ReasonCode.cs similarity index 90% rename from src/JT809.Protocol/JT809Enums/JT809_0x9206_ReasonCode.cs rename to src/JT809.Protocol/Enums/JT809_0x9206_ReasonCode.cs index beb7ac5..e428c0b 100644 --- a/src/JT809.Protocol/JT809Enums/JT809_0x9206_ReasonCode.cs +++ b/src/JT809.Protocol/Enums/JT809_0x9206_ReasonCode.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Enums +namespace JT809.Protocol.Enums { /// /// 错误代码 diff --git a/src/JT809.Protocol/JT809Enums/JT809_0x9207_Result.cs b/src/JT809.Protocol/Enums/JT809_0x9207_Result.cs similarity index 90% rename from src/JT809.Protocol/JT809Enums/JT809_0x9207_Result.cs rename to src/JT809.Protocol/Enums/JT809_0x9207_Result.cs index 349c6ea..6b5147b 100644 --- a/src/JT809.Protocol/JT809Enums/JT809_0x9207_Result.cs +++ b/src/JT809.Protocol/Enums/JT809_0x9207_Result.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Enums +namespace JT809.Protocol.Enums { /// /// 验证结果 diff --git a/src/JT809.Protocol/JT809Enums/JT809_0x9208_Result.cs b/src/JT809.Protocol/Enums/JT809_0x9208_Result.cs similarity index 89% rename from src/JT809.Protocol/JT809Enums/JT809_0x9208_Result.cs rename to src/JT809.Protocol/Enums/JT809_0x9208_Result.cs index 843ff04..647e824 100644 --- a/src/JT809.Protocol/JT809Enums/JT809_0x9208_Result.cs +++ b/src/JT809.Protocol/Enums/JT809_0x9208_Result.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Enums +namespace JT809.Protocol.Enums { /// /// 验证结果 diff --git a/src/JT809.Protocol/JT809Enums/JT809_0x9209_Result.cs b/src/JT809.Protocol/Enums/JT809_0x9209_Result.cs similarity index 92% rename from src/JT809.Protocol/JT809Enums/JT809_0x9209_Result.cs rename to src/JT809.Protocol/Enums/JT809_0x9209_Result.cs index 4dcca46..b549bdb 100644 --- a/src/JT809.Protocol/JT809Enums/JT809_0x9209_Result.cs +++ b/src/JT809.Protocol/Enums/JT809_0x9209_Result.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Enums +namespace JT809.Protocol.Enums { /// /// 验证结果 diff --git a/src/JT809.Protocol/JT809Enums/JT809_0x9301_ObjectType.cs b/src/JT809.Protocol/Enums/JT809_0x9301_ObjectType.cs similarity index 90% rename from src/JT809.Protocol/JT809Enums/JT809_0x9301_ObjectType.cs rename to src/JT809.Protocol/Enums/JT809_0x9301_ObjectType.cs index 4fe11e3..021ab20 100644 --- a/src/JT809.Protocol/JT809Enums/JT809_0x9301_ObjectType.cs +++ b/src/JT809.Protocol/Enums/JT809_0x9301_ObjectType.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Enums +namespace JT809.Protocol.Enums { /// /// 查岗对象的类型 diff --git a/src/JT809.Protocol/JT809Enums/JT809_0x9302_ObjectType.cs b/src/JT809.Protocol/Enums/JT809_0x9302_ObjectType.cs similarity index 95% rename from src/JT809.Protocol/JT809Enums/JT809_0x9302_ObjectType.cs rename to src/JT809.Protocol/Enums/JT809_0x9302_ObjectType.cs index 4668e58..b3ab510 100644 --- a/src/JT809.Protocol/JT809Enums/JT809_0x9302_ObjectType.cs +++ b/src/JT809.Protocol/Enums/JT809_0x9302_ObjectType.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Enums +namespace JT809.Protocol.Enums { /// /// 查岗对象的类型 diff --git a/src/JT809.Protocol/JT809Enums/JT809_VehiclePositionEncrypt.cs b/src/JT809.Protocol/Enums/JT809_VehiclePositionEncrypt.cs similarity index 89% rename from src/JT809.Protocol/JT809Enums/JT809_VehiclePositionEncrypt.cs rename to src/JT809.Protocol/Enums/JT809_VehiclePositionEncrypt.cs index 0764afa..cf9ef14 100644 --- a/src/JT809.Protocol/JT809Enums/JT809_VehiclePositionEncrypt.cs +++ b/src/JT809.Protocol/Enums/JT809_VehiclePositionEncrypt.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Enums +namespace JT809.Protocol.Enums { /// /// 定位信息是否使用国家测绘局批准的地图保密插件进行加密。 diff --git a/src/JT809.Protocol/JT809Exceptions/JT809Exception.cs b/src/JT809.Protocol/Exceptions/JT809Exception.cs similarity index 90% rename from src/JT809.Protocol/JT809Exceptions/JT809Exception.cs rename to src/JT809.Protocol/Exceptions/JT809Exception.cs index 4001415..18575c1 100644 --- a/src/JT809.Protocol/JT809Exceptions/JT809Exception.cs +++ b/src/JT809.Protocol/Exceptions/JT809Exception.cs @@ -1,9 +1,9 @@ -using JT809.Protocol.JT809Enums; +using JT809.Protocol.Enums; using System; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Exceptions +namespace JT809.Protocol.Exceptions { public class JT809Exception:Exception { diff --git a/src/JT809.Protocol/JT809Extensions/JT809BCDExtensions.cs b/src/JT809.Protocol/Extensions/JT809BCDExtensions.cs similarity index 97% rename from src/JT809.Protocol/JT809Extensions/JT809BCDExtensions.cs rename to src/JT809.Protocol/Extensions/JT809BCDExtensions.cs index d52879f..fb1c803 100644 --- a/src/JT809.Protocol/JT809Extensions/JT809BCDExtensions.cs +++ b/src/JT809.Protocol/Extensions/JT809BCDExtensions.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.Globalization; using System.Text; -namespace JT809.Protocol.JT809Extensions +namespace JT809.Protocol.Extensions { public static partial class JT809BinaryExtensions { diff --git a/src/JT809.Protocol/JT809Extensions/JT809BinaryExtensions.cs b/src/JT809.Protocol/Extensions/JT809BinaryExtensions.cs similarity index 99% rename from src/JT809.Protocol/JT809Extensions/JT809BinaryExtensions.cs rename to src/JT809.Protocol/Extensions/JT809BinaryExtensions.cs index d031824..a02b0ed 100644 --- a/src/JT809.Protocol/JT809Extensions/JT809BinaryExtensions.cs +++ b/src/JT809.Protocol/Extensions/JT809BinaryExtensions.cs @@ -5,7 +5,7 @@ using System.Text; using System.Buffers.Binary; using System.Buffers; -namespace JT809.Protocol.JT809Extensions +namespace JT809.Protocol.Extensions { public static partial class JT809BinaryExtensions { diff --git a/src/JT809.Protocol/JT809Extensions/JT809CRCExtensions.cs b/src/JT809.Protocol/Extensions/JT809CRCExtensions.cs similarity index 97% rename from src/JT809.Protocol/JT809Extensions/JT809CRCExtensions.cs rename to src/JT809.Protocol/Extensions/JT809CRCExtensions.cs index 7215789..fe72f46 100644 --- a/src/JT809.Protocol/JT809Extensions/JT809CRCExtensions.cs +++ b/src/JT809.Protocol/Extensions/JT809CRCExtensions.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Extensions +namespace JT809.Protocol.Extensions { public static partial class JT809BinaryExtensions { diff --git a/src/JT809.Protocol/JT809Extensions/JT809DateTimeExtensions.cs b/src/JT809.Protocol/Extensions/JT809DateTimeExtensions.cs similarity index 99% rename from src/JT809.Protocol/JT809Extensions/JT809DateTimeExtensions.cs rename to src/JT809.Protocol/Extensions/JT809DateTimeExtensions.cs index 6679a3c..4247843 100644 --- a/src/JT809.Protocol/JT809Extensions/JT809DateTimeExtensions.cs +++ b/src/JT809.Protocol/Extensions/JT809DateTimeExtensions.cs @@ -3,7 +3,7 @@ using System.Buffers; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Extensions +namespace JT809.Protocol.Extensions { public static partial class JT809BinaryExtensions { diff --git a/src/JT809.Protocol/JT809Extensions/JT809EnumExtensions.cs b/src/JT809.Protocol/Extensions/JT809EnumExtensions.cs similarity index 99% rename from src/JT809.Protocol/JT809Extensions/JT809EnumExtensions.cs rename to src/JT809.Protocol/Extensions/JT809EnumExtensions.cs index 61d4d6e..6e3f45c 100644 --- a/src/JT809.Protocol/JT809Extensions/JT809EnumExtensions.cs +++ b/src/JT809.Protocol/Extensions/JT809EnumExtensions.cs @@ -4,7 +4,7 @@ using System.ComponentModel; using System.Linq; using System.Reflection; -namespace JT809.Protocol.JT809Extensions +namespace JT809.Protocol.Extensions { /// /// 枚举扩展 diff --git a/src/JT809.Protocol/JT809Extensions/JT809FormatterExtensions.cs b/src/JT809.Protocol/Extensions/JT809FormatterExtensions.cs similarity index 89% rename from src/JT809.Protocol/JT809Extensions/JT809FormatterExtensions.cs rename to src/JT809.Protocol/Extensions/JT809FormatterExtensions.cs index baf2e40..4af8775 100644 --- a/src/JT809.Protocol/JT809Extensions/JT809FormatterExtensions.cs +++ b/src/JT809.Protocol/Extensions/JT809FormatterExtensions.cs @@ -1,11 +1,11 @@ -using JT809.Protocol.JT809Attributes; -using JT809.Protocol.JT809Enums; -using JT809.Protocol.JT809Exceptions; -using JT809.Protocol.JT809Formatters; +using JT809.Protocol.Attributes; +using JT809.Protocol.Enums; +using JT809.Protocol.Exceptions; +using JT809.Protocol.Formatters; using System; using System.Reflection; -namespace JT809.Protocol.JT809Extensions +namespace JT809.Protocol.Extensions { public static class JT809FormatterExtensions { diff --git a/src/JT809.Protocol/JT809Extensions/JT809FormatterResolverExtensions.cs b/src/JT809.Protocol/Extensions/JT809FormatterResolverExtensions.cs similarity index 98% rename from src/JT809.Protocol/JT809Extensions/JT809FormatterResolverExtensions.cs rename to src/JT809.Protocol/Extensions/JT809FormatterResolverExtensions.cs index 0046240..4d1f404 100644 --- a/src/JT809.Protocol/JT809Extensions/JT809FormatterResolverExtensions.cs +++ b/src/JT809.Protocol/Extensions/JT809FormatterResolverExtensions.cs @@ -1,4 +1,4 @@ -using JT809.Protocol.JT809Formatters; +using JT809.Protocol.Formatters; using System; using System.Buffers; using System.Collections.Concurrent; @@ -7,7 +7,7 @@ using System.Linq.Expressions; using System.Reflection; using System.Text; -namespace JT809.Protocol.JT809Extensions +namespace JT809.Protocol.Extensions { /// /// diff --git a/src/JT809.Protocol/JT809Extensions/JT809HexExtensions.cs b/src/JT809.Protocol/Extensions/JT809HexExtensions.cs similarity index 99% rename from src/JT809.Protocol/JT809Extensions/JT809HexExtensions.cs rename to src/JT809.Protocol/Extensions/JT809HexExtensions.cs index f39ae64..0bfb6e9 100644 --- a/src/JT809.Protocol/JT809Extensions/JT809HexExtensions.cs +++ b/src/JT809.Protocol/Extensions/JT809HexExtensions.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; -namespace JT809.Protocol.JT809Extensions +namespace JT809.Protocol.Extensions { /// /// diff --git a/src/JT809.Protocol/JT809Extensions/JT809PackageExtensions.cs b/src/JT809.Protocol/Extensions/JT809PackageExtensions.cs similarity index 95% rename from src/JT809.Protocol/JT809Extensions/JT809PackageExtensions.cs rename to src/JT809.Protocol/Extensions/JT809PackageExtensions.cs index ec5fb56..910c383 100644 --- a/src/JT809.Protocol/JT809Extensions/JT809PackageExtensions.cs +++ b/src/JT809.Protocol/Extensions/JT809PackageExtensions.cs @@ -1,9 +1,9 @@ -using JT809.Protocol.JT809Enums; +using JT809.Protocol.Enums; using System; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Extensions +namespace JT809.Protocol.Extensions { public static class JT809PackageExtensions { diff --git a/src/JT809.Protocol/JT809Extensions/JT809StringExtensions.cs b/src/JT809.Protocol/Extensions/JT809StringExtensions.cs similarity index 98% rename from src/JT809.Protocol/JT809Extensions/JT809StringExtensions.cs rename to src/JT809.Protocol/Extensions/JT809StringExtensions.cs index 31877c2..1eeb1ae 100644 --- a/src/JT809.Protocol/JT809Extensions/JT809StringExtensions.cs +++ b/src/JT809.Protocol/Extensions/JT809StringExtensions.cs @@ -5,7 +5,7 @@ using System.Text; using System.Buffers.Binary; using System.Buffers; -namespace JT809.Protocol.JT809Extensions +namespace JT809.Protocol.Extensions { public static partial class JT809BinaryExtensions { diff --git a/src/JT809.Protocol/JT809Formatters/IJT809FormatterOfT.cs b/src/JT809.Protocol/Formatters/IJT809FormatterOfT.cs similarity index 84% rename from src/JT809.Protocol/JT809Formatters/IJT809FormatterOfT.cs rename to src/JT809.Protocol/Formatters/IJT809FormatterOfT.cs index 3d0caba..2d83c10 100644 --- a/src/JT809.Protocol/JT809Formatters/IJT809FormatterOfT.cs +++ b/src/JT809.Protocol/Formatters/IJT809FormatterOfT.cs @@ -1,7 +1,7 @@ using System; using System.Buffers; -namespace JT809.Protocol.JT809Formatters +namespace JT809.Protocol.Formatters { public interface IJT809Formatter { diff --git a/src/JT809.Protocol/JT809Formatters/JT809BodiesFormatter.cs b/src/JT809.Protocol/Formatters/JT809BodiesFormatter.cs similarity index 90% rename from src/JT809.Protocol/JT809Formatters/JT809BodiesFormatter.cs rename to src/JT809.Protocol/Formatters/JT809BodiesFormatter.cs index 7ad1ec3..0562892 100644 --- a/src/JT809.Protocol/JT809Formatters/JT809BodiesFormatter.cs +++ b/src/JT809.Protocol/Formatters/JT809BodiesFormatter.cs @@ -1,13 +1,13 @@ -using JT809.Protocol.JT809Attributes; -using JT809.Protocol.JT809Enums; -using JT809.Protocol.JT809Exceptions; -using JT809.Protocol.JT809Extensions; +using JT809.Protocol.Attributes; +using JT809.Protocol.Enums; +using JT809.Protocol.Exceptions; +using JT809.Protocol.Extensions; using System; using System.Buffers; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Formatters +namespace JT809.Protocol.Formatters { public class JT809BodiesFormatter : IJT809Formatter where TJT809Bodies: JT809ExchangeMessageBodies, new () @@ -20,7 +20,7 @@ namespace JT809.Protocol.JT809Formatters jT809Bodies.VehicleColor = (JT809VehicleColorType)JT809BinaryExtensions.ReadByteLittle(bytes, ref offset); jT809Bodies.SubBusinessType = (JT809SubBusinessType)JT809BinaryExtensions.ReadUInt16Little(bytes, ref offset); jT809Bodies.DataLength = JT809BinaryExtensions.ReadUInt32Little(bytes, ref offset); - //JT809.Protocol.JT809Enums.JT809BusinessType 映射对应消息特性 + //JT809.Protocol.Enums.JT809BusinessType 映射对应消息特性 JT809BodiesTypeAttribute jT809SubBodiesTypeAttribute = jT809Bodies.SubBusinessType.GetAttribute(); if (jT809SubBodiesTypeAttribute == null) { @@ -43,7 +43,7 @@ namespace JT809.Protocol.JT809Formatters offset += JT809BinaryExtensions.WriteStringLittle(bytes, offset, value.VehicleNo, 21); offset += JT809BinaryExtensions.WriteByteLittle(bytes, offset, (byte)value.VehicleColor); offset += JT809BinaryExtensions.WriteUInt16Little(bytes, offset, (ushort)value.SubBusinessType); - //JT809.Protocol.JT809Enums.JT809BusinessType 映射对应消息特性 + //JT809.Protocol.Enums.JT809BusinessType 映射对应消息特性 JT809BodiesTypeAttribute jT809SubBodiesTypeAttribute = value.SubBusinessType.GetAttribute(); if (jT809SubBodiesTypeAttribute == null) { diff --git a/src/JT809.Protocol/JT809Formatters/JT809HeaderFormatter.cs b/src/JT809.Protocol/Formatters/JT809HeaderFormatter.cs similarity index 94% rename from src/JT809.Protocol/JT809Formatters/JT809HeaderFormatter.cs rename to src/JT809.Protocol/Formatters/JT809HeaderFormatter.cs index 1256ef3..2637974 100644 --- a/src/JT809.Protocol/JT809Formatters/JT809HeaderFormatter.cs +++ b/src/JT809.Protocol/Formatters/JT809HeaderFormatter.cs @@ -1,11 +1,11 @@ -using JT809.Protocol.JT809Enums; -using JT809.Protocol.JT809Extensions; +using JT809.Protocol.Enums; +using JT809.Protocol.Extensions; using System; using System.Buffers; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Formatters +namespace JT809.Protocol.Formatters { public class JT809HeaderFormatter : IJT809Formatter { diff --git a/src/JT809.Protocol/JT809Formatters/JT809PackageFormatter.cs b/src/JT809.Protocol/Formatters/JT809PackageFormatter.cs similarity index 97% rename from src/JT809.Protocol/JT809Formatters/JT809PackageFormatter.cs rename to src/JT809.Protocol/Formatters/JT809PackageFormatter.cs index 067e8dd..0015462 100644 --- a/src/JT809.Protocol/JT809Formatters/JT809PackageFormatter.cs +++ b/src/JT809.Protocol/Formatters/JT809PackageFormatter.cs @@ -1,13 +1,13 @@ -using JT809.Protocol.JT809Attributes; -using JT809.Protocol.JT809Enums; -using JT809.Protocol.JT809Exceptions; -using JT809.Protocol.JT809Extensions; +using JT809.Protocol.Attributes; +using JT809.Protocol.Enums; +using JT809.Protocol.Exceptions; +using JT809.Protocol.Extensions; using System; using System.Buffers; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Formatters +namespace JT809.Protocol.Formatters { public class JT809PackageFormatter : IJT809Formatter { @@ -49,7 +49,7 @@ namespace JT809.Protocol.JT809Formatters // 5.1 判断是否有数据体（总长度-固定长度）> 0 if ((jT809Package.Header.MsgLength - JT809Package.FixedByteLength) > 0) { - //JT809.Protocol.JT809Enums.JT809BusinessType 映射对应消息特性 + //JT809.Protocol.Enums.JT809BusinessType 映射对应消息特性 JT809BodiesTypeAttribute jT809BodiesTypeAttribute = jT809Package.Header.BusinessType.GetAttribute(); if (jT809BodiesTypeAttribute != null) { diff --git a/src/JT809.Protocol/JT809Formatters/JT809MessageBodyFormatters/JT809_0x1001Formatter.cs b/src/JT809.Protocol/Formatters/MessageBodyFormatters/JT809_0x1001Formatter.cs similarity index 90% rename from src/JT809.Protocol/JT809Formatters/JT809MessageBodyFormatters/JT809_0x1001Formatter.cs rename to src/JT809.Protocol/Formatters/MessageBodyFormatters/JT809_0x1001Formatter.cs index 618c6b9..cdf3908 100644 --- a/src/JT809.Protocol/JT809Formatters/JT809MessageBodyFormatters/JT809_0x1001Formatter.cs +++ b/src/JT809.Protocol/Formatters/MessageBodyFormatters/JT809_0x1001Formatter.cs @@ -1,11 +1,11 @@ -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809MessageBody; +using JT809.Protocol.Extensions; +using JT809.Protocol.MessageBody; using System; using System.Buffers; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Formatters.JT809MessageBodyFormatters +namespace JT809.Protocol.Formatters.MessageBodyFormatters { public class JT809_0x1001Formatter : IJT809Formatter { diff --git a/src/JT809.Protocol/JT809Formatters/JT809MessageBodyFormatters/JT809_0x1002Formatter.cs b/src/JT809.Protocol/Formatters/MessageBodyFormatters/JT809_0x1002Formatter.cs similarity index 84% rename from src/JT809.Protocol/JT809Formatters/JT809MessageBodyFormatters/JT809_0x1002Formatter.cs rename to src/JT809.Protocol/Formatters/MessageBodyFormatters/JT809_0x1002Formatter.cs index 7aa3353..86717c2 100644 --- a/src/JT809.Protocol/JT809Formatters/JT809MessageBodyFormatters/JT809_0x1002Formatter.cs +++ b/src/JT809.Protocol/Formatters/MessageBodyFormatters/JT809_0x1002Formatter.cs @@ -1,12 +1,12 @@ -using JT809.Protocol.JT809Enums; -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809MessageBody; +using JT809.Protocol.Enums; +using JT809.Protocol.Extensions; +using JT809.Protocol.MessageBody; using System; using System.Buffers; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Formatters.JT809MessageBodyFormatters +namespace JT809.Protocol.Formatters.MessageBodyFormatters { public class JT809_0x1002Formatter : IJT809Formatter { diff --git a/src/JT809.Protocol/JT809Formatters/JT809MessageBodyFormatters/JT809_0x1003Formatter.cs b/src/JT809.Protocol/Formatters/MessageBodyFormatters/JT809_0x1003Formatter.cs similarity index 83% rename from src/JT809.Protocol/JT809Formatters/JT809MessageBodyFormatters/JT809_0x1003Formatter.cs rename to src/JT809.Protocol/Formatters/MessageBodyFormatters/JT809_0x1003Formatter.cs index 00c12ff..7fb03ef 100644 --- a/src/JT809.Protocol/JT809Formatters/JT809MessageBodyFormatters/JT809_0x1003Formatter.cs +++ b/src/JT809.Protocol/Formatters/MessageBodyFormatters/JT809_0x1003Formatter.cs @@ -1,12 +1,12 @@ -using JT809.Protocol.JT809Enums; -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809MessageBody; +using JT809.Protocol.Enums; +using JT809.Protocol.Extensions; +using JT809.Protocol.MessageBody; using System; using System.Buffers; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Formatters.JT809MessageBodyFormatters +namespace JT809.Protocol.Formatters.MessageBodyFormatters { public class JT809_0x1003Formatter : IJT809Formatter { diff --git a/src/JT809.Protocol/JT809Formatters/JT809MessageBodyFormatters/JT809_0x1007Formatter.cs b/src/JT809.Protocol/Formatters/MessageBodyFormatters/JT809_0x1007Formatter.cs similarity index 81% rename from src/JT809.Protocol/JT809Formatters/JT809MessageBodyFormatters/JT809_0x1007Formatter.cs rename to src/JT809.Protocol/Formatters/MessageBodyFormatters/JT809_0x1007Formatter.cs index 50e00da..c819cb3 100644 --- a/src/JT809.Protocol/JT809Formatters/JT809MessageBodyFormatters/JT809_0x1007Formatter.cs +++ b/src/JT809.Protocol/Formatters/MessageBodyFormatters/JT809_0x1007Formatter.cs @@ -1,12 +1,12 @@ -using JT809.Protocol.JT809Enums; -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809MessageBody; +using JT809.Protocol.Enums; +using JT809.Protocol.Extensions; +using JT809.Protocol.MessageBody; using System; using System.Buffers; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Formatters.JT809MessageBodyFormatters +namespace JT809.Protocol.Formatters.MessageBodyFormatters { public class JT809_0x1007Formatter : IJT809Formatter { diff --git a/src/JT809.Protocol/JT809Formatters/JT809MessageBodyFormatters/JT809_0x1008Formatter.cs b/src/JT809.Protocol/Formatters/MessageBodyFormatters/JT809_0x1008Formatter.cs similarity index 70% rename from src/JT809.Protocol/JT809Formatters/JT809MessageBodyFormatters/JT809_0x1008Formatter.cs rename to src/JT809.Protocol/Formatters/MessageBodyFormatters/JT809_0x1008Formatter.cs index eee656c..d860547 100644 --- a/src/JT809.Protocol/JT809Formatters/JT809MessageBodyFormatters/JT809_0x1008Formatter.cs +++ b/src/JT809.Protocol/Formatters/MessageBodyFormatters/JT809_0x1008Formatter.cs @@ -1,11 +1,12 @@ -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809MessageBody; +using JT809.Protocol.Enums; +using JT809.Protocol.Extensions; +using JT809.Protocol.MessageBody; using System; using System.Buffers; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Formatters.JT809MessageBodyFormatters +namespace JT809.Protocol.Formatters.MessageBodyFormatters { public class JT809_0x1008Formatter : IJT809Formatter { @@ -13,7 +14,7 @@ namespace JT809.Protocol.JT809Formatters.JT809MessageBodyFormatters { int offset = 0; JT809_0x1008 jT809_0X1008 = new JT809_0x1008(); - jT809_0X1008.ReasonCode = (JT809Enums.JT809_0x1008_ReasonCode)JT809BinaryExtensions.ReadByteLittle(bytes, ref offset); + jT809_0X1008.ReasonCode = (JT809_0x1008_ReasonCode)JT809BinaryExtensions.ReadByteLittle(bytes, ref offset); readSize = offset; return jT809_0X1008; } diff --git a/src/JT809.Protocol/JT809Formatters/JT809MessageBodyFormatters/JT809_0x1300Formatter.cs b/src/JT809.Protocol/Formatters/MessageBodyFormatters/JT809_0x1300Formatter.cs similarity index 87% rename from src/JT809.Protocol/JT809Formatters/JT809MessageBodyFormatters/JT809_0x1300Formatter.cs rename to src/JT809.Protocol/Formatters/MessageBodyFormatters/JT809_0x1300Formatter.cs index e49925b..a5c16a9 100644 --- a/src/JT809.Protocol/JT809Formatters/JT809MessageBodyFormatters/JT809_0x1300Formatter.cs +++ b/src/JT809.Protocol/Formatters/MessageBodyFormatters/JT809_0x1300Formatter.cs @@ -1,14 +1,14 @@ -using JT809.Protocol.JT809Attributes; -using JT809.Protocol.JT809Enums; -using JT809.Protocol.JT809Exceptions; -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809MessageBody; +using JT809.Protocol.Attributes; +using JT809.Protocol.Enums; +using JT809.Protocol.Exceptions; +using JT809.Protocol.Extensions; +using JT809.Protocol.MessageBody; using System; using System.Buffers; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Formatters.JT809MessageBodyFormatters +namespace JT809.Protocol.Formatters.MessageBodyFormatters { public class JT809_0x1300Formatter : IJT809Formatter { @@ -18,7 +18,7 @@ namespace JT809.Protocol.JT809Formatters.JT809MessageBodyFormatters JT809_0x1300 jT809_0X1300 = new JT809_0x1300(); jT809_0X1300.SubBusinessType = (JT809SubBusinessType)JT809BinaryExtensions.ReadUInt16Little(bytes, ref offset); jT809_0X1300.DataLength = JT809BinaryExtensions.ReadUInt32Little(bytes, ref offset); - //JT809.Protocol.JT809Enums.JT809BusinessType 映射对应消息特性 + //JT809.Protocol.Enums.JT809BusinessType 映射对应消息特性 JT809BodiesTypeAttribute jT809SubBodiesTypeAttribute = jT809_0X1300.SubBusinessType.GetAttribute(); if (jT809SubBodiesTypeAttribute == null) { @@ -40,7 +40,7 @@ namespace JT809.Protocol.JT809Formatters.JT809MessageBodyFormatters { offset += JT809BinaryExtensions.WriteUInt16Little(bytes, offset, (ushort)value.SubBusinessType); //offset += JT809BinaryExtensions.WriteUInt32Little(memoryOwner, offset, value.DataLength); - //JT809.Protocol.JT809Enums.JT809BusinessType 映射对应消息特性 + //JT809.Protocol.Enums.JT809BusinessType 映射对应消息特性 JT809BodiesTypeAttribute jT809SubBodiesTypeAttribute = value.SubBusinessType.GetAttribute(); if (jT809SubBodiesTypeAttribute == null) { diff --git a/src/JT809.Protocol/JT809Formatters/JT809MessageBodyFormatters/JT809_0x9001Formatter.cs b/src/JT809.Protocol/Formatters/MessageBodyFormatters/JT809_0x9001Formatter.cs similarity index 83% rename from src/JT809.Protocol/JT809Formatters/JT809MessageBodyFormatters/JT809_0x9001Formatter.cs rename to src/JT809.Protocol/Formatters/MessageBodyFormatters/JT809_0x9001Formatter.cs index f648e76..693b56b 100644 --- a/src/JT809.Protocol/JT809Formatters/JT809MessageBodyFormatters/JT809_0x9001Formatter.cs +++ b/src/JT809.Protocol/Formatters/MessageBodyFormatters/JT809_0x9001Formatter.cs @@ -1,11 +1,11 @@ -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809MessageBody; +using JT809.Protocol.Extensions; +using JT809.Protocol.MessageBody; using System; using System.Buffers; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Formatters.JT809MessageBodyFormatters +namespace JT809.Protocol.Formatters.MessageBodyFormatters { public class JT809_0x9001Formatter : IJT809Formatter { diff --git a/src/JT809.Protocol/JT809Formatters/JT809MessageBodyFormatters/JT809_0x9002Formatter.cs b/src/JT809.Protocol/Formatters/MessageBodyFormatters/JT809_0x9002Formatter.cs similarity index 80% rename from src/JT809.Protocol/JT809Formatters/JT809MessageBodyFormatters/JT809_0x9002Formatter.cs rename to src/JT809.Protocol/Formatters/MessageBodyFormatters/JT809_0x9002Formatter.cs index 40c813c..c07cbee 100644 --- a/src/JT809.Protocol/JT809Formatters/JT809MessageBodyFormatters/JT809_0x9002Formatter.cs +++ b/src/JT809.Protocol/Formatters/MessageBodyFormatters/JT809_0x9002Formatter.cs @@ -1,12 +1,12 @@ -using JT809.Protocol.JT809Enums; -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809MessageBody; +using JT809.Protocol.Enums; +using JT809.Protocol.Extensions; +using JT809.Protocol.MessageBody; using System; using System.Buffers; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Formatters.JT809MessageBodyFormatters +namespace JT809.Protocol.Formatters.MessageBodyFormatters { public class JT809_0x9002Formatter : IJT809Formatter { diff --git a/src/JT809.Protocol/JT809Formatters/JT809MessageBodyFormatters/JT809_0x9003Formatter.cs b/src/JT809.Protocol/Formatters/MessageBodyFormatters/JT809_0x9003Formatter.cs similarity index 83% rename from src/JT809.Protocol/JT809Formatters/JT809MessageBodyFormatters/JT809_0x9003Formatter.cs rename to src/JT809.Protocol/Formatters/MessageBodyFormatters/JT809_0x9003Formatter.cs index a6a4fcc..d902ec9 100644 --- a/src/JT809.Protocol/JT809Formatters/JT809MessageBodyFormatters/JT809_0x9003Formatter.cs +++ b/src/JT809.Protocol/Formatters/MessageBodyFormatters/JT809_0x9003Formatter.cs @@ -1,11 +1,11 @@ -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809MessageBody; +using JT809.Protocol.Extensions; +using JT809.Protocol.MessageBody; using System; using System.Buffers; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Formatters.JT809MessageBodyFormatters +namespace JT809.Protocol.Formatters.MessageBodyFormatters { public class JT809_0x9003Formatter : IJT809Formatter { diff --git a/src/JT809.Protocol/JT809Formatters/JT809MessageBodyFormatters/JT809_0x9007Formatter.cs b/src/JT809.Protocol/Formatters/MessageBodyFormatters/JT809_0x9007Formatter.cs similarity index 70% rename from src/JT809.Protocol/JT809Formatters/JT809MessageBodyFormatters/JT809_0x9007Formatter.cs rename to src/JT809.Protocol/Formatters/MessageBodyFormatters/JT809_0x9007Formatter.cs index 0305a33..37f781e 100644 --- a/src/JT809.Protocol/JT809Formatters/JT809MessageBodyFormatters/JT809_0x9007Formatter.cs +++ b/src/JT809.Protocol/Formatters/MessageBodyFormatters/JT809_0x9007Formatter.cs @@ -1,11 +1,12 @@ -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809MessageBody; +using JT809.Protocol.Extensions; +using JT809.Protocol.Enums; +using JT809.Protocol.MessageBody; using System; using System.Buffers; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Formatters.JT809MessageBodyFormatters +namespace JT809.Protocol.Formatters.MessageBodyFormatters { public class JT809_0x9007Formatter : IJT809Formatter { @@ -13,7 +14,7 @@ namespace JT809.Protocol.JT809Formatters.JT809MessageBodyFormatters { int offset = 0; JT809_0x9007 jT809_0X9007 = new JT809_0x9007(); - jT809_0X9007.ReasonCode = (JT809Enums.JT809_0x9007_ReasonCode)JT809BinaryExtensions.ReadByteLittle(bytes, ref offset); + jT809_0X9007.ReasonCode = (JT809_0x9007_ReasonCode)JT809BinaryExtensions.ReadByteLittle(bytes, ref offset); readSize = offset; return jT809_0X9007; } diff --git a/src/JT809.Protocol/JT809Formatters/JT809MessageBodyFormatters/JT809_0x9008Formatter.cs b/src/JT809.Protocol/Formatters/MessageBodyFormatters/JT809_0x9008Formatter.cs similarity index 70% rename from src/JT809.Protocol/JT809Formatters/JT809MessageBodyFormatters/JT809_0x9008Formatter.cs rename to src/JT809.Protocol/Formatters/MessageBodyFormatters/JT809_0x9008Formatter.cs index b38a750..a70f331 100644 --- a/src/JT809.Protocol/JT809Formatters/JT809MessageBodyFormatters/JT809_0x9008Formatter.cs +++ b/src/JT809.Protocol/Formatters/MessageBodyFormatters/JT809_0x9008Formatter.cs @@ -1,11 +1,12 @@ -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809MessageBody; +using JT809.Protocol.Extensions; +using JT809.Protocol.Enums; +using JT809.Protocol.MessageBody; using System; using System.Buffers; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Formatters.JT809MessageBodyFormatters +namespace JT809.Protocol.Formatters.MessageBodyFormatters { public class JT809_0x9008Formatter : IJT809Formatter { @@ -13,7 +14,7 @@ namespace JT809.Protocol.JT809Formatters.JT809MessageBodyFormatters { int offset = 0; JT809_0x9008 jT809_0X9008 = new JT809_0x9008(); - jT809_0X9008.ReasonCode = (JT809Enums.JT809_0x9008_ReasonCode)JT809BinaryExtensions.ReadByteLittle(bytes, ref offset); + jT809_0X9008.ReasonCode = (JT809_0x9008_ReasonCode)JT809BinaryExtensions.ReadByteLittle(bytes, ref offset); readSize = offset; return jT809_0X9008; } diff --git a/src/JT809.Protocol/JT809Formatters/JT809MessageBodyFormatters/JT809_0x9101Formatter.cs b/src/JT809.Protocol/Formatters/MessageBodyFormatters/JT809_0x9101Formatter.cs similarity index 88% rename from src/JT809.Protocol/JT809Formatters/JT809MessageBodyFormatters/JT809_0x9101Formatter.cs rename to src/JT809.Protocol/Formatters/MessageBodyFormatters/JT809_0x9101Formatter.cs index b2aeb36..4c8b4c0 100644 --- a/src/JT809.Protocol/JT809Formatters/JT809MessageBodyFormatters/JT809_0x9101Formatter.cs +++ b/src/JT809.Protocol/Formatters/MessageBodyFormatters/JT809_0x9101Formatter.cs @@ -1,11 +1,11 @@ -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809MessageBody; +using JT809.Protocol.Extensions; +using JT809.Protocol.MessageBody; using System; using System.Buffers; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Formatters.JT809MessageBodyFormatters +namespace JT809.Protocol.Formatters.MessageBodyFormatters { public class JT809_0x9101Formatter : IJT809Formatter { diff --git a/src/JT809.Protocol/JT809Formatters/JT809MessageBodyFormatters/JT809_0x9300Formatter.cs b/src/JT809.Protocol/Formatters/MessageBodyFormatters/JT809_0x9300Formatter.cs similarity index 87% rename from src/JT809.Protocol/JT809Formatters/JT809MessageBodyFormatters/JT809_0x9300Formatter.cs rename to src/JT809.Protocol/Formatters/MessageBodyFormatters/JT809_0x9300Formatter.cs index f7eac93..33f4168 100644 --- a/src/JT809.Protocol/JT809Formatters/JT809MessageBodyFormatters/JT809_0x9300Formatter.cs +++ b/src/JT809.Protocol/Formatters/MessageBodyFormatters/JT809_0x9300Formatter.cs @@ -1,14 +1,14 @@ -using JT809.Protocol.JT809Attributes; -using JT809.Protocol.JT809Enums; -using JT809.Protocol.JT809Exceptions; -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809MessageBody; +using JT809.Protocol.Attributes; +using JT809.Protocol.Enums; +using JT809.Protocol.Exceptions; +using JT809.Protocol.Extensions; +using JT809.Protocol.MessageBody; using System; using System.Buffers; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Formatters.JT809MessageBodyFormatters +namespace JT809.Protocol.Formatters.MessageBodyFormatters { public class JT809_0x9300Formatter : IJT809Formatter { @@ -18,7 +18,7 @@ namespace JT809.Protocol.JT809Formatters.JT809MessageBodyFormatters JT809_0x9300 jT809_0X9300 = new JT809_0x9300(); jT809_0X9300.SubBusinessType = (JT809SubBusinessType)JT809BinaryExtensions.ReadUInt16Little(bytes, ref offset); jT809_0X9300.DataLength = JT809BinaryExtensions.ReadUInt32Little(bytes, ref offset); - //JT809.Protocol.JT809Enums.JT809BusinessType 映射对应消息特性 + //JT809.Protocol.Enums.JT809BusinessType 映射对应消息特性 JT809BodiesTypeAttribute jT809SubBodiesTypeAttribute = jT809_0X9300.SubBusinessType.GetAttribute(); if (jT809SubBodiesTypeAttribute == null) { @@ -40,7 +40,7 @@ namespace JT809.Protocol.JT809Formatters.JT809MessageBodyFormatters { offset += JT809BinaryExtensions.WriteUInt16Little(bytes, offset, (ushort)value.SubBusinessType); //offset += JT809BinaryExtensions.WriteUInt32Little(memoryOwner, offset, value.DataLength); - //JT809.Protocol.JT809Enums.JT809BusinessType 映射对应消息特性 + //JT809.Protocol.Enums.JT809BusinessType 映射对应消息特性 JT809BodiesTypeAttribute jT809SubBodiesTypeAttribute = value.SubBusinessType.GetAttribute(); if (jT809SubBodiesTypeAttribute == null) { diff --git a/src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x1200_0x1201Formatter.cs b/src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x1200_0x1201Formatter.cs similarity index 90% rename from src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x1200_0x1201Formatter.cs rename to src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x1200_0x1201Formatter.cs index 0a8526d..c2460ad 100644 --- a/src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x1200_0x1201Formatter.cs +++ b/src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x1200_0x1201Formatter.cs @@ -1,12 +1,12 @@ -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809SubMessageBody; -using JT809.Protocol.JT809Enums; +using JT809.Protocol.Extensions; +using JT809.Protocol.SubMessageBody; +using JT809.Protocol.Enums; using System; using System.Buffers; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters +namespace JT809.Protocol.Formatters.SubMessageBodyFormatters { public class JT809_0x1200_0x1201Formatter : IJT809Formatter { diff --git a/src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x1200_0x1202Formatter.cs b/src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x1200_0x1202Formatter.cs similarity index 95% rename from src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x1200_0x1202Formatter.cs rename to src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x1200_0x1202Formatter.cs index 741251c..71cd90d 100644 --- a/src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x1200_0x1202Formatter.cs +++ b/src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x1200_0x1202Formatter.cs @@ -1,12 +1,12 @@ -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809SubMessageBody; -using JT809.Protocol.JT809Enums; +using JT809.Protocol.Extensions; +using JT809.Protocol.SubMessageBody; +using JT809.Protocol.Enums; using System; using System.Buffers; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters +namespace JT809.Protocol.Formatters.SubMessageBodyFormatters { public class JT809_0x1200_0x1202Formatter : IJT809Formatter { diff --git a/src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x1200_0x1203Formatter.cs b/src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x1200_0x1203Formatter.cs similarity index 92% rename from src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x1200_0x1203Formatter.cs rename to src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x1200_0x1203Formatter.cs index 4366b2a..7907a88 100644 --- a/src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x1200_0x1203Formatter.cs +++ b/src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x1200_0x1203Formatter.cs @@ -1,13 +1,13 @@ -using JT809.Protocol.JT809Enums; -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809Properties; -using JT809.Protocol.JT809SubMessageBody; +using JT809.Protocol.Enums; +using JT809.Protocol.Extensions; +using JT809.Protocol.Metadata; +using JT809.Protocol.SubMessageBody; using System; using System.Buffers; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters +namespace JT809.Protocol.Formatters.SubMessageBodyFormatters { public class JT809_0x1200_0x1203Formatter : IJT809Formatter { diff --git a/src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x1200_0x1207Formatter.cs b/src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x1200_0x1207Formatter.cs similarity index 86% rename from src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x1200_0x1207Formatter.cs rename to src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x1200_0x1207Formatter.cs index f444471..bada136 100644 --- a/src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x1200_0x1207Formatter.cs +++ b/src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x1200_0x1207Formatter.cs @@ -1,11 +1,11 @@ -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809SubMessageBody; +using JT809.Protocol.Extensions; +using JT809.Protocol.SubMessageBody; using System; using System.Buffers; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters +namespace JT809.Protocol.Formatters.SubMessageBodyFormatters { public class JT809_0x1200_0x1207Formatter : IJT809Formatter { diff --git a/src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x1200_0x1209Formatter.cs b/src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x1200_0x1209Formatter.cs similarity index 86% rename from src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x1200_0x1209Formatter.cs rename to src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x1200_0x1209Formatter.cs index eb4aefa..315da44 100644 --- a/src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x1200_0x1209Formatter.cs +++ b/src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x1200_0x1209Formatter.cs @@ -1,11 +1,11 @@ -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809SubMessageBody; +using JT809.Protocol.Extensions; +using JT809.Protocol.SubMessageBody; using System; using System.Buffers; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters +namespace JT809.Protocol.Formatters.SubMessageBodyFormatters { public class JT809_0x1200_0x1209Formatter : IJT809Formatter { diff --git a/src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x1200_0x120AFormatter.cs b/src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x1200_0x120AFormatter.cs similarity index 90% rename from src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x1200_0x120AFormatter.cs rename to src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x1200_0x120AFormatter.cs index 7137ec0..9c05958 100644 --- a/src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x1200_0x120AFormatter.cs +++ b/src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x1200_0x120AFormatter.cs @@ -1,11 +1,11 @@ -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809SubMessageBody; +using JT809.Protocol.Extensions; +using JT809.Protocol.SubMessageBody; using System; using System.Buffers; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters +namespace JT809.Protocol.Formatters.SubMessageBodyFormatters { public class JT809_0x1200_0x120AFormatter : IJT809Formatter { diff --git a/src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x1200_0x120BFormatter.cs b/src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x1200_0x120BFormatter.cs similarity index 87% rename from src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x1200_0x120BFormatter.cs rename to src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x1200_0x120BFormatter.cs index 35eb9d7..1cb2d28 100644 --- a/src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x1200_0x120BFormatter.cs +++ b/src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x1200_0x120BFormatter.cs @@ -1,11 +1,11 @@ -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809SubMessageBody; +using JT809.Protocol.Extensions; +using JT809.Protocol.SubMessageBody; using System; using System.Buffers; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters +namespace JT809.Protocol.Formatters.SubMessageBodyFormatters { public class JT809_0x1200_0x120BFormatter : IJT809Formatter { diff --git a/src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x1200_0x120CFormatter.cs b/src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x1200_0x120CFormatter.cs similarity index 90% rename from src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x1200_0x120CFormatter.cs rename to src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x1200_0x120CFormatter.cs index 8a5aa0c..f527839 100644 --- a/src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x1200_0x120CFormatter.cs +++ b/src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x1200_0x120CFormatter.cs @@ -1,11 +1,11 @@ -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809SubMessageBody; +using JT809.Protocol.Extensions; +using JT809.Protocol.SubMessageBody; using System; using System.Buffers; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters +namespace JT809.Protocol.Formatters.SubMessageBodyFormatters { public class JT809_0x1200_0x120CFormatter : IJT809Formatter { diff --git a/src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x1200_0x120DFormatter.cs b/src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x1200_0x120DFormatter.cs similarity index 87% rename from src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x1200_0x120DFormatter.cs rename to src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x1200_0x120DFormatter.cs index b508cae..fa76acc 100644 --- a/src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x1200_0x120DFormatter.cs +++ b/src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x1200_0x120DFormatter.cs @@ -1,11 +1,11 @@ -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809SubMessageBody; +using JT809.Protocol.Extensions; +using JT809.Protocol.SubMessageBody; using System; using System.Buffers; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters +namespace JT809.Protocol.Formatters.SubMessageBodyFormatters { public class JT809_0x1200_0x120DFormatter : IJT809Formatter { diff --git a/src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x1300_0x1301Formatter.cs b/src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x1300_0x1301Formatter.cs similarity index 85% rename from src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x1300_0x1301Formatter.cs rename to src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x1300_0x1301Formatter.cs index a147a4e..bf80c69 100644 --- a/src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x1300_0x1301Formatter.cs +++ b/src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x1300_0x1301Formatter.cs @@ -1,11 +1,12 @@ -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809SubMessageBody; +using JT809.Protocol.Extensions; +using JT809.Protocol.Enums; +using JT809.Protocol.SubMessageBody; using System; using System.Buffers; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters +namespace JT809.Protocol.Formatters.SubMessageBodyFormatters { public class JT809_0x1300_0x1301Formatter : IJT809Formatter { @@ -13,7 +14,7 @@ namespace JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters { int offset = 0; JT809_0x1300_0x1301 jT809_0X1200_0X1301 = new JT809_0x1300_0x1301(); - jT809_0X1200_0X1301.ObjectType = (JT809Enums.JT809_0x1301_ObjectType)JT809BinaryExtensions.ReadByteLittle(bytes, ref offset); + jT809_0X1200_0X1301.ObjectType = (JT809_0x1301_ObjectType)JT809BinaryExtensions.ReadByteLittle(bytes, ref offset); jT809_0X1200_0X1301.ObjectID = JT809BinaryExtensions.ReadStringLittle(bytes, ref offset, 12); jT809_0X1200_0X1301.InfoID = JT809BinaryExtensions.ReadUInt32Little(bytes, ref offset); jT809_0X1200_0X1301.InfoLength = JT809BinaryExtensions.ReadUInt32Little(bytes, ref offset); diff --git a/src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x1300_0x1302Formatter.cs b/src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x1300_0x1302Formatter.cs similarity index 83% rename from src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x1300_0x1302Formatter.cs rename to src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x1300_0x1302Formatter.cs index 67309af..76aa319 100644 --- a/src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x1300_0x1302Formatter.cs +++ b/src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x1300_0x1302Formatter.cs @@ -1,11 +1,11 @@ -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809SubMessageBody; +using JT809.Protocol.Extensions; +using JT809.Protocol.SubMessageBody; using System; using System.Buffers; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters +namespace JT809.Protocol.Formatters.SubMessageBodyFormatters { public class JT809_0x1300_0x1302Formatter : IJT809Formatter { diff --git a/src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x1400_0x1401Formatter.cs b/src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x1400_0x1401Formatter.cs similarity index 76% rename from src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x1400_0x1401Formatter.cs rename to src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x1400_0x1401Formatter.cs index 96d57ce..3636db5 100644 --- a/src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x1400_0x1401Formatter.cs +++ b/src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x1400_0x1401Formatter.cs @@ -1,11 +1,12 @@ -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809SubMessageBody; +using JT809.Protocol.Extensions; +using JT809.Protocol.Enums; +using JT809.Protocol.SubMessageBody; using System; using System.Buffers; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters +namespace JT809.Protocol.Formatters.SubMessageBodyFormatters { public class JT809_0x1400_0x1401Formatter : IJT809Formatter { @@ -14,7 +15,7 @@ namespace JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters int offset = 0; JT809_0x1400_0x1401 jT809_0X1400_0X1401 = new JT809_0x1400_0x1401(); jT809_0X1400_0X1401.SupervisionID = JT809BinaryExtensions.ReadUInt32Little(bytes, ref offset); - jT809_0X1400_0X1401.Result = (JT809Enums.JT809_0x1401_Result)JT809BinaryExtensions.ReadByteLittle(bytes, ref offset); + jT809_0X1400_0X1401.Result = (JT809_0x1401_Result)JT809BinaryExtensions.ReadByteLittle(bytes, ref offset); readSize = offset; return jT809_0X1400_0X1401; } diff --git a/src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x1400_0x1402Formatter.cs b/src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x1400_0x1402Formatter.cs similarity index 81% rename from src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x1400_0x1402Formatter.cs rename to src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x1400_0x1402Formatter.cs index 0740c11..c95745e 100644 --- a/src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x1400_0x1402Formatter.cs +++ b/src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x1400_0x1402Formatter.cs @@ -1,11 +1,12 @@ -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809SubMessageBody; +using JT809.Protocol.Extensions; +using JT809.Protocol.Enums; +using JT809.Protocol.SubMessageBody; using System; using System.Buffers; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters +namespace JT809.Protocol.Formatters.SubMessageBodyFormatters { public class JT809_0x1400_0x1402Formatter : IJT809Formatter { @@ -13,8 +14,8 @@ namespace JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters { int offset = 0; JT809_0x1400_0x1402 jT809_0X1400_0X1402 = new JT809_0x1400_0x1402(); - jT809_0X1400_0X1402.WarnSrc = (JT809Enums.JT809WarnSrc)JT809BinaryExtensions.ReadByteLittle(bytes, ref offset); - jT809_0X1400_0X1402.WarnType=(JT809Enums.JT809WarnType) JT809BinaryExtensions.ReadUInt16Little(bytes, ref offset); + jT809_0X1400_0X1402.WarnSrc = (JT809WarnSrc)JT809BinaryExtensions.ReadByteLittle(bytes, ref offset); + jT809_0X1400_0X1402.WarnType=(JT809WarnType) JT809BinaryExtensions.ReadUInt16Little(bytes, ref offset); jT809_0X1400_0X1402.WarnTime = JT809BinaryExtensions.ReadUTCDateTimeLittle(bytes, ref offset); jT809_0X1400_0X1402.InfoID= JT809BinaryExtensions.ReadUInt32Little(bytes, ref offset); jT809_0X1400_0X1402.InfoLength = JT809BinaryExtensions.ReadUInt32Little(bytes, ref offset); diff --git a/src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x1400_0x1403Formatter.cs b/src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x1400_0x1403Formatter.cs similarity index 76% rename from src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x1400_0x1403Formatter.cs rename to src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x1400_0x1403Formatter.cs index e94a035..ec8a5b1 100644 --- a/src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x1400_0x1403Formatter.cs +++ b/src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x1400_0x1403Formatter.cs @@ -1,11 +1,12 @@ -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809SubMessageBody; +using JT809.Protocol.Extensions; +using JT809.Protocol.Enums; +using JT809.Protocol.SubMessageBody; using System; using System.Buffers; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters +namespace JT809.Protocol.Formatters.SubMessageBodyFormatters { public class JT809_0x1400_0x1403Formatter : IJT809Formatter { @@ -14,7 +15,7 @@ namespace JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters int offset = 0; JT809_0x1400_0x1403 jT809_0X1400_0X1403 = new JT809_0x1400_0x1403(); jT809_0X1400_0X1403.InfoID = JT809BinaryExtensions.ReadUInt32Little(bytes, ref offset); - jT809_0X1400_0X1403.Result = (JT809Enums.JT809_0x1403_Result)JT809BinaryExtensions.ReadByteLittle(bytes, ref offset); + jT809_0X1400_0X1403.Result = (JT809_0x1403_Result)JT809BinaryExtensions.ReadByteLittle(bytes, ref offset); readSize = offset; return jT809_0X1400_0X1403; } diff --git a/src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x1500_0x1501Formatter.cs b/src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x1500_0x1501Formatter.cs similarity index 71% rename from src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x1500_0x1501Formatter.cs rename to src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x1500_0x1501Formatter.cs index 98e8e62..53d6931 100644 --- a/src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x1500_0x1501Formatter.cs +++ b/src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x1500_0x1501Formatter.cs @@ -1,11 +1,12 @@ -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809SubMessageBody; +using JT809.Protocol.Extensions; +using JT809.Protocol.Enums; +using JT809.Protocol.SubMessageBody; using System; using System.Buffers; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters +namespace JT809.Protocol.Formatters.SubMessageBodyFormatters { public class JT809_0x1500_0x1501Formatter : IJT809Formatter { @@ -13,7 +14,7 @@ namespace JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters { int offset = 0; JT809_0x1500_0x1501 jT809_0X1500_0X1501 = new JT809_0x1500_0x1501(); - jT809_0X1500_0X1501.Result= (JT809Enums.JT809_0x1501_Result)JT809BinaryExtensions.ReadByteLittle(bytes, ref offset); + jT809_0X1500_0X1501.Result= (JT809_0x1501_Result)JT809BinaryExtensions.ReadByteLittle(bytes, ref offset); readSize = offset; return jT809_0X1500_0X1501; } diff --git a/src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x1500_0x1502Formatter.cs b/src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x1500_0x1502Formatter.cs similarity index 96% rename from src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x1500_0x1502Formatter.cs rename to src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x1500_0x1502Formatter.cs index 7330e22..30c2539 100644 --- a/src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x1500_0x1502Formatter.cs +++ b/src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x1500_0x1502Formatter.cs @@ -1,12 +1,12 @@ -using JT809.Protocol.JT809Enums; -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809SubMessageBody; +using JT809.Protocol.Enums; +using JT809.Protocol.Extensions; +using JT809.Protocol.SubMessageBody; using System; using System.Buffers; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters +namespace JT809.Protocol.Formatters.SubMessageBodyFormatters { public class JT809_0x1500_0x1502Formatter : IJT809Formatter { diff --git a/src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x1500_0x1503Formatter.cs b/src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x1500_0x1503Formatter.cs similarity index 76% rename from src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x1500_0x1503Formatter.cs rename to src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x1500_0x1503Formatter.cs index 30b74f3..feca367 100644 --- a/src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x1500_0x1503Formatter.cs +++ b/src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x1500_0x1503Formatter.cs @@ -1,11 +1,12 @@ -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809SubMessageBody; +using JT809.Protocol.Extensions; +using JT809.Protocol.Enums; +using JT809.Protocol.SubMessageBody; using System; using System.Buffers; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters +namespace JT809.Protocol.Formatters.SubMessageBodyFormatters { public class JT809_0x1500_0x1503Formatter : IJT809Formatter { @@ -14,7 +15,7 @@ namespace JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters int offset = 0; JT809_0x1500_0x1503 jT809_0X1500_0X1503 = new JT809_0x1500_0x1503(); jT809_0X1500_0X1503.MsgID= JT809BinaryExtensions.ReadUInt32Little(bytes, ref offset); - jT809_0X1500_0X1503.Result = (JT809Enums.JT809_0x1503_Result)JT809BinaryExtensions.ReadByteLittle(bytes, ref offset); + jT809_0X1500_0X1503.Result = (JT809_0x1503_Result)JT809BinaryExtensions.ReadByteLittle(bytes, ref offset); readSize = offset; return jT809_0X1500_0X1503; } diff --git a/src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x1500_0x1504Formatter.cs b/src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x1500_0x1504Formatter.cs similarity index 88% rename from src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x1500_0x1504Formatter.cs rename to src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x1500_0x1504Formatter.cs index 34b78a1..d8f89fe 100644 --- a/src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x1500_0x1504Formatter.cs +++ b/src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x1500_0x1504Formatter.cs @@ -1,12 +1,12 @@ -using JT809.Protocol.JT809Enums; -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809SubMessageBody; +using JT809.Protocol.Enums; +using JT809.Protocol.Extensions; +using JT809.Protocol.SubMessageBody; using System; using System.Buffers; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters +namespace JT809.Protocol.Formatters.SubMessageBodyFormatters { public class JT809_0x1500_0x1504Formatter : IJT809Formatter { diff --git a/src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x1500_0x1505Formatter.cs b/src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x1500_0x1505Formatter.cs similarity index 71% rename from src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x1500_0x1505Formatter.cs rename to src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x1500_0x1505Formatter.cs index a2e8853..edd546b 100644 --- a/src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x1500_0x1505Formatter.cs +++ b/src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x1500_0x1505Formatter.cs @@ -1,11 +1,12 @@ -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809SubMessageBody; +using JT809.Protocol.Extensions; +using JT809.Protocol.Enums; +using JT809.Protocol.SubMessageBody; using System; using System.Buffers; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters +namespace JT809.Protocol.Formatters.SubMessageBodyFormatters { public class JT809_0x1500_0x1505Formatter : IJT809Formatter { @@ -13,7 +14,7 @@ namespace JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters { int offset = 0; JT809_0x1500_0x1505 jT809_0X1500_0X1505 = new JT809_0x1500_0x1505(); - jT809_0X1500_0X1505.Result = (JT809Enums.JT809_0x1505_Result) JT809BinaryExtensions.ReadByteLittle(bytes, ref offset); + jT809_0X1500_0X1505.Result = (JT809_0x1505_Result) JT809BinaryExtensions.ReadByteLittle(bytes, ref offset); readSize = offset; return jT809_0X1500_0X1505; } diff --git a/src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x9200_0x9202Formatter.cs b/src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x9200_0x9202Formatter.cs similarity index 95% rename from src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x9200_0x9202Formatter.cs rename to src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x9200_0x9202Formatter.cs index 8d993b7..e0add67 100644 --- a/src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x9200_0x9202Formatter.cs +++ b/src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x9200_0x9202Formatter.cs @@ -1,12 +1,12 @@ -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809SubMessageBody; -using JT809.Protocol.JT809Enums; +using JT809.Protocol.Extensions; +using JT809.Protocol.SubMessageBody; +using JT809.Protocol.Enums; using System; using System.Buffers; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters +namespace JT809.Protocol.Formatters.SubMessageBodyFormatters { public class JT809_0x9200_0x9202Formatter : IJT809Formatter { diff --git a/src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x9200_0x9203Formatter.cs b/src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x9200_0x9203Formatter.cs similarity index 92% rename from src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x9200_0x9203Formatter.cs rename to src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x9200_0x9203Formatter.cs index c05b09d..74a512e 100644 --- a/src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x9200_0x9203Formatter.cs +++ b/src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x9200_0x9203Formatter.cs @@ -1,13 +1,13 @@ -using JT809.Protocol.JT809Enums; -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809Properties; -using JT809.Protocol.JT809SubMessageBody; +using JT809.Protocol.Enums; +using JT809.Protocol.Extensions; +using JT809.Protocol.Metadata; +using JT809.Protocol.SubMessageBody; using System; using System.Buffers; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters +namespace JT809.Protocol.Formatters.SubMessageBodyFormatters { public class JT809_0x9200_0x9203Formatter : IJT809Formatter { diff --git a/src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x9200_0x9204Formatter.cs b/src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x9200_0x9204Formatter.cs similarity index 84% rename from src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x9200_0x9204Formatter.cs rename to src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x9200_0x9204Formatter.cs index 3049eeb..fcd38dd 100644 --- a/src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x9200_0x9204Formatter.cs +++ b/src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x9200_0x9204Formatter.cs @@ -1,11 +1,11 @@ -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809SubMessageBody; +using JT809.Protocol.Extensions; +using JT809.Protocol.SubMessageBody; using System; using System.Buffers; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters +namespace JT809.Protocol.Formatters.SubMessageBodyFormatters { public class JT809_0x9200_0x9204Formatter : IJT809Formatter { diff --git a/src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x9200_0x9205Formatter.cs b/src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x9200_0x9205Formatter.cs similarity index 81% rename from src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x9200_0x9205Formatter.cs rename to src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x9200_0x9205Formatter.cs index 49a994a..435ebda 100644 --- a/src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x9200_0x9205Formatter.cs +++ b/src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x9200_0x9205Formatter.cs @@ -1,12 +1,12 @@ -using JT809.Protocol.JT809Enums; -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809SubMessageBody; +using JT809.Protocol.Enums; +using JT809.Protocol.Extensions; +using JT809.Protocol.SubMessageBody; using System; using System.Buffers; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters +namespace JT809.Protocol.Formatters.SubMessageBodyFormatters { public class JT809_0x9200_0x9205Formatter : IJT809Formatter { diff --git a/src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x9200_0x9206Formatter.cs b/src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x9200_0x9206Formatter.cs similarity index 81% rename from src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x9200_0x9206Formatter.cs rename to src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x9200_0x9206Formatter.cs index 93a51fa..4bbe245 100644 --- a/src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x9200_0x9206Formatter.cs +++ b/src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x9200_0x9206Formatter.cs @@ -1,12 +1,12 @@ -using JT809.Protocol.JT809Enums; -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809SubMessageBody; +using JT809.Protocol.Enums; +using JT809.Protocol.Extensions; +using JT809.Protocol.SubMessageBody; using System; using System.Buffers; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters +namespace JT809.Protocol.Formatters.SubMessageBodyFormatters { public class JT809_0x9200_0x9206Formatter : IJT809Formatter { diff --git a/src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x9200_0x9207Formatter.cs b/src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x9200_0x9207Formatter.cs similarity index 81% rename from src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x9200_0x9207Formatter.cs rename to src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x9200_0x9207Formatter.cs index 2817666..41cf701 100644 --- a/src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x9200_0x9207Formatter.cs +++ b/src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x9200_0x9207Formatter.cs @@ -1,12 +1,12 @@ -using JT809.Protocol.JT809Enums; -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809SubMessageBody; +using JT809.Protocol.Enums; +using JT809.Protocol.Extensions; +using JT809.Protocol.SubMessageBody; using System; using System.Buffers; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters +namespace JT809.Protocol.Formatters.SubMessageBodyFormatters { public class JT809_0x9200_0x9207Formatter : IJT809Formatter { diff --git a/src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x9200_0x9208Formatter.cs b/src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x9200_0x9208Formatter.cs similarity index 81% rename from src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x9200_0x9208Formatter.cs rename to src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x9200_0x9208Formatter.cs index f1958e1..6e5ad26 100644 --- a/src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x9200_0x9208Formatter.cs +++ b/src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x9200_0x9208Formatter.cs @@ -1,12 +1,12 @@ -using JT809.Protocol.JT809Enums; -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809SubMessageBody; +using JT809.Protocol.Enums; +using JT809.Protocol.Extensions; +using JT809.Protocol.SubMessageBody; using System; using System.Buffers; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters +namespace JT809.Protocol.Formatters.SubMessageBodyFormatters { public class JT809_0x9200_0x9208Formatter : IJT809Formatter { diff --git a/src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x9200_0x9209Formatter.cs b/src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x9200_0x9209Formatter.cs similarity index 81% rename from src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x9200_0x9209Formatter.cs rename to src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x9200_0x9209Formatter.cs index 59bb74d..6f2c13e 100644 --- a/src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x9200_0x9209Formatter.cs +++ b/src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x9200_0x9209Formatter.cs @@ -1,12 +1,12 @@ -using JT809.Protocol.JT809Enums; -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809SubMessageBody; +using JT809.Protocol.Enums; +using JT809.Protocol.Extensions; +using JT809.Protocol.SubMessageBody; using System; using System.Buffers; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters +namespace JT809.Protocol.Formatters.SubMessageBodyFormatters { public class JT809_0x9200_0x9209Formatter : IJT809Formatter { diff --git a/src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x9300_0x9301Formatter.cs b/src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x9300_0x9301Formatter.cs similarity index 85% rename from src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x9300_0x9301Formatter.cs rename to src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x9300_0x9301Formatter.cs index c3e6efe..15fbf17 100644 --- a/src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x9300_0x9301Formatter.cs +++ b/src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x9300_0x9301Formatter.cs @@ -1,11 +1,12 @@ -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809SubMessageBody; +using JT809.Protocol.Extensions; +using JT809.Protocol.Enums; +using JT809.Protocol.SubMessageBody; using System; using System.Buffers; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters +namespace JT809.Protocol.Formatters.SubMessageBodyFormatters { public class JT809_0x9300_0x9301Formatter : IJT809Formatter { @@ -13,7 +14,7 @@ namespace JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters { int offset = 0; JT809_0x9300_0x9301 jT809_0X9300_0X9301 = new JT809_0x9300_0x9301(); - jT809_0X9300_0X9301.ObjectType = (JT809Enums.JT809_0x9301_ObjectType)JT809BinaryExtensions.ReadByteLittle(bytes, ref offset); + jT809_0X9300_0X9301.ObjectType = (JT809_0x9301_ObjectType)JT809BinaryExtensions.ReadByteLittle(bytes, ref offset); jT809_0X9300_0X9301.ObjectID = JT809BinaryExtensions.ReadStringLittle(bytes, ref offset, 12); jT809_0X9300_0X9301.InfoID = JT809BinaryExtensions.ReadUInt32Little(bytes, ref offset); jT809_0X9300_0X9301.InfoLength = JT809BinaryExtensions.ReadUInt32Little(bytes, ref offset); diff --git a/src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x9300_0x9302Formatter.cs b/src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x9300_0x9302Formatter.cs similarity index 85% rename from src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x9300_0x9302Formatter.cs rename to src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x9300_0x9302Formatter.cs index d4716f0..d689d35 100644 --- a/src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x9300_0x9302Formatter.cs +++ b/src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x9300_0x9302Formatter.cs @@ -1,11 +1,12 @@ -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809SubMessageBody; +using JT809.Protocol.Extensions; +using JT809.Protocol.Enums; +using JT809.Protocol.SubMessageBody; using System; using System.Buffers; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters +namespace JT809.Protocol.Formatters.SubMessageBodyFormatters { public class JT809_0x9300_0x9302Formatter : IJT809Formatter { @@ -13,7 +14,7 @@ namespace JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters { int offset = 0; JT809_0x9300_0x9302 jT809_0X9300_0X9302 = new JT809_0x9300_0x9302(); - jT809_0X9300_0X9302.ObjectType = (JT809Enums.JT809_0x9302_ObjectType)JT809BinaryExtensions.ReadByteLittle(bytes, ref offset); + jT809_0X9300_0X9302.ObjectType = (JT809_0x9302_ObjectType)JT809BinaryExtensions.ReadByteLittle(bytes, ref offset); jT809_0X9300_0X9302.ObjectID = JT809BinaryExtensions.ReadStringLittle(bytes, ref offset, 12); jT809_0X9300_0X9302.InfoID = JT809BinaryExtensions.ReadUInt32Little(bytes, ref offset); jT809_0X9300_0X9302.InfoLength = JT809BinaryExtensions.ReadUInt32Little(bytes, ref offset); diff --git a/src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x9400_0x9401Formatter.cs b/src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x9400_0x9401Formatter.cs similarity index 85% rename from src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x9400_0x9401Formatter.cs rename to src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x9400_0x9401Formatter.cs index 34f2cfd..1a26dcb 100644 --- a/src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x9400_0x9401Formatter.cs +++ b/src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x9400_0x9401Formatter.cs @@ -1,11 +1,12 @@ -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809SubMessageBody; +using JT809.Protocol.Extensions; +using JT809.Protocol.Enums; +using JT809.Protocol.SubMessageBody; using System; using System.Buffers; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters +namespace JT809.Protocol.Formatters.SubMessageBodyFormatters { public class JT809_0x9400_0x9401Formatter : IJT809Formatter { @@ -13,8 +14,8 @@ namespace JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters { int offset = 0; JT809_0x9400_0x9401 jT809_0X9400_0X9401 = new JT809_0x9400_0x9401(); - jT809_0X9400_0X9401.WarnSrc = (JT809Enums.JT809WarnSrc)JT809BinaryExtensions.ReadByteLittle(bytes, ref offset); - jT809_0X9400_0X9401.WarnType =(JT809Enums.JT809WarnType) JT809BinaryExtensions.ReadUInt16Little(bytes, ref offset); + jT809_0X9400_0X9401.WarnSrc = (JT809WarnSrc)JT809BinaryExtensions.ReadByteLittle(bytes, ref offset); + jT809_0X9400_0X9401.WarnType =(JT809WarnType) JT809BinaryExtensions.ReadUInt16Little(bytes, ref offset); jT809_0X9400_0X9401.WarnTime = JT809BinaryExtensions.ReadUTCDateTimeLittle(bytes, ref offset); jT809_0X9400_0X9401.SupervisionID = JT809BinaryExtensions.ReadHexStringLittle(bytes, ref offset,4); jT809_0X9400_0X9401.SupervisionEndTime = JT809BinaryExtensions.ReadUTCDateTimeLittle(bytes, ref offset); diff --git a/src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x9400_0x9402Formatter.cs b/src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x9400_0x9402Formatter.cs similarity index 79% rename from src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x9400_0x9402Formatter.cs rename to src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x9400_0x9402Formatter.cs index ba043d9..d0fe475 100644 --- a/src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x9400_0x9402Formatter.cs +++ b/src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x9400_0x9402Formatter.cs @@ -1,11 +1,12 @@ -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809SubMessageBody; +using JT809.Protocol.Extensions; +using JT809.Protocol.Enums; +using JT809.Protocol.SubMessageBody; using System; using System.Buffers; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters +namespace JT809.Protocol.Formatters.SubMessageBodyFormatters { public class JT809_0x9400_0x9402Formatter : IJT809Formatter { @@ -13,8 +14,8 @@ namespace JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters { int offset = 0; JT809_0x9400_0x9402 jT809_0X9400_0X9402 = new JT809_0x9400_0x9402(); - jT809_0X9400_0X9402.WarnSrc = (JT809Enums.JT809WarnSrc)JT809BinaryExtensions.ReadByteLittle(bytes, ref offset); - jT809_0X9400_0X9402.WarnType = (JT809Enums.JT809WarnType)JT809BinaryExtensions.ReadUInt16Little(bytes, ref offset); + jT809_0X9400_0X9402.WarnSrc = (JT809WarnSrc)JT809BinaryExtensions.ReadByteLittle(bytes, ref offset); + jT809_0X9400_0X9402.WarnType = (JT809WarnType)JT809BinaryExtensions.ReadUInt16Little(bytes, ref offset); jT809_0X9400_0X9402.WarnTime = JT809BinaryExtensions.ReadUTCDateTimeLittle(bytes, ref offset); jT809_0X9400_0X9402.WarnLength = JT809BinaryExtensions.ReadUInt32Little(bytes, ref offset); jT809_0X9400_0X9402.WarnContent = JT809BinaryExtensions.ReadStringLittle(bytes, ref offset,(int)jT809_0X9400_0X9402.WarnLength); diff --git a/src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x9400_0x9403Formatter.cs b/src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x9400_0x9403Formatter.cs similarity index 79% rename from src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x9400_0x9403Formatter.cs rename to src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x9400_0x9403Formatter.cs index 4ccddc9..91ce939 100644 --- a/src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x9400_0x9403Formatter.cs +++ b/src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x9400_0x9403Formatter.cs @@ -1,11 +1,12 @@ -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809SubMessageBody; +using JT809.Protocol.Extensions; +using JT809.Protocol.Enums; +using JT809.Protocol.SubMessageBody; using System; using System.Buffers; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters +namespace JT809.Protocol.Formatters.SubMessageBodyFormatters { public class JT809_0x9400_0x9403Formatter : IJT809Formatter { @@ -13,8 +14,8 @@ namespace JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters { int offset = 0; JT809_0x9400_0x9403 jT809_0X9400_0X9403 = new JT809_0x9400_0x9403(); - jT809_0X9400_0X9403.WarnSrc = (JT809Enums.JT809WarnSrc)JT809BinaryExtensions.ReadByteLittle(bytes, ref offset); - jT809_0X9400_0X9403.WarnType = (JT809Enums.JT809WarnType)JT809BinaryExtensions.ReadUInt16Little(bytes, ref offset); + jT809_0X9400_0X9403.WarnSrc = (JT809WarnSrc)JT809BinaryExtensions.ReadByteLittle(bytes, ref offset); + jT809_0X9400_0X9403.WarnType = (JT809WarnType)JT809BinaryExtensions.ReadUInt16Little(bytes, ref offset); jT809_0X9400_0X9403.WarnTime = JT809BinaryExtensions.ReadUTCDateTimeLittle(bytes, ref offset); jT809_0X9400_0X9403.WarnLength = JT809BinaryExtensions.ReadUInt32Little(bytes, ref offset); jT809_0X9400_0X9403.WarnContent = JT809BinaryExtensions.ReadStringLittle(bytes, ref offset, (int)jT809_0X9400_0X9403.WarnLength); diff --git a/src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x9500_0x9501Formatter.cs b/src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x9500_0x9501Formatter.cs similarity index 84% rename from src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x9500_0x9501Formatter.cs rename to src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x9500_0x9501Formatter.cs index 3eaf7d1..376bbab 100644 --- a/src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x9500_0x9501Formatter.cs +++ b/src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x9500_0x9501Formatter.cs @@ -1,11 +1,11 @@ -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809SubMessageBody; +using JT809.Protocol.Extensions; +using JT809.Protocol.SubMessageBody; using System; using System.Buffers; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters +namespace JT809.Protocol.Formatters.SubMessageBodyFormatters { public class JT809_0x9500_0x9501Formatter : IJT809Formatter { diff --git a/src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x9500_0x9502Formatter.cs b/src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x9500_0x9502Formatter.cs similarity index 86% rename from src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x9500_0x9502Formatter.cs rename to src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x9500_0x9502Formatter.cs index 6eaa0d9..76dabb5 100644 --- a/src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x9500_0x9502Formatter.cs +++ b/src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x9500_0x9502Formatter.cs @@ -1,11 +1,11 @@ -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809SubMessageBody; +using JT809.Protocol.Extensions; +using JT809.Protocol.SubMessageBody; using System; using System.Buffers; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters +namespace JT809.Protocol.Formatters.SubMessageBodyFormatters { public class JT809_0x9500_0x9502Formatter : IJT809Formatter { diff --git a/src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x9500_0x9503Formatter.cs b/src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x9500_0x9503Formatter.cs similarity index 91% rename from src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x9500_0x9503Formatter.cs rename to src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x9500_0x9503Formatter.cs index f1b0c23..edf04e4 100644 --- a/src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x9500_0x9503Formatter.cs +++ b/src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x9500_0x9503Formatter.cs @@ -1,11 +1,11 @@ -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809SubMessageBody; +using JT809.Protocol.Extensions; +using JT809.Protocol.SubMessageBody; using System; using System.Buffers; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters +namespace JT809.Protocol.Formatters.SubMessageBodyFormatters { public class JT809_0x9500_0x9503Formatter : IJT809Formatter { diff --git a/src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x9500_0x9504Formatter.cs b/src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x9500_0x9504Formatter.cs new file mode 100644 index 0000000..9bbeb9f --- /dev/null +++ b/src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x9500_0x9504Formatter.cs @@ -0,0 +1,76 @@ +using JT809.Protocol.Extensions; +using JT809.Protocol.Enums; +using JT809.Protocol.SubMessageBody; +using System; +using System.Buffers; +using System.Collections.Generic; +using System.Text; + +namespace JT809.Protocol.Formatters.SubMessageBodyFormatters +{ + public class JT809_0x9500_0x9504Formatter : IJT809Formatter + { + public JT809_0x9500_0x9504 Deserialize(ReadOnlySpan bytes, out int readSize) + { + int offset = 0; + JT809_0x9500_0x9504 jT809_0X9500_0X9504 = new JT809_0x9500_0x9504(); + jT809_0X9500_0X9504.Command = (JT809CommandType) JT809BinaryExtensions.ReadByteLittle(bytes, ref offset); + switch (jT809_0X9500_0X9504.Command) + { + case JT809CommandType.记录仪标准版本: + case JT809CommandType.当前驾驶人信息: + case JT809CommandType.记录仪时间: + case JT809CommandType.记录仪累计行驶里程: + case JT809CommandType.记录仪脉冲系数: + case JT809CommandType.车辆信息: + case JT809CommandType.记录仪状态信号配置信息: + case JT809CommandType.记录仪唯一性编号: + break; + case JT809CommandType.采集记录仪行驶记录: + case JT809CommandType.采集记录仪位置信息记录: + case JT809CommandType.采集记录仪事故疑点记录: + case JT809CommandType.采集记录仪超时驾驶记录: + case JT809CommandType.采集记录仪驾驶人身份记录: + case JT809CommandType.采集记录仪外部供电记录: + case JT809CommandType.采集记录仪参数修改记录: + case JT809CommandType.采集记录仪速度状态日志: + jT809_0X9500_0X9504.StartTime = JT809BinaryExtensions.ReadDateTime6Little(bytes, ref offset); + jT809_0X9500_0X9504.EndTime = JT809BinaryExtensions.ReadDateTime6Little(bytes, ref offset); + jT809_0X9500_0X9504.Max = JT809BinaryExtensions.ReadUInt16Little(bytes, ref offset); + break; + } + readSize = offset; + return jT809_0X9500_0X9504; + } + + public int Serialize(ref byte[] bytes, int offset, JT809_0x9500_0x9504 value) + { + offset += JT809BinaryExtensions.WriteByteLittle(bytes, offset, (byte)value.Command); + switch (value.Command) + { + case JT809CommandType.记录仪标准版本: + case JT809CommandType.当前驾驶人信息: + case JT809CommandType.记录仪时间: + case JT809CommandType.记录仪累计行驶里程: + case JT809CommandType.记录仪脉冲系数: + case JT809CommandType.车辆信息: + case JT809CommandType.记录仪状态信号配置信息: + case JT809CommandType.记录仪唯一性编号: + break; + case JT809CommandType.采集记录仪行驶记录: + case JT809CommandType.采集记录仪位置信息记录: + case JT809CommandType.采集记录仪事故疑点记录: + case JT809CommandType.采集记录仪超时驾驶记录: + case JT809CommandType.采集记录仪驾驶人身份记录: + case JT809CommandType.采集记录仪外部供电记录: + case JT809CommandType.采集记录仪参数修改记录: + case JT809CommandType.采集记录仪速度状态日志: + offset += JT809BinaryExtensions.WriteDateTime6Little(bytes, offset, value.StartTime); + offset += JT809BinaryExtensions.WriteDateTime6Little(bytes, offset, value.EndTime); + offset += JT809BinaryExtensions.WriteUInt16Little(bytes, offset, value.Max); + break; + } + return offset; + } + } +} diff --git a/src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x9500_0x9505Formatter.cs b/src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x9500_0x9505Formatter.cs similarity index 93% rename from src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x9500_0x9505Formatter.cs rename to src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x9500_0x9505Formatter.cs index 2e11495..88d6e05 100644 --- a/src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x9500_0x9505Formatter.cs +++ b/src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x9500_0x9505Formatter.cs @@ -1,11 +1,11 @@ -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809SubMessageBody; +using JT809.Protocol.Extensions; +using JT809.Protocol.SubMessageBody; using System; using System.Buffers; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters +namespace JT809.Protocol.Formatters.SubMessageBodyFormatters { public class JT809_0x9500_0x9505Formatter : IJT809Formatter { diff --git a/src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x9600_0x1601Formatter.cs b/src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x9600_0x1601Formatter.cs similarity index 84% rename from src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x9600_0x1601Formatter.cs rename to src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x9600_0x1601Formatter.cs index 0919527..9755043 100644 --- a/src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x9600_0x1601Formatter.cs +++ b/src/JT809.Protocol/Formatters/SubMessageBodyFormatters/JT809_0x9600_0x1601Formatter.cs @@ -1,11 +1,11 @@ -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809SubMessageBody; +using JT809.Protocol.Extensions; +using JT809.Protocol.SubMessageBody; using System; using System.Buffers; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters +namespace JT809.Protocol.Formatters.SubMessageBodyFormatters { public class JT809_0x9600_0x1601Formatter : IJT809Formatter { diff --git a/src/JT809.Protocol/JT809Internal/DefaultMsgSNDistributedImpl.cs b/src/JT809.Protocol/Internal/DefaultMsgSNDistributedImpl.cs similarity index 89% rename from src/JT809.Protocol/JT809Internal/DefaultMsgSNDistributedImpl.cs rename to src/JT809.Protocol/Internal/DefaultMsgSNDistributedImpl.cs index efabcda..d001c53 100644 --- a/src/JT809.Protocol/JT809Internal/DefaultMsgSNDistributedImpl.cs +++ b/src/JT809.Protocol/Internal/DefaultMsgSNDistributedImpl.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Text; using System.Threading; -namespace JT809.Protocol.JT809Internal +namespace JT809.Protocol.Internal { internal class DefaultMsgSNDistributedImpl : IMsgSNDistributed { diff --git a/src/JT809.Protocol/JT809.Protocol.csproj b/src/JT809.Protocol/JT809.Protocol.csproj index ad0046a..2c7a17a 100644 --- a/src/JT809.Protocol/JT809.Protocol.csproj +++ b/src/JT809.Protocol/JT809.Protocol.csproj @@ -30,19 +30,16 @@ - - - + + - - - + + - - - + + @@ -53,38 +50,38 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/JT809.Protocol/JT809Bodies.cs b/src/JT809.Protocol/JT809Bodies.cs index 588faff..25a4c09 100644 --- a/src/JT809.Protocol/JT809Bodies.cs +++ b/src/JT809.Protocol/JT809Bodies.cs @@ -1,6 +1,6 @@ -using JT809.Protocol.JT809Attributes; -using JT809.Protocol.JT809Enums; -using JT809.Protocol.JT809Formatters; +using JT809.Protocol.Attributes; +using JT809.Protocol.Enums; +using JT809.Protocol.Formatters; using System; using System.Collections.Generic; using System.Text; diff --git a/src/JT809.Protocol/JT809ExchangeMessageBodies.cs b/src/JT809.Protocol/JT809ExchangeMessageBodies.cs index e8de3f3..eb34c79 100644 --- a/src/JT809.Protocol/JT809ExchangeMessageBodies.cs +++ b/src/JT809.Protocol/JT809ExchangeMessageBodies.cs @@ -1,6 +1,6 @@ -using JT809.Protocol.JT809Attributes; -using JT809.Protocol.JT809Enums; -using JT809.Protocol.JT809Formatters; +using JT809.Protocol.Attributes; +using JT809.Protocol.Enums; +using JT809.Protocol.Formatters; using System; using System.Collections.Generic; using System.Text; diff --git a/src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x9500_0x9504Formatter.cs b/src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x9500_0x9504Formatter.cs deleted file mode 100644 index 849c24d..0000000 --- a/src/JT809.Protocol/JT809Formatters/JT809SubMessageBodyFormatters/JT809_0x9500_0x9504Formatter.cs +++ /dev/null @@ -1,75 +0,0 @@ -using JT809.Protocol.JT809Extensions; -using JT809.Protocol.JT809SubMessageBody; -using System; -using System.Buffers; -using System.Collections.Generic; -using System.Text; - -namespace JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters -{ - public class JT809_0x9500_0x9504Formatter : IJT809Formatter - { - public JT809_0x9500_0x9504 Deserialize(ReadOnlySpan bytes, out int readSize) - { - int offset = 0; - JT809_0x9500_0x9504 jT809_0X9500_0X9504 = new JT809_0x9500_0x9504(); - jT809_0X9500_0X9504.Command = (JT809Enums.JT809CommandType) JT809BinaryExtensions.ReadByteLittle(bytes, ref offset); - switch (jT809_0X9500_0X9504.Command) - { - case JT809Enums.JT809CommandType.记录仪标准版本: - case JT809Enums.JT809CommandType.当前驾驶人信息: - case JT809Enums.JT809CommandType.记录仪时间: - case JT809Enums.JT809CommandType.记录仪累计行驶里程: - case JT809Enums.JT809CommandType.记录仪脉冲系数: - case JT809Enums.JT809CommandType.车辆信息: - case JT809Enums.JT809CommandType.记录仪状态信号配置信息: - case JT809Enums.JT809CommandType.记录仪唯一性编号: - break; - case JT809Enums.JT809CommandType.采集记录仪行驶记录: - case JT809Enums.JT809CommandType.采集记录仪位置信息记录: - case JT809Enums.JT809CommandType.采集记录仪事故疑点记录: - case JT809Enums.JT809CommandType.采集记录仪超时驾驶记录: - case JT809Enums.JT809CommandType.采集记录仪驾驶人身份记录: - case JT809Enums.JT809CommandType.采集记录仪外部供电记录: - case JT809Enums.JT809CommandType.采集记录仪参数修改记录: - case JT809Enums.JT809CommandType.采集记录仪速度状态日志: - jT809_0X9500_0X9504.StartTime = JT809BinaryExtensions.ReadDateTime6Little(bytes, ref offset); - jT809_0X9500_0X9504.EndTime = JT809BinaryExtensions.ReadDateTime6Little(bytes, ref offset); - jT809_0X9500_0X9504.Max = JT809BinaryExtensions.ReadUInt16Little(bytes, ref offset); - break; - } - readSize = offset; - return jT809_0X9500_0X9504; - } - - public int Serialize(ref byte[] bytes, int offset, JT809_0x9500_0x9504 value) - { - offset += JT809BinaryExtensions.WriteByteLittle(bytes, offset, (byte)value.Command); - switch (value.Command) - { - case JT809Enums.JT809CommandType.记录仪标准版本: - case JT809Enums.JT809CommandType.当前驾驶人信息: - case JT809Enums.JT809CommandType.记录仪时间: - case JT809Enums.JT809CommandType.记录仪累计行驶里程: - case JT809Enums.JT809CommandType.记录仪脉冲系数: - case JT809Enums.JT809CommandType.车辆信息: - case JT809Enums.JT809CommandType.记录仪状态信号配置信息: - case JT809Enums.JT809CommandType.记录仪唯一性编号: - break; - case JT809Enums.JT809CommandType.采集记录仪行驶记录: - case JT809Enums.JT809CommandType.采集记录仪位置信息记录: - case JT809Enums.JT809CommandType.采集记录仪事故疑点记录: - case JT809Enums.JT809CommandType.采集记录仪超时驾驶记录: - case JT809Enums.JT809CommandType.采集记录仪驾驶人身份记录: - case JT809Enums.JT809CommandType.采集记录仪外部供电记录: - case JT809Enums.JT809CommandType.采集记录仪参数修改记录: - case JT809Enums.JT809CommandType.采集记录仪速度状态日志: - offset += JT809BinaryExtensions.WriteDateTime6Little(bytes, offset, value.StartTime); - offset += JT809BinaryExtensions.WriteDateTime6Little(bytes, offset, value.EndTime); - offset += JT809BinaryExtensions.WriteUInt16Little(bytes, offset, value.Max); - break; - } - return offset; - } - } -} diff --git a/src/JT809.Protocol/JT809GlobalConfig.cs b/src/JT809.Protocol/JT809GlobalConfig.cs index df3fb0d..e34dbc7 100644 --- a/src/JT809.Protocol/JT809GlobalConfig.cs +++ b/src/JT809.Protocol/JT809GlobalConfig.cs @@ -1,6 +1,6 @@ -using JT809.Protocol.JT809Configs; -using JT809.Protocol.JT809Encrypt; -using JT809.Protocol.JT809Internal; +using JT809.Protocol.Configs; +using JT809.Protocol.Encrypt; +using JT809.Protocol.Internal; using System; using System.Collections.Generic; using System.Text; diff --git a/src/JT809.Protocol/JT809Header.cs b/src/JT809.Protocol/JT809Header.cs index 519ab26..fd94c7b 100644 --- a/src/JT809.Protocol/JT809Header.cs +++ b/src/JT809.Protocol/JT809Header.cs @@ -1,6 +1,6 @@ -using JT809.Protocol.JT809Attributes; -using JT809.Protocol.JT809Enums; -using JT809.Protocol.JT809Formatters; +using JT809.Protocol.Attributes; +using JT809.Protocol.Enums; +using JT809.Protocol.Formatters; using System; using System.Collections.Generic; using System.Text; diff --git a/src/JT809.Protocol/JT809Package.cs b/src/JT809.Protocol/JT809Package.cs index ae98417..ed6e05b 100644 --- a/src/JT809.Protocol/JT809Package.cs +++ b/src/JT809.Protocol/JT809Package.cs @@ -1,5 +1,5 @@ -using JT809.Protocol.JT809Attributes; -using JT809.Protocol.JT809Formatters; +using JT809.Protocol.Attributes; +using JT809.Protocol.Formatters; using System; using System.Collections.Generic; using System.Text; diff --git a/src/JT809.Protocol/JT809Serializer.cs b/src/JT809.Protocol/JT809Serializer.cs index 81a1328..4048494 100644 --- a/src/JT809.Protocol/JT809Serializer.cs +++ b/src/JT809.Protocol/JT809Serializer.cs @@ -1,4 +1,4 @@ -using JT809.Protocol.JT809Extensions; +using JT809.Protocol.Extensions; using System; using System.Buffers; using System.Collections.Generic; diff --git a/src/JT809.Protocol/JT809SubBodies.cs b/src/JT809.Protocol/JT809SubBodies.cs index 680bf8f..dac3ce8 100644 --- a/src/JT809.Protocol/JT809SubBodies.cs +++ b/src/JT809.Protocol/JT809SubBodies.cs @@ -1,4 +1,4 @@ -using JT809.Protocol.JT809Enums; +using JT809.Protocol.Enums; using System; using System.Collections.Generic; using System.Text; diff --git a/src/JT809.Protocol/JT809MessageBody/JT809_0x1001.cs b/src/JT809.Protocol/MessageBody/JT809_0x1001.cs similarity index 88% rename from src/JT809.Protocol/JT809MessageBody/JT809_0x1001.cs rename to src/JT809.Protocol/MessageBody/JT809_0x1001.cs index 69a7022..93b6857 100644 --- a/src/JT809.Protocol/JT809MessageBody/JT809_0x1001.cs +++ b/src/JT809.Protocol/MessageBody/JT809_0x1001.cs @@ -1,10 +1,10 @@ -using JT809.Protocol.JT809Attributes; -using JT809.Protocol.JT809Formatters.JT809MessageBodyFormatters; +using JT809.Protocol.Attributes; +using JT809.Protocol.Formatters.MessageBodyFormatters; using System; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809MessageBody +namespace JT809.Protocol.MessageBody { /// /// 主链路登录请求消息 diff --git a/src/JT809.Protocol/JT809MessageBody/JT809_0x1002.cs b/src/JT809.Protocol/MessageBody/JT809_0x1002.cs similarity index 85% rename from src/JT809.Protocol/JT809MessageBody/JT809_0x1002.cs rename to src/JT809.Protocol/MessageBody/JT809_0x1002.cs index 51245af..3355dcf 100644 --- a/src/JT809.Protocol/JT809MessageBody/JT809_0x1002.cs +++ b/src/JT809.Protocol/MessageBody/JT809_0x1002.cs @@ -1,11 +1,11 @@ -using JT809.Protocol.JT809Attributes; -using JT809.Protocol.JT809Enums; -using JT809.Protocol.JT809Formatters.JT809MessageBodyFormatters; +using JT809.Protocol.Attributes; +using JT809.Protocol.Enums; +using JT809.Protocol.Formatters.MessageBodyFormatters; using System; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809MessageBody +namespace JT809.Protocol.MessageBody { /// /// 主链路登录应答消息 diff --git a/src/JT809.Protocol/JT809MessageBody/JT809_0x1003.cs b/src/JT809.Protocol/MessageBody/JT809_0x1003.cs similarity index 84% rename from src/JT809.Protocol/JT809MessageBody/JT809_0x1003.cs rename to src/JT809.Protocol/MessageBody/JT809_0x1003.cs index 5202d49..7864182 100644 --- a/src/JT809.Protocol/JT809MessageBody/JT809_0x1003.cs +++ b/src/JT809.Protocol/MessageBody/JT809_0x1003.cs @@ -1,10 +1,10 @@ -using JT809.Protocol.JT809Attributes; -using JT809.Protocol.JT809Formatters.JT809MessageBodyFormatters; +using JT809.Protocol.Attributes; +using JT809.Protocol.Formatters.MessageBodyFormatters; using System; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809MessageBody +namespace JT809.Protocol.MessageBody { /// /// 主链路注销请求消息 diff --git a/src/JT809.Protocol/JT809MessageBody/JT809_0x1004.cs b/src/JT809.Protocol/MessageBody/JT809_0x1004.cs similarity index 89% rename from src/JT809.Protocol/JT809MessageBody/JT809_0x1004.cs rename to src/JT809.Protocol/MessageBody/JT809_0x1004.cs index b7530ca..93b475e 100644 --- a/src/JT809.Protocol/JT809MessageBody/JT809_0x1004.cs +++ b/src/JT809.Protocol/MessageBody/JT809_0x1004.cs @@ -1,9 +1,9 @@ -using JT809.Protocol.JT809Attributes; +using JT809.Protocol.Attributes; using System; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809MessageBody +namespace JT809.Protocol.MessageBody { /// /// 主链路注销应答消息 diff --git a/src/JT809.Protocol/JT809MessageBody/JT809_0x1005.cs b/src/JT809.Protocol/MessageBody/JT809_0x1005.cs similarity index 93% rename from src/JT809.Protocol/JT809MessageBody/JT809_0x1005.cs rename to src/JT809.Protocol/MessageBody/JT809_0x1005.cs index 9b83d03..9bd11f0 100644 --- a/src/JT809.Protocol/JT809MessageBody/JT809_0x1005.cs +++ b/src/JT809.Protocol/MessageBody/JT809_0x1005.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809MessageBody +namespace JT809.Protocol.MessageBody { /// /// 主链路连接保持请求消息 diff --git a/src/JT809.Protocol/JT809MessageBody/JT809_0x1006.cs b/src/JT809.Protocol/MessageBody/JT809_0x1006.cs similarity index 82% rename from src/JT809.Protocol/JT809MessageBody/JT809_0x1006.cs rename to src/JT809.Protocol/MessageBody/JT809_0x1006.cs index f6c0064..0f154d6 100644 --- a/src/JT809.Protocol/JT809MessageBody/JT809_0x1006.cs +++ b/src/JT809.Protocol/MessageBody/JT809_0x1006.cs @@ -1,7 +1,7 @@ -using JT809.Protocol.JT809Attributes; -using JT809.Protocol.JT809Formatters; +using JT809.Protocol.Attributes; +using JT809.Protocol.Formatters; -namespace JT809.Protocol.JT809MessageBody +namespace JT809.Protocol.MessageBody { /// /// 主链路连接保持应答消息 diff --git a/src/JT809.Protocol/JT809MessageBody/JT809_0x1007.cs b/src/JT809.Protocol/MessageBody/JT809_0x1007.cs similarity index 82% rename from src/JT809.Protocol/JT809MessageBody/JT809_0x1007.cs rename to src/JT809.Protocol/MessageBody/JT809_0x1007.cs index 92db807..521de25 100644 --- a/src/JT809.Protocol/JT809MessageBody/JT809_0x1007.cs +++ b/src/JT809.Protocol/MessageBody/JT809_0x1007.cs @@ -1,11 +1,11 @@ -using JT809.Protocol.JT809Attributes; -using JT809.Protocol.JT809Enums; -using JT809.Protocol.JT809Formatters.JT809MessageBodyFormatters; +using JT809.Protocol.Attributes; +using JT809.Protocol.Enums; +using JT809.Protocol.Formatters.MessageBodyFormatters; using System; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809MessageBody +namespace JT809.Protocol.MessageBody { /// /// 主链路断开通知消息 diff --git a/src/JT809.Protocol/JT809MessageBody/JT809_0x1008.cs b/src/JT809.Protocol/MessageBody/JT809_0x1008.cs similarity index 81% rename from src/JT809.Protocol/JT809MessageBody/JT809_0x1008.cs rename to src/JT809.Protocol/MessageBody/JT809_0x1008.cs index e10991f..2de1276 100644 --- a/src/JT809.Protocol/JT809MessageBody/JT809_0x1008.cs +++ b/src/JT809.Protocol/MessageBody/JT809_0x1008.cs @@ -1,11 +1,11 @@ -using JT809.Protocol.JT809Attributes; -using JT809.Protocol.JT809Enums; -using JT809.Protocol.JT809Formatters.JT809MessageBodyFormatters; +using JT809.Protocol.Attributes; +using JT809.Protocol.Enums; +using JT809.Protocol.Formatters.MessageBodyFormatters; using System; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809MessageBody +namespace JT809.Protocol.MessageBody { /// /// 下级平台主动关闭主从链路通知消息 diff --git a/src/JT809.Protocol/JT809MessageBody/JT809_0x1200.cs b/src/JT809.Protocol/MessageBody/JT809_0x1200.cs similarity index 80% rename from src/JT809.Protocol/JT809MessageBody/JT809_0x1200.cs rename to src/JT809.Protocol/MessageBody/JT809_0x1200.cs index bc209d2..dea4c1f 100644 --- a/src/JT809.Protocol/JT809MessageBody/JT809_0x1200.cs +++ b/src/JT809.Protocol/MessageBody/JT809_0x1200.cs @@ -1,8 +1,8 @@ -using JT809.Protocol.JT809Attributes; -using JT809.Protocol.JT809Formatters; +using JT809.Protocol.Attributes; +using JT809.Protocol.Formatters; -namespace JT809.Protocol.JT809MessageBody +namespace JT809.Protocol.MessageBody { /// /// 主链路车辆动态信息交换业务 diff --git a/src/JT809.Protocol/JT809MessageBody/JT809_0x1300.cs b/src/JT809.Protocol/MessageBody/JT809_0x1300.cs similarity index 71% rename from src/JT809.Protocol/JT809MessageBody/JT809_0x1300.cs rename to src/JT809.Protocol/MessageBody/JT809_0x1300.cs index c3cf12f..eddbdba 100644 --- a/src/JT809.Protocol/JT809MessageBody/JT809_0x1300.cs +++ b/src/JT809.Protocol/MessageBody/JT809_0x1300.cs @@ -1,8 +1,8 @@ -using JT809.Protocol.JT809Attributes; -using JT809.Protocol.JT809Formatters; -using JT809.Protocol.JT809Formatters.JT809MessageBodyFormatters; +using JT809.Protocol.Attributes; +using JT809.Protocol.Formatters; +using JT809.Protocol.Formatters.MessageBodyFormatters; -namespace JT809.Protocol.JT809MessageBody +namespace JT809.Protocol.MessageBody { /// /// 主链路平台间信息交互消息 diff --git a/src/JT809.Protocol/JT809MessageBody/JT809_0x1400.cs b/src/JT809.Protocol/MessageBody/JT809_0x1400.cs similarity index 81% rename from src/JT809.Protocol/JT809MessageBody/JT809_0x1400.cs rename to src/JT809.Protocol/MessageBody/JT809_0x1400.cs index f1df7c5..e285608 100644 --- a/src/JT809.Protocol/JT809MessageBody/JT809_0x1400.cs +++ b/src/JT809.Protocol/MessageBody/JT809_0x1400.cs @@ -1,8 +1,8 @@ -using JT809.Protocol.JT809Attributes; -using JT809.Protocol.JT809Formatters; +using JT809.Protocol.Attributes; +using JT809.Protocol.Formatters; -namespace JT809.Protocol.JT809MessageBody +namespace JT809.Protocol.MessageBody { /// /// 主链路报警信息交互消息 diff --git a/src/JT809.Protocol/JT809MessageBody/JT809_0x1500.cs b/src/JT809.Protocol/MessageBody/JT809_0x1500.cs similarity index 79% rename from src/JT809.Protocol/JT809MessageBody/JT809_0x1500.cs rename to src/JT809.Protocol/MessageBody/JT809_0x1500.cs index 65641b7..6d9850a 100644 --- a/src/JT809.Protocol/JT809MessageBody/JT809_0x1500.cs +++ b/src/JT809.Protocol/MessageBody/JT809_0x1500.cs @@ -1,8 +1,8 @@ -using JT809.Protocol.JT809Attributes; -using JT809.Protocol.JT809Formatters; +using JT809.Protocol.Attributes; +using JT809.Protocol.Formatters; -namespace JT809.Protocol.JT809MessageBody +namespace JT809.Protocol.MessageBody { /// /// 主链路车辆监管消息 diff --git a/src/JT809.Protocol/JT809MessageBody/JT809_0x1600.cs b/src/JT809.Protocol/MessageBody/JT809_0x1600.cs similarity index 79% rename from src/JT809.Protocol/JT809MessageBody/JT809_0x1600.cs rename to src/JT809.Protocol/MessageBody/JT809_0x1600.cs index a9626d1..0cbe802 100644 --- a/src/JT809.Protocol/JT809MessageBody/JT809_0x1600.cs +++ b/src/JT809.Protocol/MessageBody/JT809_0x1600.cs @@ -1,8 +1,8 @@ -using JT809.Protocol.JT809Attributes; -using JT809.Protocol.JT809Formatters; +using JT809.Protocol.Attributes; +using JT809.Protocol.Formatters; -namespace JT809.Protocol.JT809MessageBody +namespace JT809.Protocol.MessageBody { /// /// 主链路静态信息交换消息 diff --git a/src/JT809.Protocol/JT809MessageBody/JT809_0x9001.cs b/src/JT809.Protocol/MessageBody/JT809_0x9001.cs similarity index 85% rename from src/JT809.Protocol/JT809MessageBody/JT809_0x9001.cs rename to src/JT809.Protocol/MessageBody/JT809_0x9001.cs index de479f6..08d28af 100644 --- a/src/JT809.Protocol/JT809MessageBody/JT809_0x9001.cs +++ b/src/JT809.Protocol/MessageBody/JT809_0x9001.cs @@ -1,10 +1,10 @@ -using JT809.Protocol.JT809Attributes; -using JT809.Protocol.JT809Formatters.JT809MessageBodyFormatters; +using JT809.Protocol.Attributes; +using JT809.Protocol.Formatters.MessageBodyFormatters; using System; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809MessageBody +namespace JT809.Protocol.MessageBody { /// /// 从链路连接请求消息 diff --git a/src/JT809.Protocol/JT809MessageBody/JT809_0x9002.cs b/src/JT809.Protocol/MessageBody/JT809_0x9002.cs similarity index 79% rename from src/JT809.Protocol/JT809MessageBody/JT809_0x9002.cs rename to src/JT809.Protocol/MessageBody/JT809_0x9002.cs index a4b0c1b..2d79799 100644 --- a/src/JT809.Protocol/JT809MessageBody/JT809_0x9002.cs +++ b/src/JT809.Protocol/MessageBody/JT809_0x9002.cs @@ -1,11 +1,11 @@ -using JT809.Protocol.JT809Attributes; -using JT809.Protocol.JT809Enums; -using JT809.Protocol.JT809Formatters.JT809MessageBodyFormatters; +using JT809.Protocol.Attributes; +using JT809.Protocol.Enums; +using JT809.Protocol.Formatters.MessageBodyFormatters; using System; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809MessageBody +namespace JT809.Protocol.MessageBody { /// /// 从链路连接应答信息 diff --git a/src/JT809.Protocol/JT809MessageBody/JT809_0x9003.cs b/src/JT809.Protocol/MessageBody/JT809_0x9003.cs similarity index 81% rename from src/JT809.Protocol/JT809MessageBody/JT809_0x9003.cs rename to src/JT809.Protocol/MessageBody/JT809_0x9003.cs index 1ce37ca..273ba62 100644 --- a/src/JT809.Protocol/JT809MessageBody/JT809_0x9003.cs +++ b/src/JT809.Protocol/MessageBody/JT809_0x9003.cs @@ -1,10 +1,10 @@ -using JT809.Protocol.JT809Attributes; -using JT809.Protocol.JT809Formatters.JT809MessageBodyFormatters; +using JT809.Protocol.Attributes; +using JT809.Protocol.Formatters.MessageBodyFormatters; using System; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809MessageBody +namespace JT809.Protocol.MessageBody { /// ///从链路注销请求消息 diff --git a/src/JT809.Protocol/JT809MessageBody/JT809_0x9004.cs b/src/JT809.Protocol/MessageBody/JT809_0x9004.cs similarity index 93% rename from src/JT809.Protocol/JT809MessageBody/JT809_0x9004.cs rename to src/JT809.Protocol/MessageBody/JT809_0x9004.cs index 5f7c0c6..3a30aa3 100644 --- a/src/JT809.Protocol/JT809MessageBody/JT809_0x9004.cs +++ b/src/JT809.Protocol/MessageBody/JT809_0x9004.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809MessageBody +namespace JT809.Protocol.MessageBody { /// /// 从链路注销应答消息 diff --git a/src/JT809.Protocol/JT809MessageBody/JT809_0x9005.cs b/src/JT809.Protocol/MessageBody/JT809_0x9005.cs similarity index 93% rename from src/JT809.Protocol/JT809MessageBody/JT809_0x9005.cs rename to src/JT809.Protocol/MessageBody/JT809_0x9005.cs index d60e56a..2812e02 100644 --- a/src/JT809.Protocol/JT809MessageBody/JT809_0x9005.cs +++ b/src/JT809.Protocol/MessageBody/JT809_0x9005.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809MessageBody +namespace JT809.Protocol.MessageBody { /// /// 从链路连接保持请求消息 diff --git a/src/JT809.Protocol/JT809MessageBody/JT809_0x9006.cs b/src/JT809.Protocol/MessageBody/JT809_0x9006.cs similarity index 93% rename from src/JT809.Protocol/JT809MessageBody/JT809_0x9006.cs rename to src/JT809.Protocol/MessageBody/JT809_0x9006.cs index bdf0967..33d5c20 100644 --- a/src/JT809.Protocol/JT809MessageBody/JT809_0x9006.cs +++ b/src/JT809.Protocol/MessageBody/JT809_0x9006.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809MessageBody +namespace JT809.Protocol.MessageBody { /// /// 从链路连接保持应答消息 diff --git a/src/JT809.Protocol/JT809MessageBody/JT809_0x9007.cs b/src/JT809.Protocol/MessageBody/JT809_0x9007.cs similarity index 84% rename from src/JT809.Protocol/JT809MessageBody/JT809_0x9007.cs rename to src/JT809.Protocol/MessageBody/JT809_0x9007.cs index 04e4c3c..a439a51 100644 --- a/src/JT809.Protocol/JT809MessageBody/JT809_0x9007.cs +++ b/src/JT809.Protocol/MessageBody/JT809_0x9007.cs @@ -1,11 +1,11 @@ -using JT809.Protocol.JT809Attributes; -using JT809.Protocol.JT809Enums; -using JT809.Protocol.JT809Formatters.JT809MessageBodyFormatters; +using JT809.Protocol.Attributes; +using JT809.Protocol.Enums; +using JT809.Protocol.Formatters.MessageBodyFormatters; using System; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809MessageBody +namespace JT809.Protocol.MessageBody { /// /// 从链路断开通知消息 diff --git a/src/JT809.Protocol/JT809MessageBody/JT809_0x9008.cs b/src/JT809.Protocol/MessageBody/JT809_0x9008.cs similarity index 72% rename from src/JT809.Protocol/JT809MessageBody/JT809_0x9008.cs rename to src/JT809.Protocol/MessageBody/JT809_0x9008.cs index 6f5c43c..6c3c5e4 100644 --- a/src/JT809.Protocol/JT809MessageBody/JT809_0x9008.cs +++ b/src/JT809.Protocol/MessageBody/JT809_0x9008.cs @@ -1,11 +1,11 @@ -using JT809.Protocol.JT809Attributes; -using JT809.Protocol.JT809Enums; -using JT809.Protocol.JT809Formatters.JT809MessageBodyFormatters; +using JT809.Protocol.Attributes; +using JT809.Protocol.Enums; +using JT809.Protocol.Formatters.MessageBodyFormatters; using System; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809MessageBody +namespace JT809.Protocol.MessageBody { /// /// 上级平台主动关闭链路通知消息 diff --git a/src/JT809.Protocol/JT809MessageBody/JT809_0x9101.cs b/src/JT809.Protocol/MessageBody/JT809_0x9101.cs similarity index 90% rename from src/JT809.Protocol/JT809MessageBody/JT809_0x9101.cs rename to src/JT809.Protocol/MessageBody/JT809_0x9101.cs index 3962b9e..c743938 100644 --- a/src/JT809.Protocol/JT809MessageBody/JT809_0x9101.cs +++ b/src/JT809.Protocol/MessageBody/JT809_0x9101.cs @@ -1,10 +1,10 @@ -using JT809.Protocol.JT809Attributes; -using JT809.Protocol.JT809Formatters.JT809MessageBodyFormatters; +using JT809.Protocol.Attributes; +using JT809.Protocol.Formatters.MessageBodyFormatters; using System; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809MessageBody +namespace JT809.Protocol.MessageBody { /// /// 接收车辆定位信息数量通知消息 diff --git a/src/JT809.Protocol/JT809MessageBody/JT809_0x9200.cs b/src/JT809.Protocol/MessageBody/JT809_0x9200.cs similarity index 81% rename from src/JT809.Protocol/JT809MessageBody/JT809_0x9200.cs rename to src/JT809.Protocol/MessageBody/JT809_0x9200.cs index a604501..bdc4f7c 100644 --- a/src/JT809.Protocol/JT809MessageBody/JT809_0x9200.cs +++ b/src/JT809.Protocol/MessageBody/JT809_0x9200.cs @@ -1,8 +1,8 @@ -using JT809.Protocol.JT809Attributes; -using JT809.Protocol.JT809Formatters; +using JT809.Protocol.Attributes; +using JT809.Protocol.Formatters; -namespace JT809.Protocol.JT809MessageBody +namespace JT809.Protocol.MessageBody { /// /// 从链路车辆动态信息交换业务 diff --git a/src/JT809.Protocol/JT809MessageBody/JT809_0x9300.cs b/src/JT809.Protocol/MessageBody/JT809_0x9300.cs similarity index 71% rename from src/JT809.Protocol/JT809MessageBody/JT809_0x9300.cs rename to src/JT809.Protocol/MessageBody/JT809_0x9300.cs index 20b2c0d..f197b12 100644 --- a/src/JT809.Protocol/JT809MessageBody/JT809_0x9300.cs +++ b/src/JT809.Protocol/MessageBody/JT809_0x9300.cs @@ -1,8 +1,8 @@ -using JT809.Protocol.JT809Attributes; -using JT809.Protocol.JT809Formatters; -using JT809.Protocol.JT809Formatters.JT809MessageBodyFormatters; +using JT809.Protocol.Attributes; +using JT809.Protocol.Formatters; +using JT809.Protocol.Formatters.MessageBodyFormatters; -namespace JT809.Protocol.JT809MessageBody +namespace JT809.Protocol.MessageBody { /// /// 从链路平台间信息交互业务 diff --git a/src/JT809.Protocol/JT809MessageBody/JT809_0x9400.cs b/src/JT809.Protocol/MessageBody/JT809_0x9400.cs similarity index 71% rename from src/JT809.Protocol/JT809MessageBody/JT809_0x9400.cs rename to src/JT809.Protocol/MessageBody/JT809_0x9400.cs index 0e1d9d3..8f20136 100644 --- a/src/JT809.Protocol/JT809MessageBody/JT809_0x9400.cs +++ b/src/JT809.Protocol/MessageBody/JT809_0x9400.cs @@ -1,12 +1,12 @@ -using JT809.Protocol.JT809Attributes; -using JT809.Protocol.JT809Enums; -using JT809.Protocol.JT809Formatters; -using JT809.Protocol.JT809Formatters.JT809MessageBodyFormatters; +using JT809.Protocol.Attributes; +using JT809.Protocol.Enums; +using JT809.Protocol.Formatters; +using JT809.Protocol.Formatters.MessageBodyFormatters; using System; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809MessageBody +namespace JT809.Protocol.MessageBody { /// /// 从链路报警信息交互消息 diff --git a/src/JT809.Protocol/JT809MessageBody/JT809_0x9500.cs b/src/JT809.Protocol/MessageBody/JT809_0x9500.cs similarity index 79% rename from src/JT809.Protocol/JT809MessageBody/JT809_0x9500.cs rename to src/JT809.Protocol/MessageBody/JT809_0x9500.cs index 7baec49..b5d279e 100644 --- a/src/JT809.Protocol/JT809MessageBody/JT809_0x9500.cs +++ b/src/JT809.Protocol/MessageBody/JT809_0x9500.cs @@ -1,8 +1,8 @@ -using JT809.Protocol.JT809Attributes; -using JT809.Protocol.JT809Formatters; +using JT809.Protocol.Attributes; +using JT809.Protocol.Formatters; -namespace JT809.Protocol.JT809MessageBody +namespace JT809.Protocol.MessageBody { /// /// 从链路车辆监管消息 diff --git a/src/JT809.Protocol/JT809MessageBody/JT809_0x9600.cs b/src/JT809.Protocol/MessageBody/JT809_0x9600.cs similarity index 71% rename from src/JT809.Protocol/JT809MessageBody/JT809_0x9600.cs rename to src/JT809.Protocol/MessageBody/JT809_0x9600.cs index 45fa2e2..44c717e 100644 --- a/src/JT809.Protocol/JT809MessageBody/JT809_0x9600.cs +++ b/src/JT809.Protocol/MessageBody/JT809_0x9600.cs @@ -1,12 +1,12 @@ -using JT809.Protocol.JT809Attributes; -using JT809.Protocol.JT809Enums; -using JT809.Protocol.JT809Formatters; -using JT809.Protocol.JT809Formatters.JT809MessageBodyFormatters; +using JT809.Protocol.Attributes; +using JT809.Protocol.Enums; +using JT809.Protocol.Formatters; +using JT809.Protocol.Formatters.MessageBodyFormatters; using System; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809MessageBody +namespace JT809.Protocol.MessageBody { /// /// 从链路静态信息交换消息 diff --git a/src/JT809.Protocol/JT809Properties/JT809VehiclePositionProperties.cs b/src/JT809.Protocol/Metadata/JT809VehiclePositionProperties.cs similarity index 97% rename from src/JT809.Protocol/JT809Properties/JT809VehiclePositionProperties.cs rename to src/JT809.Protocol/Metadata/JT809VehiclePositionProperties.cs index bfbee54..9962ed6 100644 --- a/src/JT809.Protocol/JT809Properties/JT809VehiclePositionProperties.cs +++ b/src/JT809.Protocol/Metadata/JT809VehiclePositionProperties.cs @@ -1,9 +1,9 @@ -using JT809.Protocol.JT809Enums; +using JT809.Protocol.Enums; using System; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809Properties +namespace JT809.Protocol.Metadata { /// /// 车辆定位 diff --git a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x1200_0x1201.cs b/src/JT809.Protocol/SubMessageBody/JT809_0x1200_0x1201.cs similarity index 87% rename from src/JT809.Protocol/JT809SubMessageBody/JT809_0x1200_0x1201.cs rename to src/JT809.Protocol/SubMessageBody/JT809_0x1200_0x1201.cs index e75e4e6..ff5c69d 100644 --- a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x1200_0x1201.cs +++ b/src/JT809.Protocol/SubMessageBody/JT809_0x1200_0x1201.cs @@ -1,11 +1,11 @@ -using JT809.Protocol.JT809Attributes; -using JT809.Protocol.JT809Enums; -using JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters; +using JT809.Protocol.Attributes; +using JT809.Protocol.Enums; +using JT809.Protocol.Formatters.SubMessageBodyFormatters; using System; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809SubMessageBody +namespace JT809.Protocol.SubMessageBody { /// /// 上传车辆注册信息消息 diff --git a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x1200_0x1202.cs b/src/JT809.Protocol/SubMessageBody/JT809_0x1200_0x1202.cs similarity index 76% rename from src/JT809.Protocol/JT809SubMessageBody/JT809_0x1200_0x1202.cs rename to src/JT809.Protocol/SubMessageBody/JT809_0x1200_0x1202.cs index 878613d..9d19640 100644 --- a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x1200_0x1202.cs +++ b/src/JT809.Protocol/SubMessageBody/JT809_0x1200_0x1202.cs @@ -1,11 +1,11 @@ -using JT809.Protocol.JT809Attributes; -using JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters; -using JT809.Protocol.JT809Properties; +using JT809.Protocol.Attributes; +using JT809.Protocol.Formatters.SubMessageBodyFormatters; +using JT809.Protocol.Metadata; using System; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809SubMessageBody +namespace JT809.Protocol.SubMessageBody { /// /// 实时上传车辆定位信息 diff --git a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x1200_0x1203.cs b/src/JT809.Protocol/SubMessageBody/JT809_0x1200_0x1203.cs similarity index 86% rename from src/JT809.Protocol/JT809SubMessageBody/JT809_0x1200_0x1203.cs rename to src/JT809.Protocol/SubMessageBody/JT809_0x1200_0x1203.cs index 370cc86..bca7c39 100644 --- a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x1200_0x1203.cs +++ b/src/JT809.Protocol/SubMessageBody/JT809_0x1200_0x1203.cs @@ -1,11 +1,11 @@ -using JT809.Protocol.JT809Attributes; -using JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters; -using JT809.Protocol.JT809Properties; +using JT809.Protocol.Attributes; +using JT809.Protocol.Formatters.SubMessageBodyFormatters; +using JT809.Protocol.Metadata; using System; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809SubMessageBody +namespace JT809.Protocol.SubMessageBody { /// /// 车辆定位信息自动补报请求消息 diff --git a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x1200_0x1205.cs b/src/JT809.Protocol/SubMessageBody/JT809_0x1200_0x1205.cs similarity index 90% rename from src/JT809.Protocol/JT809SubMessageBody/JT809_0x1200_0x1205.cs rename to src/JT809.Protocol/SubMessageBody/JT809_0x1200_0x1205.cs index a846a94..ebe505c 100644 --- a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x1200_0x1205.cs +++ b/src/JT809.Protocol/SubMessageBody/JT809_0x1200_0x1205.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809SubMessageBody +namespace JT809.Protocol.SubMessageBody { /// /// 启动车辆定位信息交换应答消息 diff --git a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x1200_0x1206.cs b/src/JT809.Protocol/SubMessageBody/JT809_0x1200_0x1206.cs similarity index 86% rename from src/JT809.Protocol/JT809SubMessageBody/JT809_0x1200_0x1206.cs rename to src/JT809.Protocol/SubMessageBody/JT809_0x1200_0x1206.cs index 86fa0a0..df238ec 100644 --- a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x1200_0x1206.cs +++ b/src/JT809.Protocol/SubMessageBody/JT809_0x1200_0x1206.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809SubMessageBody +namespace JT809.Protocol.SubMessageBody { /// /// 结束车辆定位信息交换应答消息 diff --git a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x1200_0x1207.cs b/src/JT809.Protocol/SubMessageBody/JT809_0x1200_0x1207.cs similarity index 86% rename from src/JT809.Protocol/JT809SubMessageBody/JT809_0x1200_0x1207.cs rename to src/JT809.Protocol/SubMessageBody/JT809_0x1200_0x1207.cs index f484eb0..68496c9 100644 --- a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x1200_0x1207.cs +++ b/src/JT809.Protocol/SubMessageBody/JT809_0x1200_0x1207.cs @@ -1,10 +1,10 @@ -using JT809.Protocol.JT809Attributes; -using JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters; +using JT809.Protocol.Attributes; +using JT809.Protocol.Formatters.SubMessageBodyFormatters; using System; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809SubMessageBody +namespace JT809.Protocol.SubMessageBody { /// /// 申请交换指定车辆定位信息请求消息 diff --git a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x1200_0x1208.cs b/src/JT809.Protocol/SubMessageBody/JT809_0x1200_0x1208.cs similarity index 90% rename from src/JT809.Protocol/JT809SubMessageBody/JT809_0x1200_0x1208.cs rename to src/JT809.Protocol/SubMessageBody/JT809_0x1200_0x1208.cs index c7fe19b..2be53f0 100644 --- a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x1200_0x1208.cs +++ b/src/JT809.Protocol/SubMessageBody/JT809_0x1200_0x1208.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809SubMessageBody +namespace JT809.Protocol.SubMessageBody { /// /// 取消交换指定车辆定位信息请 diff --git a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x1200_0x1209.cs b/src/JT809.Protocol/SubMessageBody/JT809_0x1200_0x1209.cs similarity index 85% rename from src/JT809.Protocol/JT809SubMessageBody/JT809_0x1200_0x1209.cs rename to src/JT809.Protocol/SubMessageBody/JT809_0x1200_0x1209.cs index f37756a..f40de2c 100644 --- a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x1200_0x1209.cs +++ b/src/JT809.Protocol/SubMessageBody/JT809_0x1200_0x1209.cs @@ -1,10 +1,10 @@ -using JT809.Protocol.JT809Attributes; -using JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters; +using JT809.Protocol.Attributes; +using JT809.Protocol.Formatters.SubMessageBodyFormatters; using System; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809SubMessageBody +namespace JT809.Protocol.SubMessageBody { /// /// 补发车辆定位信息请求 diff --git a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x1200_0x120A.cs b/src/JT809.Protocol/SubMessageBody/JT809_0x1200_0x120A.cs similarity index 87% rename from src/JT809.Protocol/JT809SubMessageBody/JT809_0x1200_0x120A.cs rename to src/JT809.Protocol/SubMessageBody/JT809_0x1200_0x120A.cs index 92f386f..90f01e7 100644 --- a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x1200_0x120A.cs +++ b/src/JT809.Protocol/SubMessageBody/JT809_0x1200_0x120A.cs @@ -1,10 +1,10 @@ -using JT809.Protocol.JT809Attributes; -using JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters; +using JT809.Protocol.Attributes; +using JT809.Protocol.Formatters.SubMessageBodyFormatters; using System; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809SubMessageBody +namespace JT809.Protocol.SubMessageBody { /// /// 上报驾驶员身份识别信息应答消息 diff --git a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x1200_0x120B.cs b/src/JT809.Protocol/SubMessageBody/JT809_0x1200_0x120B.cs similarity index 83% rename from src/JT809.Protocol/JT809SubMessageBody/JT809_0x1200_0x120B.cs rename to src/JT809.Protocol/SubMessageBody/JT809_0x1200_0x120B.cs index 9bc0a67..a45ad0f 100644 --- a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x1200_0x120B.cs +++ b/src/JT809.Protocol/SubMessageBody/JT809_0x1200_0x120B.cs @@ -1,10 +1,10 @@ -using JT809.Protocol.JT809Attributes; -using JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters; +using JT809.Protocol.Attributes; +using JT809.Protocol.Formatters.SubMessageBodyFormatters; using System; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809SubMessageBody +namespace JT809.Protocol.SubMessageBody { /// /// 上报车辆电子运单应答消息 diff --git a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x1200_0x120C.cs b/src/JT809.Protocol/SubMessageBody/JT809_0x1200_0x120C.cs similarity index 84% rename from src/JT809.Protocol/JT809SubMessageBody/JT809_0x1200_0x120C.cs rename to src/JT809.Protocol/SubMessageBody/JT809_0x1200_0x120C.cs index f7d4dbd..b7120c7 100644 --- a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x1200_0x120C.cs +++ b/src/JT809.Protocol/SubMessageBody/JT809_0x1200_0x120C.cs @@ -1,10 +1,10 @@ -using JT809.Protocol.JT809Attributes; -using JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters; +using JT809.Protocol.Attributes; +using JT809.Protocol.Formatters.SubMessageBodyFormatters; using System; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809SubMessageBody +namespace JT809.Protocol.SubMessageBody { /// /// 主动上报驾驶员身份信息消息 diff --git a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x1200_0x120D.cs b/src/JT809.Protocol/SubMessageBody/JT809_0x1200_0x120D.cs similarity index 80% rename from src/JT809.Protocol/JT809SubMessageBody/JT809_0x1200_0x120D.cs rename to src/JT809.Protocol/SubMessageBody/JT809_0x1200_0x120D.cs index 2331630..f10f68b 100644 --- a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x1200_0x120D.cs +++ b/src/JT809.Protocol/SubMessageBody/JT809_0x1200_0x120D.cs @@ -1,10 +1,10 @@ -using JT809.Protocol.JT809Attributes; -using JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters; +using JT809.Protocol.Attributes; +using JT809.Protocol.Formatters.SubMessageBodyFormatters; using System; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809SubMessageBody +namespace JT809.Protocol.SubMessageBody { /// /// 主动上报车辆电子运单信息 diff --git a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x1300_0x1301.cs b/src/JT809.Protocol/SubMessageBody/JT809_0x1300_0x1301.cs similarity index 84% rename from src/JT809.Protocol/JT809SubMessageBody/JT809_0x1300_0x1301.cs rename to src/JT809.Protocol/SubMessageBody/JT809_0x1300_0x1301.cs index f413f82..344008a 100644 --- a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x1300_0x1301.cs +++ b/src/JT809.Protocol/SubMessageBody/JT809_0x1300_0x1301.cs @@ -1,11 +1,11 @@ -using JT809.Protocol.JT809Attributes; -using JT809.Protocol.JT809Enums; -using JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters; +using JT809.Protocol.Attributes; +using JT809.Protocol.Enums; +using JT809.Protocol.Formatters.SubMessageBodyFormatters; using System; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809SubMessageBody +namespace JT809.Protocol.SubMessageBody { /// /// 平台查岗应答消息 diff --git a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x1300_0x1302.cs b/src/JT809.Protocol/SubMessageBody/JT809_0x1300_0x1302.cs similarity index 78% rename from src/JT809.Protocol/JT809SubMessageBody/JT809_0x1300_0x1302.cs rename to src/JT809.Protocol/SubMessageBody/JT809_0x1300_0x1302.cs index 1171e73..2660079 100644 --- a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x1300_0x1302.cs +++ b/src/JT809.Protocol/SubMessageBody/JT809_0x1300_0x1302.cs @@ -1,10 +1,10 @@ -using JT809.Protocol.JT809Attributes; -using JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters; +using JT809.Protocol.Attributes; +using JT809.Protocol.Formatters.SubMessageBodyFormatters; using System; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809SubMessageBody +namespace JT809.Protocol.SubMessageBody { /// /// 下发平台间报文应答消息 diff --git a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x1400_0x1401.cs b/src/JT809.Protocol/SubMessageBody/JT809_0x1400_0x1401.cs similarity index 79% rename from src/JT809.Protocol/JT809SubMessageBody/JT809_0x1400_0x1401.cs rename to src/JT809.Protocol/SubMessageBody/JT809_0x1400_0x1401.cs index 355520c..d7a485d 100644 --- a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x1400_0x1401.cs +++ b/src/JT809.Protocol/SubMessageBody/JT809_0x1400_0x1401.cs @@ -1,11 +1,11 @@ -using JT809.Protocol.JT809Attributes; -using JT809.Protocol.JT809Enums; -using JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters; +using JT809.Protocol.Attributes; +using JT809.Protocol.Enums; +using JT809.Protocol.Formatters.SubMessageBodyFormatters; using System; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809SubMessageBody +namespace JT809.Protocol.SubMessageBody { /// /// 报警督办应答消息 diff --git a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x1400_0x1402.cs b/src/JT809.Protocol/SubMessageBody/JT809_0x1400_0x1402.cs similarity index 86% rename from src/JT809.Protocol/JT809SubMessageBody/JT809_0x1400_0x1402.cs rename to src/JT809.Protocol/SubMessageBody/JT809_0x1400_0x1402.cs index bcc78ce..19bad0a 100644 --- a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x1400_0x1402.cs +++ b/src/JT809.Protocol/SubMessageBody/JT809_0x1400_0x1402.cs @@ -1,11 +1,11 @@ -using JT809.Protocol.JT809Attributes; -using JT809.Protocol.JT809Enums; -using JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters; +using JT809.Protocol.Attributes; +using JT809.Protocol.Enums; +using JT809.Protocol.Formatters.SubMessageBodyFormatters; using System; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809SubMessageBody +namespace JT809.Protocol.SubMessageBody { /// /// 上报报警信息消息 diff --git a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x1400_0x1403.cs b/src/JT809.Protocol/SubMessageBody/JT809_0x1400_0x1403.cs similarity index 79% rename from src/JT809.Protocol/JT809SubMessageBody/JT809_0x1400_0x1403.cs rename to src/JT809.Protocol/SubMessageBody/JT809_0x1400_0x1403.cs index 24e3e6f..813a97d 100644 --- a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x1400_0x1403.cs +++ b/src/JT809.Protocol/SubMessageBody/JT809_0x1400_0x1403.cs @@ -1,11 +1,11 @@ -using JT809.Protocol.JT809Attributes; -using JT809.Protocol.JT809Enums; -using JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters; +using JT809.Protocol.Attributes; +using JT809.Protocol.Enums; +using JT809.Protocol.Formatters.SubMessageBodyFormatters; using System; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809SubMessageBody +namespace JT809.Protocol.SubMessageBody { /// /// 主动上报报警处理结果信息 diff --git a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x1500_0x1501.cs b/src/JT809.Protocol/SubMessageBody/JT809_0x1500_0x1501.cs similarity index 75% rename from src/JT809.Protocol/JT809SubMessageBody/JT809_0x1500_0x1501.cs rename to src/JT809.Protocol/SubMessageBody/JT809_0x1500_0x1501.cs index bd81a4b..5651286 100644 --- a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x1500_0x1501.cs +++ b/src/JT809.Protocol/SubMessageBody/JT809_0x1500_0x1501.cs @@ -1,11 +1,11 @@ -using JT809.Protocol.JT809Attributes; -using JT809.Protocol.JT809Enums; -using JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters; +using JT809.Protocol.Attributes; +using JT809.Protocol.Enums; +using JT809.Protocol.Formatters.SubMessageBodyFormatters; using System; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809SubMessageBody +namespace JT809.Protocol.SubMessageBody { /// /// 车辆单向监听应答 diff --git a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x1500_0x1502.cs b/src/JT809.Protocol/SubMessageBody/JT809_0x1500_0x1502.cs similarity index 86% rename from src/JT809.Protocol/JT809SubMessageBody/JT809_0x1500_0x1502.cs rename to src/JT809.Protocol/SubMessageBody/JT809_0x1500_0x1502.cs index 0d0031c..cfcccb1 100644 --- a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x1500_0x1502.cs +++ b/src/JT809.Protocol/SubMessageBody/JT809_0x1500_0x1502.cs @@ -1,12 +1,12 @@ -using JT809.Protocol.JT809Attributes; -using JT809.Protocol.JT809Enums; -using JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters; -using JT809.Protocol.JT809Properties; +using JT809.Protocol.Attributes; +using JT809.Protocol.Enums; +using JT809.Protocol.Formatters.SubMessageBodyFormatters; +using JT809.Protocol.Metadata; using System; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809SubMessageBody +namespace JT809.Protocol.SubMessageBody { /// /// 车辆拍照应答 diff --git a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x1500_0x1503.cs b/src/JT809.Protocol/SubMessageBody/JT809_0x1500_0x1503.cs similarity index 79% rename from src/JT809.Protocol/JT809SubMessageBody/JT809_0x1500_0x1503.cs rename to src/JT809.Protocol/SubMessageBody/JT809_0x1500_0x1503.cs index 38b3fca..c70fc07 100644 --- a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x1500_0x1503.cs +++ b/src/JT809.Protocol/SubMessageBody/JT809_0x1500_0x1503.cs @@ -1,11 +1,11 @@ -using JT809.Protocol.JT809Attributes; -using JT809.Protocol.JT809Enums; -using JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters; +using JT809.Protocol.Attributes; +using JT809.Protocol.Enums; +using JT809.Protocol.Formatters.SubMessageBodyFormatters; using System; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809SubMessageBody +namespace JT809.Protocol.SubMessageBody { /// /// 下发车辆报文应答消息 diff --git a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x1500_0x1504.cs b/src/JT809.Protocol/SubMessageBody/JT809_0x1500_0x1504.cs similarity index 82% rename from src/JT809.Protocol/JT809SubMessageBody/JT809_0x1500_0x1504.cs rename to src/JT809.Protocol/SubMessageBody/JT809_0x1500_0x1504.cs index 852f4bb..bf1bad5 100644 --- a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x1500_0x1504.cs +++ b/src/JT809.Protocol/SubMessageBody/JT809_0x1500_0x1504.cs @@ -1,11 +1,11 @@ -using JT809.Protocol.JT809Attributes; -using JT809.Protocol.JT809Enums; -using JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters; +using JT809.Protocol.Attributes; +using JT809.Protocol.Enums; +using JT809.Protocol.Formatters.SubMessageBodyFormatters; using System; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809SubMessageBody +namespace JT809.Protocol.SubMessageBody { /// /// 上报车辆行驶记录应答消息 diff --git a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x1500_0x1505.cs b/src/JT809.Protocol/SubMessageBody/JT809_0x1500_0x1505.cs similarity index 76% rename from src/JT809.Protocol/JT809SubMessageBody/JT809_0x1500_0x1505.cs rename to src/JT809.Protocol/SubMessageBody/JT809_0x1500_0x1505.cs index 3039678..36616b1 100644 --- a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x1500_0x1505.cs +++ b/src/JT809.Protocol/SubMessageBody/JT809_0x1500_0x1505.cs @@ -1,11 +1,11 @@ -using JT809.Protocol.JT809Attributes; -using JT809.Protocol.JT809Enums; -using JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters; +using JT809.Protocol.Attributes; +using JT809.Protocol.Enums; +using JT809.Protocol.Formatters.SubMessageBodyFormatters; using System; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809SubMessageBody +namespace JT809.Protocol.SubMessageBody { /// /// 车辆应急接入监管平台应答消息 diff --git a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x1600_0x1601.cs b/src/JT809.Protocol/SubMessageBody/JT809_0x1600_0x1601.cs similarity index 78% rename from src/JT809.Protocol/JT809SubMessageBody/JT809_0x1600_0x1601.cs rename to src/JT809.Protocol/SubMessageBody/JT809_0x1600_0x1601.cs index f7dc5c2..bb8bc37 100644 --- a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x1600_0x1601.cs +++ b/src/JT809.Protocol/SubMessageBody/JT809_0x1600_0x1601.cs @@ -1,10 +1,10 @@ -using JT809.Protocol.JT809Attributes; -using JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters; +using JT809.Protocol.Attributes; +using JT809.Protocol.Formatters.SubMessageBodyFormatters; using System; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809SubMessageBody +namespace JT809.Protocol.SubMessageBody { /// /// 补报车辆静态信息应答 diff --git a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x9200_0x9202.cs b/src/JT809.Protocol/SubMessageBody/JT809_0x9200_0x9202.cs similarity index 80% rename from src/JT809.Protocol/JT809SubMessageBody/JT809_0x9200_0x9202.cs rename to src/JT809.Protocol/SubMessageBody/JT809_0x9200_0x9202.cs index 9e07a46..22df0fa 100644 --- a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x9200_0x9202.cs +++ b/src/JT809.Protocol/SubMessageBody/JT809_0x9200_0x9202.cs @@ -1,11 +1,11 @@ -using JT809.Protocol.JT809Attributes; -using JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters; -using JT809.Protocol.JT809Properties; +using JT809.Protocol.Attributes; +using JT809.Protocol.Formatters.SubMessageBodyFormatters; +using JT809.Protocol.Metadata; using System; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809SubMessageBody +namespace JT809.Protocol.SubMessageBody { /// /// 交换车辆定位信息消息 diff --git a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x9200_0x9203.cs b/src/JT809.Protocol/SubMessageBody/JT809_0x9200_0x9203.cs similarity index 83% rename from src/JT809.Protocol/JT809SubMessageBody/JT809_0x9200_0x9203.cs rename to src/JT809.Protocol/SubMessageBody/JT809_0x9200_0x9203.cs index 3ad22d0..ee0f0d2 100644 --- a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x9200_0x9203.cs +++ b/src/JT809.Protocol/SubMessageBody/JT809_0x9200_0x9203.cs @@ -1,10 +1,10 @@ -using JT809.Protocol.JT809Attributes; -using JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters; +using JT809.Protocol.Attributes; +using JT809.Protocol.Formatters.SubMessageBodyFormatters; using System; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809SubMessageBody +namespace JT809.Protocol.SubMessageBody { /// /// 车辆定位信息交换补发消息 diff --git a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x9200_0x9204.cs b/src/JT809.Protocol/SubMessageBody/JT809_0x9200_0x9204.cs similarity index 81% rename from src/JT809.Protocol/JT809SubMessageBody/JT809_0x9200_0x9204.cs rename to src/JT809.Protocol/SubMessageBody/JT809_0x9200_0x9204.cs index f184d04..c116c24 100644 --- a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x9200_0x9204.cs +++ b/src/JT809.Protocol/SubMessageBody/JT809_0x9200_0x9204.cs @@ -1,10 +1,10 @@ -using JT809.Protocol.JT809Attributes; -using JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters; +using JT809.Protocol.Attributes; +using JT809.Protocol.Formatters.SubMessageBodyFormatters; using System; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809SubMessageBody +namespace JT809.Protocol.SubMessageBody { /// /// 交换车辆静态信息消息 diff --git a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x9200_0x9205.cs b/src/JT809.Protocol/SubMessageBody/JT809_0x9200_0x9205.cs similarity index 81% rename from src/JT809.Protocol/JT809SubMessageBody/JT809_0x9200_0x9205.cs rename to src/JT809.Protocol/SubMessageBody/JT809_0x9200_0x9205.cs index 60e7521..864f0ac 100644 --- a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x9200_0x9205.cs +++ b/src/JT809.Protocol/SubMessageBody/JT809_0x9200_0x9205.cs @@ -1,11 +1,11 @@ -using JT809.Protocol.JT809Attributes; -using JT809.Protocol.JT809Enums; -using JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters; +using JT809.Protocol.Attributes; +using JT809.Protocol.Enums; +using JT809.Protocol.Formatters.SubMessageBodyFormatters; using System; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809SubMessageBody +namespace JT809.Protocol.SubMessageBody { /// /// 启动车辆定位信息交换请求消息 diff --git a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x9200_0x9206.cs b/src/JT809.Protocol/SubMessageBody/JT809_0x9200_0x9206.cs similarity index 81% rename from src/JT809.Protocol/JT809SubMessageBody/JT809_0x9200_0x9206.cs rename to src/JT809.Protocol/SubMessageBody/JT809_0x9200_0x9206.cs index 259af26..75f66be 100644 --- a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x9200_0x9206.cs +++ b/src/JT809.Protocol/SubMessageBody/JT809_0x9200_0x9206.cs @@ -1,11 +1,11 @@ -using JT809.Protocol.JT809Attributes; -using JT809.Protocol.JT809Enums; -using JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters; +using JT809.Protocol.Attributes; +using JT809.Protocol.Enums; +using JT809.Protocol.Formatters.SubMessageBodyFormatters; using System; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809SubMessageBody +namespace JT809.Protocol.SubMessageBody { /// /// 结束车辆定位信息交换请求 diff --git a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x9200_0x9207.cs b/src/JT809.Protocol/SubMessageBody/JT809_0x9200_0x9207.cs similarity index 77% rename from src/JT809.Protocol/JT809SubMessageBody/JT809_0x9200_0x9207.cs rename to src/JT809.Protocol/SubMessageBody/JT809_0x9200_0x9207.cs index 59c6fb1..957bbd2 100644 --- a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x9200_0x9207.cs +++ b/src/JT809.Protocol/SubMessageBody/JT809_0x9200_0x9207.cs @@ -1,11 +1,11 @@ -using JT809.Protocol.JT809Attributes; -using JT809.Protocol.JT809Enums; -using JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters; +using JT809.Protocol.Attributes; +using JT809.Protocol.Enums; +using JT809.Protocol.Formatters.SubMessageBodyFormatters; using System; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809SubMessageBody +namespace JT809.Protocol.SubMessageBody { /// /// 申请交换指定车辆定位信息应答 diff --git a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x9200_0x9208.cs b/src/JT809.Protocol/SubMessageBody/JT809_0x9200_0x9208.cs similarity index 72% rename from src/JT809.Protocol/JT809SubMessageBody/JT809_0x9200_0x9208.cs rename to src/JT809.Protocol/SubMessageBody/JT809_0x9200_0x9208.cs index 7a179cf..a24ef86 100644 --- a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x9200_0x9208.cs +++ b/src/JT809.Protocol/SubMessageBody/JT809_0x9200_0x9208.cs @@ -1,11 +1,11 @@ -using JT809.Protocol.JT809Attributes; -using JT809.Protocol.JT809Enums; -using JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters; +using JT809.Protocol.Attributes; +using JT809.Protocol.Enums; +using JT809.Protocol.Formatters.SubMessageBodyFormatters; using System; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809SubMessageBody +namespace JT809.Protocol.SubMessageBody { /// /// 取消交换指定车辆定位信息应答 diff --git a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x9200_0x9209.cs b/src/JT809.Protocol/SubMessageBody/JT809_0x9200_0x9209.cs similarity index 72% rename from src/JT809.Protocol/JT809SubMessageBody/JT809_0x9200_0x9209.cs rename to src/JT809.Protocol/SubMessageBody/JT809_0x9200_0x9209.cs index f2ec9d0..91cc087 100644 --- a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x9200_0x9209.cs +++ b/src/JT809.Protocol/SubMessageBody/JT809_0x9200_0x9209.cs @@ -1,11 +1,11 @@ -using JT809.Protocol.JT809Attributes; -using JT809.Protocol.JT809Enums; -using JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters; +using JT809.Protocol.Attributes; +using JT809.Protocol.Enums; +using JT809.Protocol.Formatters.SubMessageBodyFormatters; using System; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809SubMessageBody +namespace JT809.Protocol.SubMessageBody { /// /// 取消交换指定车辆定位信息应答 diff --git a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x9200_0x920A.cs b/src/JT809.Protocol/SubMessageBody/JT809_0x9200_0x920A.cs similarity index 87% rename from src/JT809.Protocol/JT809SubMessageBody/JT809_0x9200_0x920A.cs rename to src/JT809.Protocol/SubMessageBody/JT809_0x9200_0x920A.cs index 85d2670..669b9f4 100644 --- a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x9200_0x920A.cs +++ b/src/JT809.Protocol/SubMessageBody/JT809_0x9200_0x920A.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809SubMessageBody +namespace JT809.Protocol.SubMessageBody { /// /// 上报车辆驾驶员身份识别信息请求 diff --git a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x9200_0x920B.cs b/src/JT809.Protocol/SubMessageBody/JT809_0x9200_0x920B.cs similarity index 86% rename from src/JT809.Protocol/JT809SubMessageBody/JT809_0x9200_0x920B.cs rename to src/JT809.Protocol/SubMessageBody/JT809_0x9200_0x920B.cs index bc6d76e..28d7d84 100644 --- a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x9200_0x920B.cs +++ b/src/JT809.Protocol/SubMessageBody/JT809_0x9200_0x920B.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809SubMessageBody +namespace JT809.Protocol.SubMessageBody { /// /// 上报车辆电子运单请求消息 diff --git a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x9300_0x9301.cs b/src/JT809.Protocol/SubMessageBody/JT809_0x9300_0x9301.cs similarity index 84% rename from src/JT809.Protocol/JT809SubMessageBody/JT809_0x9300_0x9301.cs rename to src/JT809.Protocol/SubMessageBody/JT809_0x9300_0x9301.cs index d39933c..53a0279 100644 --- a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x9300_0x9301.cs +++ b/src/JT809.Protocol/SubMessageBody/JT809_0x9300_0x9301.cs @@ -1,11 +1,11 @@ -using JT809.Protocol.JT809Attributes; -using JT809.Protocol.JT809Enums; -using JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters; +using JT809.Protocol.Attributes; +using JT809.Protocol.Enums; +using JT809.Protocol.Formatters.SubMessageBodyFormatters; using System; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809SubMessageBody +namespace JT809.Protocol.SubMessageBody { /// /// 平台查岗请求 diff --git a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x9300_0x9302.cs b/src/JT809.Protocol/SubMessageBody/JT809_0x9300_0x9302.cs similarity index 84% rename from src/JT809.Protocol/JT809SubMessageBody/JT809_0x9300_0x9302.cs rename to src/JT809.Protocol/SubMessageBody/JT809_0x9300_0x9302.cs index fe72dac..78d9bc3 100644 --- a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x9300_0x9302.cs +++ b/src/JT809.Protocol/SubMessageBody/JT809_0x9300_0x9302.cs @@ -1,11 +1,11 @@ -using JT809.Protocol.JT809Attributes; -using JT809.Protocol.JT809Enums; -using JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters; +using JT809.Protocol.Attributes; +using JT809.Protocol.Enums; +using JT809.Protocol.Formatters.SubMessageBodyFormatters; using System; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809SubMessageBody +namespace JT809.Protocol.SubMessageBody { /// /// 下发平台间报文请求 diff --git a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x9400_0x9401.cs b/src/JT809.Protocol/SubMessageBody/JT809_0x9400_0x9401.cs similarity index 89% rename from src/JT809.Protocol/JT809SubMessageBody/JT809_0x9400_0x9401.cs rename to src/JT809.Protocol/SubMessageBody/JT809_0x9400_0x9401.cs index ccff30f..c0adc64 100644 --- a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x9400_0x9401.cs +++ b/src/JT809.Protocol/SubMessageBody/JT809_0x9400_0x9401.cs @@ -1,11 +1,11 @@ -using JT809.Protocol.JT809Attributes; -using JT809.Protocol.JT809Enums; -using JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters; +using JT809.Protocol.Attributes; +using JT809.Protocol.Enums; +using JT809.Protocol.Formatters.SubMessageBodyFormatters; using System; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809SubMessageBody +namespace JT809.Protocol.SubMessageBody { /// /// 报警督办请求消息 diff --git a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x9400_0x9402.cs b/src/JT809.Protocol/SubMessageBody/JT809_0x9400_0x9402.cs similarity index 85% rename from src/JT809.Protocol/JT809SubMessageBody/JT809_0x9400_0x9402.cs rename to src/JT809.Protocol/SubMessageBody/JT809_0x9400_0x9402.cs index f55dbc6..eabbd4f 100644 --- a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x9400_0x9402.cs +++ b/src/JT809.Protocol/SubMessageBody/JT809_0x9400_0x9402.cs @@ -1,11 +1,11 @@ -using JT809.Protocol.JT809Attributes; -using JT809.Protocol.JT809Enums; -using JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters; +using JT809.Protocol.Attributes; +using JT809.Protocol.Enums; +using JT809.Protocol.Formatters.SubMessageBodyFormatters; using System; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809SubMessageBody +namespace JT809.Protocol.SubMessageBody { /// /// 报警预警 diff --git a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x9400_0x9403.cs b/src/JT809.Protocol/SubMessageBody/JT809_0x9400_0x9403.cs similarity index 85% rename from src/JT809.Protocol/JT809SubMessageBody/JT809_0x9400_0x9403.cs rename to src/JT809.Protocol/SubMessageBody/JT809_0x9400_0x9403.cs index 7d5971f..cea2875 100644 --- a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x9400_0x9403.cs +++ b/src/JT809.Protocol/SubMessageBody/JT809_0x9400_0x9403.cs @@ -1,11 +1,11 @@ -using JT809.Protocol.JT809Attributes; -using JT809.Protocol.JT809Enums; -using JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters; +using JT809.Protocol.Attributes; +using JT809.Protocol.Enums; +using JT809.Protocol.Formatters.SubMessageBodyFormatters; using System; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809SubMessageBody +namespace JT809.Protocol.SubMessageBody { /// /// 实时交换报警信息 diff --git a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x9500_0x9501.cs b/src/JT809.Protocol/SubMessageBody/JT809_0x9500_0x9501.cs similarity index 78% rename from src/JT809.Protocol/JT809SubMessageBody/JT809_0x9500_0x9501.cs rename to src/JT809.Protocol/SubMessageBody/JT809_0x9500_0x9501.cs index b92ad4f..92c40fd 100644 --- a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x9500_0x9501.cs +++ b/src/JT809.Protocol/SubMessageBody/JT809_0x9500_0x9501.cs @@ -1,10 +1,10 @@ -using JT809.Protocol.JT809Attributes; -using JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters; +using JT809.Protocol.Attributes; +using JT809.Protocol.Formatters.SubMessageBodyFormatters; using System; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809SubMessageBody +namespace JT809.Protocol.SubMessageBody { /// /// 车辆单向监听请求消息 diff --git a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x9500_0x9502.cs b/src/JT809.Protocol/SubMessageBody/JT809_0x9500_0x9502.cs similarity index 85% rename from src/JT809.Protocol/JT809SubMessageBody/JT809_0x9500_0x9502.cs rename to src/JT809.Protocol/SubMessageBody/JT809_0x9500_0x9502.cs index 12cddbf..71d1323 100644 --- a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x9500_0x9502.cs +++ b/src/JT809.Protocol/SubMessageBody/JT809_0x9500_0x9502.cs @@ -1,10 +1,10 @@ -using JT809.Protocol.JT809Attributes; -using JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters; +using JT809.Protocol.Attributes; +using JT809.Protocol.Formatters.SubMessageBodyFormatters; using System; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809SubMessageBody +namespace JT809.Protocol.SubMessageBody { /// /// 车辆拍照请求消息 diff --git a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x9500_0x9503.cs b/src/JT809.Protocol/SubMessageBody/JT809_0x9500_0x9503.cs similarity index 85% rename from src/JT809.Protocol/JT809SubMessageBody/JT809_0x9500_0x9503.cs rename to src/JT809.Protocol/SubMessageBody/JT809_0x9500_0x9503.cs index 9f58859..cb0998e 100644 --- a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x9500_0x9503.cs +++ b/src/JT809.Protocol/SubMessageBody/JT809_0x9500_0x9503.cs @@ -1,10 +1,10 @@ -using JT809.Protocol.JT809Attributes; -using JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters; +using JT809.Protocol.Attributes; +using JT809.Protocol.Formatters.SubMessageBodyFormatters; using System; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809SubMessageBody +namespace JT809.Protocol.SubMessageBody { /// /// 下发车辆报文请求 diff --git a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x9500_0x9504.cs b/src/JT809.Protocol/SubMessageBody/JT809_0x9500_0x9504.cs similarity index 83% rename from src/JT809.Protocol/JT809SubMessageBody/JT809_0x9500_0x9504.cs rename to src/JT809.Protocol/SubMessageBody/JT809_0x9500_0x9504.cs index e557ffb..99f6c8f 100644 --- a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x9500_0x9504.cs +++ b/src/JT809.Protocol/SubMessageBody/JT809_0x9500_0x9504.cs @@ -1,11 +1,11 @@ -using JT809.Protocol.JT809Attributes; -using JT809.Protocol.JT809Enums; -using JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters; +using JT809.Protocol.Attributes; +using JT809.Protocol.Enums; +using JT809.Protocol.Formatters.SubMessageBodyFormatters; using System; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809SubMessageBody +namespace JT809.Protocol.SubMessageBody { /// /// 上报车辆行驶记录请求消息 diff --git a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x9500_0x9505.cs b/src/JT809.Protocol/SubMessageBody/JT809_0x9500_0x9505.cs similarity index 90% rename from src/JT809.Protocol/JT809SubMessageBody/JT809_0x9500_0x9505.cs rename to src/JT809.Protocol/SubMessageBody/JT809_0x9500_0x9505.cs index cb388a5..e87bfdf 100644 --- a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x9500_0x9505.cs +++ b/src/JT809.Protocol/SubMessageBody/JT809_0x9500_0x9505.cs @@ -1,10 +1,10 @@ -using JT809.Protocol.JT809Attributes; -using JT809.Protocol.JT809Formatters.JT809SubMessageBodyFormatters; +using JT809.Protocol.Attributes; +using JT809.Protocol.Formatters.SubMessageBodyFormatters; using System; using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809SubMessageBody +namespace JT809.Protocol.SubMessageBody { /// /// 车辆应急接入监管平台请求消息 diff --git a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x9600_0x9601.cs b/src/JT809.Protocol/SubMessageBody/JT809_0x9600_0x9601.cs similarity index 91% rename from src/JT809.Protocol/JT809SubMessageBody/JT809_0x9600_0x9601.cs rename to src/JT809.Protocol/SubMessageBody/JT809_0x9600_0x9601.cs index 2ca7d38..cee119d 100644 --- a/src/JT809.Protocol/JT809SubMessageBody/JT809_0x9600_0x9601.cs +++ b/src/JT809.Protocol/SubMessageBody/JT809_0x9600_0x9601.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace JT809.Protocol.JT809SubMessageBody +namespace JT809.Protocol.SubMessageBody { /// /// 补报车辆静态信息请求消息