From 636315ca5484805e7d1d0b704135bd20735b792b Mon Sep 17 00:00:00 2001 From: SmallChi <564952747@qq.com> Date: Mon, 28 Jan 2019 17:35:52 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E4=BD=8D=E7=BD=AE=E5=AE=9E?= =?UTF-8?q?=E6=97=B6=E4=B8=8A=E4=BC=A0=E6=9E=9A=E4=B8=BE=E7=89=B9=E6=80=A7?= =?UTF-8?q?=202.=E5=A2=9E=E5=8A=A0Benchmark=E6=B5=8B=E8=AF=95=203.?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E6=A1=A3=204.=E7=A7=BB=E9=99=A4?= =?UTF-8?q?=E6=97=A0=E7=94=A8=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DownStream/NEControlDownStreamTest.cs | 125 ------------ .../GBNewEnergy.Protocol.Test.csproj | 28 --- .../NEPackageBase.cs | 14 -- .../NEPackageTest.cs | 18 -- .../UpStream/CommonUpStreamTest.cs | 152 -------------- .../UpStream/NELoginUpStreamTest.cs | 67 ------ .../UpStream/NELogoutUpStreamTest.cs | 100 --------- .../UpStream/NEPlatformLoginUpStreamTest.cs | 52 ----- .../UpStream/NEPlatformLogoutUpStreamTest.cs | 67 ------ .../DownStream/NEControlDownStream.cs | 92 --------- .../DownStream/NELoginDownStream.cs | 23 --- .../DownStream/NEQueryDownStream.cs | 38 ---- .../DownStream/NESettingsDownStream.cs | 37 ---- .../Enums/NEAlarmLevel.cs | 18 -- src/GBNewEnergy.Protocol/Enums/NEAskId.cs | 29 --- .../Enums/NEControlCmd.cs | 55 ----- .../Enums/NEEncryptMethod.cs | 19 -- src/GBNewEnergy.Protocol/Enums/NEErrorCode.cs | 22 -- src/GBNewEnergy.Protocol/Enums/NEInfoType.cs | 25 --- src/GBNewEnergy.Protocol/Enums/NEMsgId.cs | 57 ------ .../Exceptions/NEException.cs | 23 --- .../Extensions/EnumExtensions.cs | 135 ------------ .../Extensions/NEExtensions.cs | 139 ------------- .../GBNewEnergy.Protocol.csproj | 30 --- src/GBNewEnergy.Protocol/INEEncrypt.cs | 12 -- src/GBNewEnergy.Protocol/INEParameter.cs | 14 -- src/GBNewEnergy.Protocol/INEProperties.cs | 10 - src/GBNewEnergy.Protocol/NEBodies.cs | 56 ----- src/GBNewEnergy.Protocol/NEBodiesFactory.cs | 43 ---- .../NEBufferedEntityBase.cs | 41 ---- src/GBNewEnergy.Protocol/NEDownStreamBase.cs | 11 - src/GBNewEnergy.Protocol/NEEncryptFactory.cs | 28 --- .../NEEncrypts/Default_NEAES128EncryptImpl.cs | 58 ------ .../NEEncrypts/Default_NERSAEncryptImpl.cs | 193 ------------------ .../Default_NERSAEncryptImpl_NET.cs | 90 -------- .../NEEncrypts/NEAESBase.cs | 14 -- .../NEEncrypts/NERSABase.cs | 45 ---- src/GBNewEnergy.Protocol/NEGlobalConfigs.cs | 27 --- src/GBNewEnergy.Protocol/NEHeader.cs | 40 ---- src/GBNewEnergy.Protocol/NEPackage.cs | 143 ------------- .../NEProperties/NEControlAlarmParameter.cs | 18 -- .../NEProperties/NEControlProperty.cs | 27 --- .../NEProperties/NEControlUpgradeParameter.cs | 57 ------ .../NEProperties/NEEmptyProperty.cs | 14 -- .../NEProperties/NELoginProperty.cs | 19 -- .../NEProperties/NELogoutProperty.cs | 11 - .../NEProperties/NEPackageProperty.cs | 15 -- .../NEProperties/NEPlatformLoginProperty.cs | 27 --- .../NEProperties/NEPlatformLogoutProperty.cs | 16 -- .../NEUploadAlarmProperty.cs | 60 ------ .../NEUploadDrivenElectricalProperty.cs | 63 ------ .../NEUploadEnergyStorageProperty.cs | 60 ------ ...EUploadEnergyStorageTemperatureProperty.cs | 43 ---- .../NEUploadEnginePartProperty.cs | 39 ---- .../NEUploadExtremeProperty.cs | 94 --------- .../NEUploadFuelBatteryProperty.cs | 103 ---------- .../NEUploadProperties/NEUploadProperty.cs | 26 --- .../NEUploadPropertyBase.cs | 12 -- .../NEUploadVehiclePositionProperty.cs | 33 --- .../NEUploadVehicleProperty.cs | 72 ------- src/GBNewEnergy.Protocol/NEUpStreamBase.cs | 14 -- .../UpStream/CommonUpStream.cs | 37 ---- .../UpStream/NELoginUpStream.cs | 106 ---------- .../UpStream/NELogoutUpStream.cs | 50 ----- .../UpStream/NEPlatformLoginUpStream.cs | 88 -------- .../UpStream/NEPlatformLogoutUpStream.cs | 47 ----- .../UpStream/NERealUploadUpStream.cs | 38 ---- src/GBNewEnergy.sln | 56 ----- src/NEEncrypts.Tests/NEEncrypts for linux.png | Bin 85989 -> 0 bytes .../NEEncryptsNET4.Test.csproj | 53 ----- .../NEEncryptsNET4.Test/Program.cs | 46 ----- .../Properties/AssemblyInfo.cs | 36 ---- .../NEEncryptsNET45.Test/App.config | 6 - .../NEEncryptsNET45.Test.csproj | 57 ------ .../NEEncryptsNET45.Test/Program.cs | 45 ---- .../Properties/AssemblyInfo.cs | 36 ---- .../NEEncryptsNETCore.Test.csproj | 12 -- .../NEEncryptsNETCore.Test/Program.cs | 52 ----- 78 files changed, 3778 deletions(-) delete mode 100644 src/GBNewEnergy.Protocol.Test/DownStream/NEControlDownStreamTest.cs delete mode 100644 src/GBNewEnergy.Protocol.Test/GBNewEnergy.Protocol.Test.csproj delete mode 100644 src/GBNewEnergy.Protocol.Test/NEPackageBase.cs delete mode 100644 src/GBNewEnergy.Protocol.Test/NEPackageTest.cs delete mode 100644 src/GBNewEnergy.Protocol.Test/UpStream/CommonUpStreamTest.cs delete mode 100644 src/GBNewEnergy.Protocol.Test/UpStream/NELoginUpStreamTest.cs delete mode 100644 src/GBNewEnergy.Protocol.Test/UpStream/NELogoutUpStreamTest.cs delete mode 100644 src/GBNewEnergy.Protocol.Test/UpStream/NEPlatformLoginUpStreamTest.cs delete mode 100644 src/GBNewEnergy.Protocol.Test/UpStream/NEPlatformLogoutUpStreamTest.cs delete mode 100644 src/GBNewEnergy.Protocol/DownStream/NEControlDownStream.cs delete mode 100644 src/GBNewEnergy.Protocol/DownStream/NELoginDownStream.cs delete mode 100644 src/GBNewEnergy.Protocol/DownStream/NEQueryDownStream.cs delete mode 100644 src/GBNewEnergy.Protocol/DownStream/NESettingsDownStream.cs delete mode 100644 src/GBNewEnergy.Protocol/Enums/NEAlarmLevel.cs delete mode 100644 src/GBNewEnergy.Protocol/Enums/NEAskId.cs delete mode 100644 src/GBNewEnergy.Protocol/Enums/NEControlCmd.cs delete mode 100644 src/GBNewEnergy.Protocol/Enums/NEEncryptMethod.cs delete mode 100644 src/GBNewEnergy.Protocol/Enums/NEErrorCode.cs delete mode 100644 src/GBNewEnergy.Protocol/Enums/NEInfoType.cs delete mode 100644 src/GBNewEnergy.Protocol/Enums/NEMsgId.cs delete mode 100644 src/GBNewEnergy.Protocol/Exceptions/NEException.cs delete mode 100644 src/GBNewEnergy.Protocol/Extensions/EnumExtensions.cs delete mode 100644 src/GBNewEnergy.Protocol/Extensions/NEExtensions.cs delete mode 100644 src/GBNewEnergy.Protocol/GBNewEnergy.Protocol.csproj delete mode 100644 src/GBNewEnergy.Protocol/INEEncrypt.cs delete mode 100644 src/GBNewEnergy.Protocol/INEParameter.cs delete mode 100644 src/GBNewEnergy.Protocol/INEProperties.cs delete mode 100644 src/GBNewEnergy.Protocol/NEBodies.cs delete mode 100644 src/GBNewEnergy.Protocol/NEBodiesFactory.cs delete mode 100644 src/GBNewEnergy.Protocol/NEBufferedEntityBase.cs delete mode 100644 src/GBNewEnergy.Protocol/NEDownStreamBase.cs delete mode 100644 src/GBNewEnergy.Protocol/NEEncryptFactory.cs delete mode 100644 src/GBNewEnergy.Protocol/NEEncrypts/Default_NEAES128EncryptImpl.cs delete mode 100644 src/GBNewEnergy.Protocol/NEEncrypts/Default_NERSAEncryptImpl.cs delete mode 100644 src/GBNewEnergy.Protocol/NEEncrypts/Default_NERSAEncryptImpl_NET.cs delete mode 100644 src/GBNewEnergy.Protocol/NEEncrypts/NEAESBase.cs delete mode 100644 src/GBNewEnergy.Protocol/NEEncrypts/NERSABase.cs delete mode 100644 src/GBNewEnergy.Protocol/NEGlobalConfigs.cs delete mode 100644 src/GBNewEnergy.Protocol/NEHeader.cs delete mode 100644 src/GBNewEnergy.Protocol/NEPackage.cs delete mode 100644 src/GBNewEnergy.Protocol/NEProperties/NEControlAlarmParameter.cs delete mode 100644 src/GBNewEnergy.Protocol/NEProperties/NEControlProperty.cs delete mode 100644 src/GBNewEnergy.Protocol/NEProperties/NEControlUpgradeParameter.cs delete mode 100644 src/GBNewEnergy.Protocol/NEProperties/NEEmptyProperty.cs delete mode 100644 src/GBNewEnergy.Protocol/NEProperties/NELoginProperty.cs delete mode 100644 src/GBNewEnergy.Protocol/NEProperties/NELogoutProperty.cs delete mode 100644 src/GBNewEnergy.Protocol/NEProperties/NEPackageProperty.cs delete mode 100644 src/GBNewEnergy.Protocol/NEProperties/NEPlatformLoginProperty.cs delete mode 100644 src/GBNewEnergy.Protocol/NEProperties/NEPlatformLogoutProperty.cs delete mode 100644 src/GBNewEnergy.Protocol/NEProperties/NEUploadProperties/NEUploadAlarmProperty.cs delete mode 100644 src/GBNewEnergy.Protocol/NEProperties/NEUploadProperties/NEUploadDrivenElectricalProperty.cs delete mode 100644 src/GBNewEnergy.Protocol/NEProperties/NEUploadProperties/NEUploadEnergyStorageProperty.cs delete mode 100644 src/GBNewEnergy.Protocol/NEProperties/NEUploadProperties/NEUploadEnergyStorageTemperatureProperty.cs delete mode 100644 src/GBNewEnergy.Protocol/NEProperties/NEUploadProperties/NEUploadEnginePartProperty.cs delete mode 100644 src/GBNewEnergy.Protocol/NEProperties/NEUploadProperties/NEUploadExtremeProperty.cs delete mode 100644 src/GBNewEnergy.Protocol/NEProperties/NEUploadProperties/NEUploadFuelBatteryProperty.cs delete mode 100644 src/GBNewEnergy.Protocol/NEProperties/NEUploadProperties/NEUploadProperty.cs delete mode 100644 src/GBNewEnergy.Protocol/NEProperties/NEUploadProperties/NEUploadPropertyBase.cs delete mode 100644 src/GBNewEnergy.Protocol/NEProperties/NEUploadProperties/NEUploadVehiclePositionProperty.cs delete mode 100644 src/GBNewEnergy.Protocol/NEProperties/NEUploadProperties/NEUploadVehicleProperty.cs delete mode 100644 src/GBNewEnergy.Protocol/NEUpStreamBase.cs delete mode 100644 src/GBNewEnergy.Protocol/UpStream/CommonUpStream.cs delete mode 100644 src/GBNewEnergy.Protocol/UpStream/NELoginUpStream.cs delete mode 100644 src/GBNewEnergy.Protocol/UpStream/NELogoutUpStream.cs delete mode 100644 src/GBNewEnergy.Protocol/UpStream/NEPlatformLoginUpStream.cs delete mode 100644 src/GBNewEnergy.Protocol/UpStream/NEPlatformLogoutUpStream.cs delete mode 100644 src/GBNewEnergy.Protocol/UpStream/NERealUploadUpStream.cs delete mode 100644 src/GBNewEnergy.sln delete mode 100644 src/NEEncrypts.Tests/NEEncrypts for linux.png delete mode 100644 src/NEEncrypts.Tests/NEEncryptsNET4.Test/NEEncryptsNET4.Test.csproj delete mode 100644 src/NEEncrypts.Tests/NEEncryptsNET4.Test/Program.cs delete mode 100644 src/NEEncrypts.Tests/NEEncryptsNET4.Test/Properties/AssemblyInfo.cs delete mode 100644 src/NEEncrypts.Tests/NEEncryptsNET45.Test/App.config delete mode 100644 src/NEEncrypts.Tests/NEEncryptsNET45.Test/NEEncryptsNET45.Test.csproj delete mode 100644 src/NEEncrypts.Tests/NEEncryptsNET45.Test/Program.cs delete mode 100644 src/NEEncrypts.Tests/NEEncryptsNET45.Test/Properties/AssemblyInfo.cs delete mode 100644 src/NEEncrypts.Tests/NEEncryptsNETCore.Test/NEEncryptsNETCore.Test.csproj delete mode 100644 src/NEEncrypts.Tests/NEEncryptsNETCore.Test/Program.cs diff --git a/src/GBNewEnergy.Protocol.Test/DownStream/NEControlDownStreamTest.cs b/src/GBNewEnergy.Protocol.Test/DownStream/NEControlDownStreamTest.cs deleted file mode 100644 index 0f696bd..0000000 --- a/src/GBNewEnergy.Protocol.Test/DownStream/NEControlDownStreamTest.cs +++ /dev/null @@ -1,125 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; -using Xunit; -using GBNewEnergy.Protocol.Extensions; -using GBNewEnergy.Protocol.NEProperties; -using GBNewEnergy.Protocol.DownStream; -using GBNewEnergy.Protocol.Enums; - -namespace GBNewEnergy.Protocol.Test.DownStream -{ - public class NEControlDownStreamTest : NEPackageBase - { - #region NEControlCmd.unused - [Fact] - public void NEControlDownStreamConstructor4_1() - { - NEControlProperty nEControlProperty = new NEControlProperty - { - VIN = "LGHC4V1D3HE202652", - CmdID=NEControlCmd.unused, - UpgradeParameter=new NEControlUpgradeParameter { - DialPassword = "123", - DialPointName = "xyz", - DialUserName = "11" - } - }; - NEControlDownStream nEControlDownStream = new NEControlDownStream(nEControlProperty, NEGlobalConfigs); - INEProperties nEPackageProperty = new NEPackageProperty - { - Bodies = nEControlDownStream, - MsgId = Enums.NEMsgId.control, - AskId = Enums.NEAskId.cmd, - VIN = "LGHC4V1D3HE202652" - }; - NEPackage nEPackage = new NEPackage(nEPackageProperty, NEGlobalConfigs); - string headerHex = nEPackage.Header.ToHexString(); - string bodiesHex = nEPackage.Bodies.Buffer.ToHexString(); - string packageHex = nEPackage.Buffer.ToHexString(); - } - - [Fact] - public void NEControlDownStreamConstructor4_2() - { - byte[] packageBytes = "23 23 82 FE 4C 47 48 43 34 56 31 44 33 48 45 32 30 32 36 35 32 01 00 07 12 06 0E 0A 0E 1B 00 57".ToHexBytes(); - NEPackage nEPackage = new NEPackage(packageBytes, NEGlobalConfigs); - string headerHex = nEPackage.Header.ToHexString(); - string bodiesHex = nEPackage.Bodies.Buffer.ToHexString(); - string packageHex = nEPackage.Buffer.ToHexString(); - } - #endregion - - #region NEControlCmd.remoteupdate - [Fact] - public void NEControlDownStreamConstructor4_3() - { - NEControlProperty nEControlProperty = new NEControlProperty - { - VIN = "LGHC4V1D3HE202652", - CmdID = NEControlCmd.remoteupdate, - UpgradeParameter=new NEControlUpgradeParameter { - DialPassword = "123", - DialPointName = "xyz", - DialUserName = "11" - } - }; - NEControlDownStream nEControlDownStream = new NEControlDownStream(nEControlProperty, NEGlobalConfigs); - INEProperties nEPackageProperty = new NEPackageProperty - { - Bodies = nEControlDownStream, - MsgId = Enums.NEMsgId.control, - AskId = Enums.NEAskId.cmd, - VIN = "LGHC4V1D3HE202652" - }; - NEPackage nEPackage = new NEPackage(nEPackageProperty, NEGlobalConfigs); - string headerHex = nEPackage.Header.ToHexString(); - string bodiesHex = nEPackage.Bodies.Buffer.ToHexString(); - string packageHex = nEPackage.Buffer.ToHexString(); - } - [Fact] - public void NEControlDownStreamConstructor4_4() - { - byte[] packageBytes = "23 23 82 FE 4C 47 48 43 34 56 31 44 33 48 45 32 30 32 36 35 32 01 00 18 12 06 0E 0A 22 0B 01 3B 78 79 7A 3B 31 31 3B 31 32 33 3B 3B 3B 3B 3B 3B 05".ToHexBytes(); - NEPackage nEPackage = new NEPackage(packageBytes, NEGlobalConfigs); - string headerHex = nEPackage.Header.ToHexString(); - string bodiesHex = nEPackage.Bodies.Buffer.ToHexString(); - string packageHex = nEPackage.Buffer.ToHexString(); - } - #endregion - - #region NEControlCmd.warning - [Fact] - public void NEControlDownStreamConstructor4_5() - { - NEControlProperty nEControlProperty = new NEControlProperty - { - VIN = "LGHC4V1D3HE202652", - CmdID = NEControlCmd.warning, - AlarmParameter= new NEControlAlarmParameter { nEAlarmLevel= NEAlarmLevel.一级报警 } - }; - NEControlDownStream nEControlDownStream = new NEControlDownStream(nEControlProperty, NEGlobalConfigs); - INEProperties nEPackageProperty = new NEPackageProperty - { - Bodies = nEControlDownStream, - MsgId = Enums.NEMsgId.control, - AskId = Enums.NEAskId.cmd, - VIN = "LGHC4V1D3HE202652" - }; - NEPackage nEPackage = new NEPackage(nEPackageProperty, NEGlobalConfigs); - string headerHex = nEPackage.Header.ToHexString(); - string bodiesHex = nEPackage.Bodies.Buffer.ToHexString(); - string packageHex = nEPackage.Buffer.ToHexString(); - } - [Fact] - public void NEControlDownStreamConstructor4_6() - { - byte[] packageBytes = "23 23 82 FE 4C 47 48 43 34 56 31 44 33 48 45 32 30 32 36 35 32 01 00 08 12 06 0E 0B 2C 0B 06 01 6C".ToHexBytes(); - NEPackage nEPackage = new NEPackage(packageBytes, NEGlobalConfigs); - string headerHex = nEPackage.Header.ToHexString(); - string bodiesHex = nEPackage.Bodies.Buffer.ToHexString(); - string packageHex = nEPackage.Buffer.ToHexString(); - } - #endregion - } -} diff --git a/src/GBNewEnergy.Protocol.Test/GBNewEnergy.Protocol.Test.csproj b/src/GBNewEnergy.Protocol.Test/GBNewEnergy.Protocol.Test.csproj deleted file mode 100644 index e53e54e..0000000 --- a/src/GBNewEnergy.Protocol.Test/GBNewEnergy.Protocol.Test.csproj +++ /dev/null @@ -1,28 +0,0 @@ - - - - netcoreapp2.1 - - false - - - - 7.2 - - - - 7.2 - - - - - - - - - - - - - - diff --git a/src/GBNewEnergy.Protocol.Test/NEPackageBase.cs b/src/GBNewEnergy.Protocol.Test/NEPackageBase.cs deleted file mode 100644 index 65b3e46..0000000 --- a/src/GBNewEnergy.Protocol.Test/NEPackageBase.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace GBNewEnergy.Protocol.Test -{ - public class NEPackageBase - { - public readonly NEGlobalConfigs NEGlobalConfigs = new NEGlobalConfigs() - { - - }; - } -} diff --git a/src/GBNewEnergy.Protocol.Test/NEPackageTest.cs b/src/GBNewEnergy.Protocol.Test/NEPackageTest.cs deleted file mode 100644 index 04fb4ad..0000000 --- a/src/GBNewEnergy.Protocol.Test/NEPackageTest.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; -using Xunit; -using GBNewEnergy.Protocol.Extensions; -using GBNewEnergy.Protocol.UpStream; -using GBNewEnergy.Protocol.Enums; -using GBNewEnergy.Protocol.Exceptions; -using GBNewEnergy.Protocol.NEProperties; -using GBNewEnergy.Protocol.DownStream; - -namespace GBNewEnergy.Protocol.Test -{ - public class NEPackageTest: NEPackageBase - { - - } -} diff --git a/src/GBNewEnergy.Protocol.Test/UpStream/CommonUpStreamTest.cs b/src/GBNewEnergy.Protocol.Test/UpStream/CommonUpStreamTest.cs deleted file mode 100644 index c619b43..0000000 --- a/src/GBNewEnergy.Protocol.Test/UpStream/CommonUpStreamTest.cs +++ /dev/null @@ -1,152 +0,0 @@ -using GBNewEnergy.Protocol.NEProperties; -using GBNewEnergy.Protocol.UpStream; -using System; -using System.Collections.Generic; -using System.Text; -using Xunit; -using GBNewEnergy.Protocol.Extensions; - -namespace GBNewEnergy.Protocol.Test.UpStream -{ - public class CommonUpStreamTest: NEPackageBase - { - #region 控制应答 - [Fact] - public void NEControlTest1_1() - { - // "23 23 82 01 4C 47 48 43 34 56 31 44 33 48 45 32 30 32 36 35 32 01 00 06 12 06 0C 0B 21 08 96" - CommonUpStream nEControlDownStream = new CommonUpStream(new NEEmptyProperty(), NEGlobalConfigs); - INEProperties nEPackageProperty = new NEPackageProperty - { - Bodies = nEControlDownStream, - MsgId = Enums.NEMsgId.control, - AskId = Enums.NEAskId.success, - VIN = "LGHC4V1D3HE202652" - }; - NEPackage nEPackage = new NEPackage(nEPackageProperty, NEGlobalConfigs); - string headerHex = nEPackage.Header.ToHexString(); - string bodiesHex = nEPackage.Bodies.Buffer.ToHexString(); - string packageHex = nEPackage.Buffer.ToHexString(); - } - - [Fact] - public void NEControlTest1_2() - { - // "23 23 82 01 4C 47 48 43 34 56 31 44 33 48 45 32 30 32 36 35 32 01 00 06 12 06 0C 0B 21 08 96" - byte[] packageBytes = "23 23 82 01 4C 47 48 43 34 56 31 44 33 48 45 32 30 32 36 35 32 01 00 06 12 06 0C 0B 21 08 96".ToHexBytes(); - NEPackage nEPackage = new NEPackage(packageBytes, NEGlobalConfigs); - string headerHex = nEPackage.Header.ToHexString(); - string bodiesHex = nEPackage.Bodies.Buffer.ToHexString(); - string packageHex = nEPackage.Buffer.ToHexString(); - } - #endregion - - #region 设置应答 - [Fact] - public void NESettingsTest1_1() - { - // "23 23 81 01 4C 47 48 43 34 56 31 44 33 48 45 32 30 32 36 35 32 01 00 06 12 06 0C 0B 23 15 8A" - CommonUpStream nESettingsDownStream = new CommonUpStream(new NEEmptyProperty(), NEGlobalConfigs); - INEProperties nEPackageProperty = new NEPackageProperty - { - Bodies = nESettingsDownStream, - MsgId = Enums.NEMsgId.settings, - AskId = Enums.NEAskId.success, - VIN = "LGHC4V1D3HE202652" - }; - NEPackage nEPackage = new NEPackage(nEPackageProperty, NEGlobalConfigs); - string headerHex = nEPackage.Header.ToHexString(); - string bodiesHex = nEPackage.Bodies.Buffer.ToHexString(); - string packageHex = nEPackage.Buffer.ToHexString(); - } - - [Fact] - public void NESettingsTest1_2() - { - byte[] packageBytes = "23 23 81 01 4C 47 48 43 34 56 31 44 33 48 45 32 30 32 36 35 32 01 00 06 12 06 0C 0B 23 15 8A".ToHexBytes(); - NEPackage nEPackage = new NEPackage(packageBytes, NEGlobalConfigs); - string headerHex = nEPackage.Header.ToHexString(); - string bodiesHex = nEPackage.Bodies.Buffer.ToHexString(); - string packageHex = nEPackage.Buffer.ToHexString(); - } - #endregion - - #region 心跳 - - [Fact] - public void NEHeartbeatTest1_1() - { - // "23 23 81 01 4C 47 48 43 34 56 31 44 33 48 45 32 30 32 36 35 32 01 00 06 12 06 0C 0B 23 15 8A" - CommonUpStream nESettingsDownStream = new CommonUpStream(new NEEmptyProperty(), NEGlobalConfigs); - INEProperties nEPackageProperty = new NEPackageProperty - { - Bodies = nESettingsDownStream, - MsgId = Enums.NEMsgId.heartbeat, - AskId = Enums.NEAskId.cmd, - VIN = "LGHC4V1D3HE202652" - }; - NEPackage nEPackage = new NEPackage(nEPackageProperty, NEGlobalConfigs); - string headerHex = nEPackage.Header.ToHexString(); - string bodiesHex = nEPackage.Bodies.Buffer.ToHexString(); - string packageHex = nEPackage.Buffer.ToHexString(); - } - - [Fact] - public void NEHeartbeatTest1_2() - { - // "23 23 81 01 4C 47 48 43 34 56 31 44 33 48 45 32 30 32 36 35 32 01 00 06 12 06 0C 0B 23 15 8A" - CommonUpStream nESettingsDownStream = new CommonUpStream(new NEEmptyProperty(), NEGlobalConfigs); - INEProperties nEPackageProperty = new NEPackageProperty - { - Bodies = nESettingsDownStream, - MsgId = Enums.NEMsgId.heartbeat, - AskId = Enums.NEAskId.success, - VIN = "LGHC4V1D3HE202652" - }; - NEPackage nEPackage = new NEPackage(nEPackageProperty, NEGlobalConfigs); - string headerHex = nEPackage.Header.ToHexString(); - string bodiesHex = nEPackage.Bodies.Buffer.ToHexString(); - string packageHex = nEPackage.Buffer.ToHexString(); - } - - #endregion - - #region 终端校时 - [Fact] - public void NECheckTimeTest1_1() - { - // "23 23 81 01 4C 47 48 43 34 56 31 44 33 48 45 32 30 32 36 35 32 01 00 06 12 06 0C 0B 23 15 8A" - CommonUpStream nESettingsDownStream = new CommonUpStream(new NEEmptyProperty(), NEGlobalConfigs); - INEProperties nEPackageProperty = new NEPackageProperty - { - Bodies = nESettingsDownStream, - MsgId = Enums.NEMsgId.checktime, - AskId = Enums.NEAskId.cmd, - VIN = "LGHC4V1D3HE202652" - }; - NEPackage nEPackage = new NEPackage(nEPackageProperty, NEGlobalConfigs); - string headerHex = nEPackage.Header.ToHexString(); - string bodiesHex = nEPackage.Bodies.Buffer.ToHexString(); - string packageHex = nEPackage.Buffer.ToHexString(); - } - - [Fact] - public void NECheckTimeTest1_2() - { - // "23 23 81 01 4C 47 48 43 34 56 31 44 33 48 45 32 30 32 36 35 32 01 00 06 12 06 0C 0B 23 15 8A" - CommonUpStream nESettingsDownStream = new CommonUpStream(new NEEmptyProperty(), NEGlobalConfigs); - INEProperties nEPackageProperty = new NEPackageProperty - { - Bodies = nESettingsDownStream, - MsgId = Enums.NEMsgId.checktime, - AskId = Enums.NEAskId.success, - VIN = "LGHC4V1D3HE202652" - }; - NEPackage nEPackage = new NEPackage(nEPackageProperty, NEGlobalConfigs); - string headerHex = nEPackage.Header.ToHexString(); - string bodiesHex = nEPackage.Bodies.Buffer.ToHexString(); - string packageHex = nEPackage.Buffer.ToHexString(); - } - #endregion - } -} diff --git a/src/GBNewEnergy.Protocol.Test/UpStream/NELoginUpStreamTest.cs b/src/GBNewEnergy.Protocol.Test/UpStream/NELoginUpStreamTest.cs deleted file mode 100644 index 68f962a..0000000 --- a/src/GBNewEnergy.Protocol.Test/UpStream/NELoginUpStreamTest.cs +++ /dev/null @@ -1,67 +0,0 @@ -using GBNewEnergy.Protocol.NEProperties; -using GBNewEnergy.Protocol.UpStream; -using GBNewEnergy.Protocol.Extensions; -using System; -using System.Collections.Generic; -using System.Text; -using Xunit; - -namespace GBNewEnergy.Protocol.Test.UpStream -{ - public class NELoginUpStreamTest:NEPackageTest - { - #region 车辆登入 - [Fact] - public void NELoginUpStreamConstructor4_1() - { - // "23 23 01 FE 4C 47 48 43 34 56 31 44 33 48 45 32 30 32 36 35 32 01 00 1F" - // "12 06 08 11 09 14 00 01 36 34 37 34 33 30 36 36 34 30 35 00 00 00 00 00 00 00 00 00 01 01 31" - // "23 23 01 FE 4C 47 48 43 34 56 31 44 33 48 45 32 30 32 36 35 32 01 00 1F 12 06 08 11 09 14 00 01 36 34 37 34 33 30 36 36 34 30 35 00 00 00 00 00 00 00 00 00 01 01 31 DA" - INEProperties nELoginProperty = new NELoginProperty - { - VIN = "LGHC4V1D3HE202652", - BatteryCount = 1, - BatteryLength = 1, - BatteryNos = new List() { "1" }, - SIM = "64743066405" - }; - NELoginUpStream nELoginUpStream = new NELoginUpStream(nELoginProperty, NEGlobalConfigs); - INEProperties nEPackageProperty = new NEPackageProperty - { - Bodies = nELoginUpStream, - MsgId = Enums.NEMsgId.login, - AskId = Enums.NEAskId.cmd, - VIN = "LGHC4V1D3HE202652" - }; - NEPackage nEPackage = new NEPackage(nEPackageProperty, NEGlobalConfigs); - string headerHex = nEPackage.Header.ToHexString(); - string bodiesHex = nEPackage.Bodies.Buffer.ToHexString(); - string packageHex = nEPackage.Buffer.ToHexString(); - } - [Fact] - public void NELoginUpStreamConstructor4_2() - { - // "23 23 01 FE 4C 47 48 43 34 56 31 44 33 48 45 32 30 32 36 35 32 01 00 1F" - // "12 06 07 11 04 1B 00 01 36 34 37 34 33 30 36 36 34 30 35 00 00 00 00 00 00 00 00 00 01 01 31" - // "23 23 01 FE 4C 47 48 43 34 56 31 44 33 48 45 32 30 32 36 35 32 01 00 1F 12 06 07 11 04 1B 00 01 36 34 37 34 33 30 36 36 34 30 35 00 00 00 00 00 00 00 00 00 01 01 31 D7" - byte[] header = "23 23 01 FE 4C 47 48 43 34 56 31 44 33 48 45 32 30 32 36 35 32 01 00 1F".ToHexBytes(); - byte[] body = "12 06 07 11 04 1B 00 01 36 34 37 34 33 30 36 36 34 30 35 00 00 00 00 00 00 00 00 00 01 01 31 D7".ToHexBytes(); - NEPackage nEPackage = new NEPackage(header, body, NEGlobalConfigs); - string headerHex = nEPackage.Header.ToHexString(); - string bodiesHex = nEPackage.Bodies.Buffer.ToHexString(); - string packageHex = nEPackage.Buffer.ToHexString(); - } - [Fact] - public void NELoginUpStreamConstructor4_3() - { - - // "23 23 01 FE 4C 47 48 43 34 56 31 44 33 48 45 32 30 32 36 35 32 01 00 1F 12 06 07 11 04 1B 00 01 36 34 37 34 33 30 36 36 34 30 35 00 00 00 00 00 00 00 00 00 01 01 31 D7" - byte[] packageBytes = "23 23 01 FE 4C 47 48 43 34 56 31 44 33 48 45 32 30 32 36 35 32 01 00 1F 12 06 07 11 04 1B 00 01 36 34 37 34 33 30 36 36 34 30 35 00 00 00 00 00 00 00 00 00 01 01 31 D7".ToHexBytes(); - NEPackage nEPackage = new NEPackage(packageBytes, NEGlobalConfigs); - string headerHex = nEPackage.Header.ToHexString(); - string bodiesHex = nEPackage.Bodies.Buffer.ToHexString(); - string packageHex = nEPackage.Buffer.ToHexString(); - } - #endregion - } -} diff --git a/src/GBNewEnergy.Protocol.Test/UpStream/NELogoutUpStreamTest.cs b/src/GBNewEnergy.Protocol.Test/UpStream/NELogoutUpStreamTest.cs deleted file mode 100644 index c3494fc..0000000 --- a/src/GBNewEnergy.Protocol.Test/UpStream/NELogoutUpStreamTest.cs +++ /dev/null @@ -1,100 +0,0 @@ -using GBNewEnergy.Protocol.NEProperties; -using GBNewEnergy.Protocol.UpStream; -using GBNewEnergy.Protocol.Extensions; -using System; -using System.Collections.Generic; -using System.Text; -using Xunit; -using GBNewEnergy.Protocol.Exceptions; -using GBNewEnergy.Protocol.Enums; - -namespace GBNewEnergy.Protocol.Test.UpStream -{ - public class NELogoutUpStreamTest:NEPackageBase - { - #region 车辆登出(依赖车辆登入的流水号所有必须先进行登入产生流水号) - - [Fact] - public void NELogoutUpStream1_1() - { - try - { - INEProperties nELogoutProperty = new NELogoutProperty() - { - VIN = "LGHC4V1D3HE202652" - }; - NELogoutUpStream nELogoutUpStream1 = new NELogoutUpStream(nELogoutProperty, NEGlobalConfigs); - INEProperties nEPackageProperty1 = new NEPackageProperty - { - Bodies = nELogoutUpStream1, - MsgId = Enums.NEMsgId.login, - AskId = Enums.NEAskId.cmd, - VIN = "LGHC4V1D3HE202652" - }; - NEPackage nEPackage = new NEPackage(nEPackageProperty1, NEGlobalConfigs); - string headerHex = nEPackage.Header.ToHexString(); - string bodiesHex = nEPackage.Bodies.Buffer.ToHexString(); - string packageHex = nEPackage.Buffer.ToHexString(); - } - catch (NEException ex) - { - Assert.Equal(NEErrorCode.LoginSerialNoError, ex.ErrorCode); - } - } - - [Fact] - public void NELogoutUpStream2_1() - { - INEProperties nELoginProperty = new NELoginProperty - { - VIN = "LGHC4V1D3HE202652", - BatteryCount = 1, - BatteryLength = 1, - BatteryNos = new List() { "1" }, - SIM = "64743066405" - }; - NELoginUpStream nELoginUpStream = new NELoginUpStream(nELoginProperty, NEGlobalConfigs); - INEProperties nEPackageProperty = new NEPackageProperty - { - Bodies = nELoginUpStream, - MsgId = Enums.NEMsgId.login, - AskId = Enums.NEAskId.cmd, - VIN = "LGHC4V1D3HE202652" - }; - NEPackage nEPackageLogin = new NEPackage(nEPackageProperty, NEGlobalConfigs); - INEProperties nELogoutProperty = new NELogoutProperty() - { - VIN = "LGHC4V1D3HE202652" - }; - NELogoutUpStream nELogoutUpStream1 = new NELogoutUpStream(nELogoutProperty, NEGlobalConfigs); - INEProperties nEPackageProperty1 = new NEPackageProperty - { - Bodies = nELogoutUpStream1, - MsgId = Enums.NEMsgId.loginout, - AskId = Enums.NEAskId.cmd, - VIN = "LGHC4V1D3HE202652" - }; - NEPackage nEPackage = new NEPackage(nEPackageProperty1, NEGlobalConfigs); - // "23 23 05 FE 4C 47 48 43 34 56 31 44 33 48 45 32 30 32 36 35 32 01 00 08" - // "12 06 08 12 06 3A 00 01" - // "23 23 05 FE 4C 47 48 43 34 56 31 44 33 48 45 32 30 32 36 35 32 01 00 08 12 06 08 12 06 3A 00 01 E9" - string headerHex = nEPackage.Header.ToHexString(); - string bodiesHex = nEPackage.Bodies.Buffer.ToHexString(); - string packageHex = nEPackage.Buffer.ToHexString(); - } - - [Fact] - public void NELogoutUpStream2_2() - { - byte[] packageBytes = "23 23 05 FE 4C 47 48 43 34 56 31 44 33 48 45 32 30 32 36 35 32 01 00 08 12 06 08 12 06 3A 00 01 E9".ToHexBytes(); - NEPackage nEPackage = new NEPackage(packageBytes, NEGlobalConfigs); - string headerHex = nEPackage.Header.ToHexString(); - string bodiesHex = nEPackage.Bodies.Buffer.ToHexString(); - string packageHex = nEPackage.Buffer.ToHexString(); - Assert.Equal("23 23 05 FE 4C 47 48 43 34 56 31 44 33 48 45 32 30 32 36 35 32 01 00 08", headerHex); - Assert.Equal("12 06 08 12 06 3A 00 01 E9", bodiesHex); - } - - #endregion - } -} diff --git a/src/GBNewEnergy.Protocol.Test/UpStream/NEPlatformLoginUpStreamTest.cs b/src/GBNewEnergy.Protocol.Test/UpStream/NEPlatformLoginUpStreamTest.cs deleted file mode 100644 index 0372d20..0000000 --- a/src/GBNewEnergy.Protocol.Test/UpStream/NEPlatformLoginUpStreamTest.cs +++ /dev/null @@ -1,52 +0,0 @@ -using GBNewEnergy.Protocol.NEProperties; -using GBNewEnergy.Protocol.UpStream; -using GBNewEnergy.Protocol.Extensions; -using System; -using System.Collections.Generic; -using System.Text; -using Xunit; -using GBNewEnergy.Protocol.Enums; - -namespace GBNewEnergy.Protocol.Test.UpStream -{ - public class NEPlatformLoginUpStreamTest:NEPackageBase - { - #region 平台登入 - - [Fact] - public void NEPlatformLogin1_1() - { - // "23 23 05 FE 4C 47 48 43 34 56 31 44 33 48 45 32 30 32 36 35 32 01 00 29 12 06 0C 09 2F 12 00 01 00 00 00 00 73 6D 61 6C 6C 63 68 69 31 32 33 34 35 36 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01 CD" - NEPlatformLoginProperty nEPlatformLoginProperty = new NEPlatformLoginProperty - { - EncryptMethod = NEEncryptMethod.None, - Password = "123456", - UserName = "smallchi", - }; - NEPlatformLoginUpStream nEPlatformLoginUpStream = new NEPlatformLoginUpStream(nEPlatformLoginProperty, NEGlobalConfigs); - INEProperties nEPackageProperty = new NEPackageProperty - { - Bodies = nEPlatformLoginUpStream, - MsgId = Enums.NEMsgId.platformlogin, - AskId = Enums.NEAskId.cmd, - VIN = "LGHC4V1D3HE202652" - }; - NEPackage nEPackage = new NEPackage(nEPackageProperty, NEGlobalConfigs); - string headerHex = nEPackage.Header.ToHexString(); - string bodiesHex = nEPackage.Bodies.Buffer.ToHexString(); - string packageHex = nEPackage.Buffer.ToHexString(); - } - - [Fact] - public void NEPlatformLogin1_2() - { - byte[] packageBytes = "23 23 05 FE 4C 47 48 43 34 56 31 44 33 48 45 32 30 32 36 35 32 01 00 29 12 06 0C 09 2F 12 00 01 00 00 00 00 73 6D 61 6C 6C 63 68 69 31 32 33 34 35 36 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01 CD".ToHexBytes(); - NEPackage nEPackage = new NEPackage(packageBytes, NEGlobalConfigs); - string headerHex = nEPackage.Header.ToHexString(); - string bodiesHex = nEPackage.Bodies.Buffer.ToHexString(); - string packageHex = nEPackage.Buffer.ToHexString(); - } - - #endregion - } -} diff --git a/src/GBNewEnergy.Protocol.Test/UpStream/NEPlatformLogoutUpStreamTest.cs b/src/GBNewEnergy.Protocol.Test/UpStream/NEPlatformLogoutUpStreamTest.cs deleted file mode 100644 index a80958d..0000000 --- a/src/GBNewEnergy.Protocol.Test/UpStream/NEPlatformLogoutUpStreamTest.cs +++ /dev/null @@ -1,67 +0,0 @@ -using GBNewEnergy.Protocol.NEProperties; -using GBNewEnergy.Protocol.UpStream; -using GBNewEnergy.Protocol.Extensions; -using System; -using System.Collections.Generic; -using System.Text; -using Xunit; -using GBNewEnergy.Protocol.Enums; - -namespace GBNewEnergy.Protocol.Test.UpStream -{ - public class NEPlatformLogoutUpStreamTest : NEPackageBase - { - - #region 平台登出(依赖平台登出的流水号所有必须先进行登入产生流水号) - - [Fact] - public void NEPlatformLogin2_1() - { - //"23 23 06 FE 4C 47 48 43 34 56 31 44 33 48 45 32 30 32 36 35 32 01 00 29 12 06 0C 09 3A 17 00 01 00 00 00 00 73 6D 61 6C 6C 63 68 69 31 32 33 34 35 36 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01 DE" - NEPlatformLoginProperty nEPlatformLoginProperty = new NEPlatformLoginProperty - { - EncryptMethod = NEEncryptMethod.None, - Password = "123456", - UserName = "smallchi", - }; - NEPlatformLoginUpStream nEPlatformLoginUpStream = new NEPlatformLoginUpStream(nEPlatformLoginProperty, NEGlobalConfigs); - INEProperties nEPackageProperty = new NEPackageProperty - { - Bodies = nEPlatformLoginUpStream, - MsgId = Enums.NEMsgId.platformlogin, - AskId = Enums.NEAskId.cmd, - VIN = "LGHC4V1D3HE202652" - }; - NEPackage nEPackage = new NEPackage(nEPackageProperty, NEGlobalConfigs); - - NEPlatformLogoutProperty nEPlatformLogoutProperty = new NEPlatformLogoutProperty - { - UserName = "smallchi", - }; - NEPlatformLoginUpStream nEPlatformLogoutUpStream = new NEPlatformLoginUpStream(nEPlatformLoginProperty, NEGlobalConfigs); - INEProperties logoutNEPackageProperty = new NEPackageProperty - { - Bodies = nEPlatformLogoutUpStream, - MsgId = Enums.NEMsgId.platformlogout, - AskId = Enums.NEAskId.cmd, - VIN = "LGHC4V1D3HE202652" - }; - NEPackage loginNEPackage = new NEPackage(logoutNEPackageProperty, NEGlobalConfigs); - string headerHex = loginNEPackage.Header.ToHexString(); - string bodiesHex = loginNEPackage.Bodies.Buffer.ToHexString(); - string packageHex = loginNEPackage.Buffer.ToHexString(); - } - - [Fact] - public void NEPlatformLogin2_2() - { - byte[] packageBytes = "23 23 06 FE 4C 47 48 43 34 56 31 44 33 48 45 32 30 32 36 35 32 01 00 29 12 06 0C 09 3A 17 00 01 00 00 00 00 73 6D 61 6C 6C 63 68 69 31 32 33 34 35 36 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01 DE".ToHexBytes(); - NEPackage loginNEPackage = new NEPackage(packageBytes, NEGlobalConfigs); - string headerHex = loginNEPackage.Header.ToHexString(); - string bodiesHex = loginNEPackage.Bodies.Buffer.ToHexString(); - string packageHex = loginNEPackage.Buffer.ToHexString(); - } - - #endregion - } -} diff --git a/src/GBNewEnergy.Protocol/DownStream/NEControlDownStream.cs b/src/GBNewEnergy.Protocol/DownStream/NEControlDownStream.cs deleted file mode 100644 index 56e1e3a..0000000 --- a/src/GBNewEnergy.Protocol/DownStream/NEControlDownStream.cs +++ /dev/null @@ -1,92 +0,0 @@ -using GBNewEnergy.Protocol.Enums; -using GBNewEnergy.Protocol.Extensions; -using GBNewEnergy.Protocol.NEProperties; -using System; -using System.Collections.Generic; -using System.Text; - -namespace GBNewEnergy.Protocol.DownStream -{ - /// - /// 车载终端控制命令 - /// - public class NEControlDownStream : NEBodies - { - public NEControlDownStream(byte[] buffer, NEGlobalConfigs nEConfigs) : base(buffer, nEConfigs) - { - } - - public NEControlDownStream(INEProperties nEProperties, NEGlobalConfigs nEConfigs) : base(nEProperties, nEConfigs) - { - } - /// - /// 命令ID 只能发送一个 - /// - public NEControlCmd CmdID { get; set; } - /// - /// 命令参数 没有内容则内容为空 - /// - public string CmdParameter { get; set; } - protected override void InitializeProperties(INEProperties nEProperties) - { - NEControlProperty nEControlProperty = (NEControlProperty)nEProperties; - CmdID = nEControlProperty.CmdID; - if (CmdID == NEControlCmd.remoteupdate) - { - CmdParameter = nEControlProperty.UpgradeParameter.ToString(); - } - else if(CmdID == NEControlCmd.warning) - { - CmdParameter = nEControlProperty.AlarmParameter.nEAlarmLevel.ToString(); - } - } - - protected override void InitializePropertiesFromBuffer() - { - CurrentDateTime = Buffer.ReadDateTimeLittle(0, 6); - CmdID = (NEControlCmd)Buffer[6]; - switch (CmdID) - { - case NEControlCmd.remoteupdate: - CmdParameter = Buffer.ReadStringLittle(7, Buffer.Length - 8);//最后一位为校验码，不在参数列 - break; - case NEControlCmd.warning: - CmdParameter = ((NEAlarmLevel)Buffer[7]).ToString(); - break; - case NEControlCmd.unused: - case NEControlCmd.shutdown: - case NEControlCmd.reset: - case NEControlCmd.restorefactorysettings: - case NEControlCmd.interruptrequest: - case NEControlCmd.OpenMonitoring: - default: - break; - } - } - - - protected override void ToBuffer() - { - if (CmdID == NEControlCmd.remoteupdate) - { - var contentLength = NEConfigs.NEEncoding.GetBytes(CmdParameter).Length; - Buffer = new byte[6 + 1 + contentLength]; - Buffer.WriteLittle(CurrentDateTime, 0, 6); - Buffer.WriteLittle(CmdID.ToByteValue(), 6); - Buffer.WriteLittle(CmdParameter, 7); - } - else if (CmdID == NEControlCmd.warning) { - Buffer = new byte[6 + 1 + 1]; - Buffer.WriteLittle(CurrentDateTime, 0, 6); - Buffer.WriteLittle(CmdID.ToByteValue(), 6); - Buffer.WriteLittle(CmdParameter.ToEnum().ToByteValue(), 7); - } - else - { - Buffer = new byte[6 + 1]; - Buffer.WriteLittle(CurrentDateTime, 0, 6); - Buffer.WriteLittle(CmdID.ToByteValue(), 6); - } - } - } -} diff --git a/src/GBNewEnergy.Protocol/DownStream/NELoginDownStream.cs b/src/GBNewEnergy.Protocol/DownStream/NELoginDownStream.cs deleted file mode 100644 index f38071d..0000000 --- a/src/GBNewEnergy.Protocol/DownStream/NELoginDownStream.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace GBNewEnergy.Protocol.Response -{ - public class NELoginDownStream : NEBodies - { - protected NELoginDownStream(byte[] buffer) : base(buffer) - { - } - - protected NELoginDownStream(string vin) : base(vin) - { - - } - - public override void ToBuffer() - { - throw new NotImplementedException(); - } - } -} diff --git a/src/GBNewEnergy.Protocol/DownStream/NEQueryDownStream.cs b/src/GBNewEnergy.Protocol/DownStream/NEQueryDownStream.cs deleted file mode 100644 index d4820f1..0000000 --- a/src/GBNewEnergy.Protocol/DownStream/NEQueryDownStream.cs +++ /dev/null @@ -1,38 +0,0 @@ -using GBNewEnergy.Protocol.Extensions; -using GBNewEnergy.Protocol.NEProperties; -using System; -using System.Collections.Generic; -using System.Text; - -namespace GBNewEnergy.Protocol.DownStream -{ - /// - /// 查询命令 - /// - public class NEQueryDownStream : NEBodies - { - public NEQueryDownStream(byte[] buffer, NEGlobalConfigs nEConfigs) : base(buffer, nEConfigs) - { - } - - public NEQueryDownStream(INEProperties nEProperties, NEGlobalConfigs nEConfigs) : base(nEProperties, nEConfigs) - { - } - - protected override void InitializeProperties(INEProperties nEProperties) - { - - } - - protected override void InitializePropertiesFromBuffer() - { - CurrentDateTime = Buffer.ReadDateTimeLittle(0, 6); - } - - protected override void ToBuffer() - { - Buffer = new byte[6]; - Buffer.WriteLittle(CurrentDateTime, 0, 6); - } - } -} diff --git a/src/GBNewEnergy.Protocol/DownStream/NESettingsDownStream.cs b/src/GBNewEnergy.Protocol/DownStream/NESettingsDownStream.cs deleted file mode 100644 index 50eaa42..0000000 --- a/src/GBNewEnergy.Protocol/DownStream/NESettingsDownStream.cs +++ /dev/null @@ -1,37 +0,0 @@ -using GBNewEnergy.Protocol.Extensions; -using System; -using System.Collections.Generic; -using System.Text; - -namespace GBNewEnergy.Protocol.DownStream -{ - /// - /// 设置命令 - /// - public class NESettingsDownStream : NEBodies - { - public NESettingsDownStream(byte[] buffer, NEGlobalConfigs nEConfigs) : base(buffer, nEConfigs) - { - } - - public NESettingsDownStream(INEProperties nEProperties, NEGlobalConfigs nEConfigs) : base(nEProperties, nEConfigs) - { - } - - protected override void InitializeProperties(INEProperties nEProperties) - { - - } - - protected override void InitializePropertiesFromBuffer() - { - CurrentDateTime = Buffer.ReadDateTimeLittle(0, 6); - } - - protected override void ToBuffer() - { - Buffer = new byte[6]; - Buffer.WriteLittle(CurrentDateTime, 0, 6); - } - } -} diff --git a/src/GBNewEnergy.Protocol/Enums/NEAlarmLevel.cs b/src/GBNewEnergy.Protocol/Enums/NEAlarmLevel.cs deleted file mode 100644 index 37c9ee6..0000000 --- a/src/GBNewEnergy.Protocol/Enums/NEAlarmLevel.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace GBNewEnergy.Protocol.Enums -{ - /// - /// 报警等级 - /// - public enum NEAlarmLevel:byte - { - 无报警 = 0x00, - 一级报警 = 0x01, - 二级报警 = 0x02, - 三级报警 = 0x03, - 无效数据 = 0xFF - } -} diff --git a/src/GBNewEnergy.Protocol/Enums/NEAskId.cs b/src/GBNewEnergy.Protocol/Enums/NEAskId.cs deleted file mode 100644 index b6b5a6f..0000000 --- a/src/GBNewEnergy.Protocol/Enums/NEAskId.cs +++ /dev/null @@ -1,29 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace GBNewEnergy.Protocol.Enums -{ - /// - /// 应答标志 - /// - public enum NEAskId:byte - { - /// - /// 接收到的信息正确 - /// - success=0x01, - /// - /// 设置未成功 - /// - error=0x02, - /// - /// VIN重复错误 - /// - vin_repeat_error=0x03, - /// - /// 数据包为命令包，而非应答包 - /// - cmd=0xFE - } -} diff --git a/src/GBNewEnergy.Protocol/Enums/NEControlCmd.cs b/src/GBNewEnergy.Protocol/Enums/NEControlCmd.cs deleted file mode 100644 index 8dfdcb1..0000000 --- a/src/GBNewEnergy.Protocol/Enums/NEControlCmd.cs +++ /dev/null @@ -1,55 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace GBNewEnergy.Protocol.Enums -{ - /// - /// 车载终端控制命令枚举 - /// 0x80-0x7F 预留 - /// 0x80-0xFE 用户自定义 - /// - public enum NEControlCmd:byte - { - /// - /// 未用 - /// - unused= 0x00, - /// - /// 远程升级 见表B.16 - /// - remoteupdate = 0x01, - /// - /// 车载终端关机 - /// - shutdown = 0x02, - /// - /// 车载终端复位 - /// - reset = 0x03, - /// - /// 车载终端恢复出厂设置，其中包括本地存储时间周期、心跳发送时间周期、终端应答超时时间等等 - /// - restorefactorysettings = 0x04, - /// - /// 断开数据通信链路 - /// - interruptrequest = 0x05, - /// - /// 车载终端报警/预警，报警命令参数数据格式和定义见表B.17 - /// - warning = 0x06, - /// - /// 开启抽样检测链路 - /// - OpenMonitoring = 0x07, - - - - - - - - - } -} diff --git a/src/GBNewEnergy.Protocol/Enums/NEEncryptMethod.cs b/src/GBNewEnergy.Protocol/Enums/NEEncryptMethod.cs deleted file mode 100644 index 03b4d09..0000000 --- a/src/GBNewEnergy.Protocol/Enums/NEEncryptMethod.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace GBNewEnergy.Protocol.Enums -{ - /// - /// 数据单元加密方式 - /// 0x01：数据不加密；0x02：数据经过 RSA 算法加密；0x03:数据经过 AES128 位算法加密；“0xFE”表示异常，“0xFF”表示无效 - /// - public enum NEEncryptMethod:byte - { - None= 0x01, - RSA= 0x02, - AES128=0x03, - Exception = 0xFE, - Invalid= 0xFF - } -} diff --git a/src/GBNewEnergy.Protocol/Enums/NEErrorCode.cs b/src/GBNewEnergy.Protocol/Enums/NEErrorCode.cs deleted file mode 100644 index 1b98a28..0000000 --- a/src/GBNewEnergy.Protocol/Enums/NEErrorCode.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace GBNewEnergy.Protocol.Enums -{ - public enum NEErrorCode - { - /// - /// 开始标识错误 - /// - BeginFlagError = 1001, - /// - /// BCC校验错误 - /// - BCCCodeError = 1002, - /// - /// 登入流水号错误 - /// - LoginSerialNoError=1003 - } -} diff --git a/src/GBNewEnergy.Protocol/Enums/NEInfoType.cs b/src/GBNewEnergy.Protocol/Enums/NEInfoType.cs deleted file mode 100644 index 1b614e7..0000000 --- a/src/GBNewEnergy.Protocol/Enums/NEInfoType.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace GBNewEnergy.Protocol.Enums -{ - /// - /// 信息类型标志 - /// - public enum NEInfoType:byte - { - 整车数据=0x01, - 驱动电机数据=0x02, - 燃料电池数据=0x03, - 发动机数据=0x04, - 车辆位置数据=0x05, - 极值数据=0x06, - 报警数据=0x07, - 可充电储能装置电压数据=0x08, - 可充电储能装置温度数据 = 0x09, - 平台交换协议自定义数据 =0x0A, - 预留=0x30, - 用户自定义=0x80 - } -} diff --git a/src/GBNewEnergy.Protocol/Enums/NEMsgId.cs b/src/GBNewEnergy.Protocol/Enums/NEMsgId.cs deleted file mode 100644 index 25bd2e6..0000000 --- a/src/GBNewEnergy.Protocol/Enums/NEMsgId.cs +++ /dev/null @@ -1,57 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace GBNewEnergy.Protocol.Enums -{ - /// - /// 命令单元 - /// - public enum NEMsgId:byte - { - /// - /// 车辆登入 - /// - login = 0x01, - /// - /// 实时信息上传 - /// - uploadim = 0x02, - /// - /// 补传信息上传 - /// - uploadsup = 0x03, - /// - /// 车辆登出 - /// - loginout = 0x04, - /// - /// 平台登入 - /// - platformlogin = 0x05, - /// - /// 平台登出 - /// - platformlogout = 0x06, - /// - /// 心跳 - /// - heartbeat = 0x07, - /// - /// 终端校时 - /// - checktime = 0x08, - /// - /// 查询命令 - /// - query = 0x80, - /// - /// 设置命令 - /// - settings = 0x81, - /// - /// 控制命令 - /// - control = 0x82 - } -} diff --git a/src/GBNewEnergy.Protocol/Exceptions/NEException.cs b/src/GBNewEnergy.Protocol/Exceptions/NEException.cs deleted file mode 100644 index 748a9d8..0000000 --- a/src/GBNewEnergy.Protocol/Exceptions/NEException.cs +++ /dev/null @@ -1,23 +0,0 @@ -using GBNewEnergy.Protocol.Enums; -using System; -using System.Collections.Generic; -using System.Text; - -namespace GBNewEnergy.Protocol.Exceptions -{ - public class NEException:Exception - { - public NEException(NEErrorCode errorCode) : base(errorCode.ToString()) - { - this.ErrorCode = errorCode; - } - - public NEException(NEErrorCode errorCode, string message) : base(message) - { - this.ErrorCode = errorCode; - } - - - public NEErrorCode ErrorCode { get; } - } -} diff --git a/src/GBNewEnergy.Protocol/Extensions/EnumExtensions.cs b/src/GBNewEnergy.Protocol/Extensions/EnumExtensions.cs deleted file mode 100644 index 9ab863f..0000000 --- a/src/GBNewEnergy.Protocol/Extensions/EnumExtensions.cs +++ /dev/null @@ -1,135 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Reflection; - -namespace GBNewEnergy.Protocol.Extensions -{ - /// - /// 枚举扩展 - /// - internal static class EnumExtensions - { - /// - /// 转为整型 - /// - /// - /// - /// - public static int ToValue(this T t) where T : struct - { - return Convert.ToInt32(t); - } - /// - /// 转为Byte - /// - /// - /// - /// - public static byte ToByteValue(this T t) where T : struct - { - return Convert.ToByte(t); - } - - /// - /// 字符转枚举 - /// - /// - /// - /// - public static T ToEnum(this string value) where T : struct - { - return (T)Enum.Parse(typeof(T), value); - } - - /// - /// 获取枚举字符串 - /// - /// - public static string GetName(this Enum valueEnum) - { - return valueEnum.ToString(); - } - - /// - /// 获取DescriptionAttribute特性枚举值的描述 - /// - /// - /// - public static string GetDescription(this Enum value) - { - var attribute = value.GetAttribute(); - return attribute == null ? value.ToString() : attribute.Description; - } - - /// - /// 验证是否是枚举类型 - /// - /// - /// - /// - public static bool IsEnumValid(this int enumValue) - { - return Enum.IsDefined(typeof(TEnum), enumValue); - } - - /// - /// 获取DescriptionAttribute特性枚举及描述 - /// - /// - /// - public static Dictionary GetDescriptionAttributeDictionary(this Enum value) - { - Dictionary dictionary = new Dictionary(); - var fields = value.GetType().GetFields(BindingFlags.Static | BindingFlags.Public); - foreach (var fi in fields) - { - DescriptionAttribute attr = Attribute.GetCustomAttribute(fi, typeof(DescriptionAttribute), false) as DescriptionAttribute; - dictionary.Add(fi.Name, attr != null ? attr.Description : ""); - } - return dictionary; - } - - /// - /// 获取DisplayNameAttribute特性枚举值的描述 - /// - /// 枚举值 - /// - public static string GetDisplayName(this Enum value) - { - var attribute = value.GetAttribute(); - return attribute == null ? value.ToString() : attribute.DisplayName; - } - - /// - /// 获取DisplayNameAttribute特性枚举及描述 - /// - /// - /// - public static Dictionary GetDisplayNameAttributeDictionary(this Enum value) - { - Dictionary dictionary = new Dictionary(); - var fields = value.GetType().GetFields(BindingFlags.Static | BindingFlags.Public); - foreach (var fi in fields) - { - DisplayNameAttribute attr = Attribute.GetCustomAttribute(fi, typeof(DisplayNameAttribute), false) as DisplayNameAttribute; - dictionary.Add(fi.Name, attr != null ? attr.DisplayName : ""); - } - return dictionary; - } - - /// - /// 获取枚举对应特性 - /// - /// - /// - /// - public static T GetAttribute(this Enum value) where T : Attribute - { - var type = value.GetType(); - var memberInfo = type.GetMember(value.ToString()); - var attributes = memberInfo[0].GetCustomAttributes(typeof(T), false); - return (T)attributes[0]; - } - } -} diff --git a/src/GBNewEnergy.Protocol/Extensions/NEExtensions.cs b/src/GBNewEnergy.Protocol/Extensions/NEExtensions.cs deleted file mode 100644 index 0f4260f..0000000 --- a/src/GBNewEnergy.Protocol/Extensions/NEExtensions.cs +++ /dev/null @@ -1,139 +0,0 @@ -using System; -using System.IO; -using System.Linq; -using System.Text; - -namespace GBNewEnergy.Protocol.Extensions -{ - public static class NEExtensions - { - /// - /// 日期限制于2000年 - /// - private const int DateLimitYear = 2000; - - public static DateTime ReadDateTimeLittle(this byte[] read,int offset, int len) - { - return new DateTime( - read[offset++] + DateLimitYear, - read[offset++], - read[offset++], - read[offset++], - read[offset++], - read[offset++]); - } - - public static ushort ReadUShortH2LLittle(this byte[] read, int offset, int len) - { - int result = 0; - for (int i = offset; i < offset + len; i++) - { - result += read[i] * (int)Math.Pow(256, len + offset - i - 1); - } - return (ushort)result; - } - - public static string ReadStringLittle(this byte[] read, int offset, int len,Encoding coding) - { - return coding.GetString(read, offset, len).Trim('\0'); - } - - public static string ReadStringLittle(this byte[] read, int offset, int len) - { - return Encoding.ASCII.GetString(read, offset, len).Trim('\0'); - } - - public static void WriteLittle(this byte[] write,string str, int offset, Encoding coding) - { - byte[] strByte = coding.GetBytes(str); - Array.Copy(strByte, 0, write, offset, strByte.Length); - } - - public static void WriteLittle(this byte[] write, string str, int offset) - { - byte[] strByte = Encoding.ASCII.GetBytes(str); - Array.Copy(strByte, 0, write, offset, strByte.Length); - } - - public static void WriteLittle(this byte[] write,int data ,int offset,int len) - { - int n = 1; - for (int i = 0; i < len; i++) - { - write[offset] = (byte)(data >> 8 * (len - n)); - n++; - offset++; - } - } - - public static void WriteLittle(this byte[] write, ushort data, int offset, int len) - { - int n = 1; - for (int i = 0; i < len; i++) - { - write[offset] = (byte)(data >> 8 * (len - n)); - n++; - offset++; - } - } - - public static void WriteLittle(this byte[] write, byte[] bytes, int offset, int len) - { - Array.Copy(bytes, 0, write, offset, len); - } - - public static void WriteLittle(this byte[] write, byte bit, int offset) - { - write[offset] = bit; - } - - public static void WriteLittle(this byte[] write, DateTime date, int offset,int len) - { - write[offset++] = (byte)(date.Year - DateLimitYear); - write[offset++] = (byte)date.Month; - write[offset++] = (byte)date.Day; - write[offset++] = (byte)date.Hour; - write[offset++] = (byte)date.Minute; - write[offset++] = (byte)date.Second; - } - - /// - /// 异或 - /// - /// - /// - /// - /// - public static byte ToXor(this byte[] buf, int offset, int len) - { - byte result = buf[offset]; - for (int i = offset + 1; i < offset + len; i++) - { - result = (byte)(result ^ buf[i]); - } - return result; - } - - /// - /// 字节数组转16进制字符串 - /// - /// - /// 默认 " " - /// - public static string ToHexString(this byte[] bytes,string separator=" ") - { - return string.Join(separator, bytes.Select(s => s.ToString("X2"))); - } - - /// - /// 16进制字符串转16进制数组 - /// - /// - /// - /// - public static byte[] ToHexBytes(this string hexString, string separator = " ") - { - return hexString.Split(new string[] { separator }, StringSplitOptions.RemoveEmptyEntries).Select(s => Convert.ToByte(s, 16)).ToArray(); - } - } -} diff --git a/src/GBNewEnergy.Protocol/GBNewEnergy.Protocol.csproj b/src/GBNewEnergy.Protocol/GBNewEnergy.Protocol.csproj deleted file mode 100644 index a9c3d6d..0000000 --- a/src/GBNewEnergy.Protocol/GBNewEnergy.Protocol.csproj +++ /dev/null @@ -1,30 +0,0 @@ - - - - netstandard2.0;net40;net45 - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/GBNewEnergy.Protocol/INEEncrypt.cs b/src/GBNewEnergy.Protocol/INEEncrypt.cs deleted file mode 100644 index c06d9ec..0000000 --- a/src/GBNewEnergy.Protocol/INEEncrypt.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace GBNewEnergy.Protocol -{ - public interface INEEncrypt - { - byte[] Encrypt(byte[] buffer); - byte[] Decrypt(byte[] buffer); - } -} diff --git a/src/GBNewEnergy.Protocol/INEParameter.cs b/src/GBNewEnergy.Protocol/INEParameter.cs deleted file mode 100644 index 16a6583..0000000 --- a/src/GBNewEnergy.Protocol/INEParameter.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace GBNewEnergy.Protocol -{ - public interface INEParameter - { - /// - /// 车架号 - /// - string VIN { get; set; } - } -} diff --git a/src/GBNewEnergy.Protocol/INEProperties.cs b/src/GBNewEnergy.Protocol/INEProperties.cs deleted file mode 100644 index 8b639a0..0000000 --- a/src/GBNewEnergy.Protocol/INEProperties.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace GBNewEnergy.Protocol -{ - public interface INEProperties:INEParameter - { - } -} diff --git a/src/GBNewEnergy.Protocol/NEBodies.cs b/src/GBNewEnergy.Protocol/NEBodies.cs deleted file mode 100644 index 0034e72..0000000 --- a/src/GBNewEnergy.Protocol/NEBodies.cs +++ /dev/null @@ -1,56 +0,0 @@ -using System; -using System.Collections.Concurrent; -using System.Collections.Generic; -using System.Text; - -namespace GBNewEnergy.Protocol -{ - public abstract class NEBodies : NEBufferedEntityBase - { - /// - /// VIN - 登入流水号,过期时间（每天置1） - /// 车载终端登入一次，登入流水号自动加1，从1开始循环累加，最大值为65531，循环周期为天 - /// - protected static readonly ConcurrentDictionary LoginNumDict; - - /// - /// 平台登入 登录流水号,过期时间（每天置1） - /// 下级平台登入一次，登入流水号自动加1，从1开始循环累加，最大值为65531，循环周期为天 - /// - protected static readonly ConcurrentDictionary PlatformLoginNumDict; - - static NEBodies() - { - LoginNumDict = new ConcurrentDictionary(); - PlatformLoginNumDict = new ConcurrentDictionary(); - } - - /// - /// 登入流水号 - /// 作用：看数据是否是连续请求 - /// - public ushort LoginNum { get; set; } - - /// - /// 数据采集时间 - /// 采用北京时间 - /// - public DateTime CurrentDateTime { get; set; } = DateTime.Now; - - protected NEBodies(byte[] buffer, NEGlobalConfigs nEConfigs) : base(buffer, nEConfigs) { } - - protected NEBodies(INEProperties nEProperties, NEGlobalConfigs nEConfigs) : base(nEProperties, nEConfigs) { } - - protected class LoginInfo - { - public ushort LoginNum { get; set; } - public DateTime ExpirationTime { get; set; } - } - - protected class PlatformLoginInfo - { - public ushort LoginNum { get; set; } - public DateTime ExpirationTime { get; set; } - } - } -} diff --git a/src/GBNewEnergy.Protocol/NEBodiesFactory.cs b/src/GBNewEnergy.Protocol/NEBodiesFactory.cs deleted file mode 100644 index 56853bf..0000000 --- a/src/GBNewEnergy.Protocol/NEBodiesFactory.cs +++ /dev/null @@ -1,43 +0,0 @@ -using GBNewEnergy.Protocol.DownStream; -using GBNewEnergy.Protocol.Enums; -using GBNewEnergy.Protocol.UpStream; -using System; -using System.Collections.Generic; -using System.Text; - -namespace GBNewEnergy.Protocol -{ - public class NEBodiesFactory - { - /// - /// 通过命令id获取数据体 - /// - /// - /// - /// - public static NEBodies GetNEBodiesByMsgId(NEMsgId msgId,byte[] buf, NEGlobalConfigs nEConfigs) - { - switch (msgId) - { - case NEMsgId.login: - return new NELoginUpStream(buf, nEConfigs); - case NEMsgId.uploadim: - return new NERealUploadUpStream(buf, nEConfigs); - case NEMsgId.loginout: - return new NELogoutUpStream(buf, nEConfigs); - case NEMsgId.platformlogin: - return new NEPlatformLoginUpStream(buf, nEConfigs); - case NEMsgId.platformlogout: - return new NEPlatformLogoutUpStream(buf, nEConfigs); - case NEMsgId.control: - return new NEControlDownStream(buf, nEConfigs); - case NEMsgId.settings: - case NEMsgId.heartbeat: - case NEMsgId.checktime: - return new CommonUpStream(buf, nEConfigs); - default: - return null; - } - } - } -} diff --git a/src/GBNewEnergy.Protocol/NEBufferedEntityBase.cs b/src/GBNewEnergy.Protocol/NEBufferedEntityBase.cs deleted file mode 100644 index f47b11d..0000000 --- a/src/GBNewEnergy.Protocol/NEBufferedEntityBase.cs +++ /dev/null @@ -1,41 +0,0 @@ -using System; -using System.IO; - -namespace GBNewEnergy.Protocol -{ - public abstract class NEBufferedEntityBase - { - public byte[] Buffer { get; protected set; } - - public NEGlobalConfigs NEConfigs { get;} - - protected NEBufferedEntityBase(byte[] buffer, NEGlobalConfigs nEConfigs) - { - NEConfigs = nEConfigs; - Buffer = buffer; - InitializePropertiesFromBuffer(); - } - - protected NEBufferedEntityBase(byte[] headerBuffer, byte[] bodyBuffer, NEGlobalConfigs nEConfigs) - { - NEConfigs = nEConfigs; - Buffer = new byte[headerBuffer.Length + bodyBuffer.Length]; - Array.Copy(headerBuffer, 0, Buffer, 0, headerBuffer.Length); - Array.Copy(bodyBuffer, 0, Buffer, headerBuffer.Length, bodyBuffer.Length); - InitializePropertiesFromBuffer(); - } - - protected NEBufferedEntityBase(INEProperties nEProperties,NEGlobalConfigs nEConfigs) - { - NEConfigs = nEConfigs; - InitializeProperties(nEProperties); - ToBuffer(); - } - - protected abstract void InitializeProperties(INEProperties nEProperties); - - protected abstract void ToBuffer(); - - protected abstract void InitializePropertiesFromBuffer(); - } -} diff --git a/src/GBNewEnergy.Protocol/NEDownStreamBase.cs b/src/GBNewEnergy.Protocol/NEDownStreamBase.cs deleted file mode 100644 index b49640c..0000000 --- a/src/GBNewEnergy.Protocol/NEDownStreamBase.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace GBNewEnergy.Protocol -{ - public abstract class NEDownStreamBase - { - - } -} diff --git a/src/GBNewEnergy.Protocol/NEEncryptFactory.cs b/src/GBNewEnergy.Protocol/NEEncryptFactory.cs deleted file mode 100644 index cf18c6a..0000000 --- a/src/GBNewEnergy.Protocol/NEEncryptFactory.cs +++ /dev/null @@ -1,28 +0,0 @@ -using GBNewEnergy.Protocol.Enums; -using GBNewEnergy.Protocol.NEEncrypts; -using System; -using System.Collections.Generic; -using System.Text; - -namespace GBNewEnergy.Protocol -{ - internal class NEEncryptFactory - { - internal static INEEncrypt GetNEEncrypt(NEEncryptMethod nEEncryptMethod, NEGlobalConfigs nEConfigs) - { - switch (nEEncryptMethod) - { - case NEEncryptMethod.None: - case NEEncryptMethod.Invalid: - case NEEncryptMethod.Exception: - return null; - case NEEncryptMethod.AES128: - return new NEAES128EncryptImpl(nEConfigs); - case NEEncryptMethod.RSA: - return new NERSAEncryptImpl(nEConfigs); - default: - return null; - } - } - } -} diff --git a/src/GBNewEnergy.Protocol/NEEncrypts/Default_NEAES128EncryptImpl.cs b/src/GBNewEnergy.Protocol/NEEncrypts/Default_NEAES128EncryptImpl.cs deleted file mode 100644 index 8166b75..0000000 --- a/src/GBNewEnergy.Protocol/NEEncrypts/Default_NEAES128EncryptImpl.cs +++ /dev/null @@ -1,58 +0,0 @@ -using System.IO; -using System.Security.Cryptography; - -namespace GBNewEnergy.Protocol.NEEncrypts -{ - public class Default_NEAES128EncryptImpl : NEAESBase - { - public override string PrivateKey { get; } - - public override byte[] SaltBytes { get; } - - public Default_NEAES128EncryptImpl(string privateKey) - { - PrivateKey = privateKey; - SaltBytes = new byte[9] { 13, 34, 27, 67, 189, 255, 104, 219, 122 }; - } - - public Default_NEAES128EncryptImpl(string privateKey, byte[] saltBytes) - { - PrivateKey = privateKey; - SaltBytes = saltBytes; - } - - public override byte[] Encrypt(byte[] buffer) - { - using (Aes encryptor = Aes.Create()) - { - Rfc2898DeriveBytes pdb = new Rfc2898DeriveBytes(PrivateKey, SaltBytes); - encryptor.Key = pdb.GetBytes(32); - encryptor.IV = pdb.GetBytes(16); - using (MemoryStream ms = new MemoryStream()) - using (CryptoStream cs = new CryptoStream(ms, encryptor.CreateEncryptor(),CryptoStreamMode.Write)) - { - cs.Write(buffer, 0, buffer.Length); - cs.Close(); - return ms.ToArray(); - } - } - } - - public override byte[] Decrypt(byte[] buffer) - { - using (Aes encryptor = Aes.Create()) - { - Rfc2898DeriveBytes pdb = new Rfc2898DeriveBytes(PrivateKey, SaltBytes); - encryptor.Key = pdb.GetBytes(32); - encryptor.IV = pdb.GetBytes(16); - using (MemoryStream ms = new MemoryStream()) - using (CryptoStream cs = new CryptoStream(ms, encryptor.CreateDecryptor(),CryptoStreamMode.Write)) - { - cs.Write(buffer, 0, buffer.Length); - cs.Close(); - return ms.ToArray(); - } - } - } - } -} diff --git a/src/GBNewEnergy.Protocol/NEEncrypts/Default_NERSAEncryptImpl.cs b/src/GBNewEnergy.Protocol/NEEncrypts/Default_NERSAEncryptImpl.cs deleted file mode 100644 index b707eb8..0000000 --- a/src/GBNewEnergy.Protocol/NEEncrypts/Default_NERSAEncryptImpl.cs +++ /dev/null @@ -1,193 +0,0 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Security.Cryptography; -using System.Text; -using System.Xml; - -namespace GBNewEnergy.Protocol.NEEncrypts -{ -#if NETSTANDARD2_0 - public class Default_NERSAEncryptImpl : NERSABase - { - private readonly RSA _privateKeyRsaProvider; - private readonly RSA _publicKeyRsaProvider; - private readonly Encoding _encoding; - - public override string HashAlgorithmStr=>throw new NotImplementedException(); - - public override string PublicKey { get; } - - public override string PrivateKey { get; } - - public override HashAlgorithmName HashAlgorithmName { get; } - - public Default_NERSAEncryptImpl(Encoding encoding, HashAlgorithmName hashAlgorithmName, string publicKey, string privateKey) - { - _privateKeyRsaProvider = CreateRsaProviderFromPrivateKey(privateKey); - _publicKeyRsaProvider = CreateRsaProviderFromPublicKey(publicKey); - HashAlgorithmName = hashAlgorithmName; - _encoding = encoding; - PublicKey = publicKey; - PrivateKey = privateKey; - } - - public override byte[] Decrypt(byte[] buffer) - { - return _privateKeyRsaProvider.Decrypt(buffer, RSAEncryptionPadding.Pkcs1); - } - - public override byte[] Encrypt(byte[] buffer) - { - return _publicKeyRsaProvider.Encrypt(buffer, RSAEncryptionPadding.Pkcs1); - } - - /// - /// 使用私钥签名 - /// - /// 原始数据 - /// - public override string Sign(string data) - { - byte[] dataBytes = _encoding.GetBytes(data); - var signatureBytes = _privateKeyRsaProvider.SignData(dataBytes, HashAlgorithmName, RSASignaturePadding.Pkcs1); - return Convert.ToBase64String(signatureBytes); - } - - /// - /// 使用公钥验证签名 - /// - /// 原始数据 - /// 签名 - /// - public override bool Verify(string data, string sign) - { - byte[] dataBytes = _encoding.GetBytes(data); - byte[] signBytes = Convert.FromBase64String(sign); - var verify = _publicKeyRsaProvider.VerifyData(dataBytes, signBytes, HashAlgorithmName, RSASignaturePadding.Pkcs1); - return verify; - } - - private RSA CreateRsaProviderFromPublicKey(string publicKeyString) - { - var rsa = RSA.Create(); - FromXmlStringExtensions(rsa,publicKeyString); - return rsa; - } - - private RSA CreateRsaProviderFromPrivateKey(string privateKey) - { - var rsa = RSA.Create(); - FromXmlStringExtensions(rsa, privateKey); - return rsa; - } - - private int GetIntegerSize(BinaryReader binr) - { - byte bt = 0; - int count = 0; - bt = binr.ReadByte(); - if (bt != 0x02) - return 0; - bt = binr.ReadByte(); - - if (bt == 0x81) - count = binr.ReadByte(); - else - if (bt == 0x82) - { - var highbyte = binr.ReadByte(); - var lowbyte = binr.ReadByte(); - byte[] modint = { lowbyte, highbyte, 0x00, 0x00 }; - count = BitConverter.ToInt32(modint, 0); - } - else - { - count = bt; - } - - while (binr.ReadByte() == 0x00) - { - count -= 1; - } - binr.BaseStream.Seek(-1, SeekOrigin.Current); - return count; - } - - private bool CompareBytearrays(byte[] a, byte[] b) - { - if (a.Length != b.Length) - return false; - int i = 0; - foreach (byte c in a) - { - if (c != b[i]) - return false; - i++; - } - return true; - } - - private static void FromXmlStringExtensions(RSA rsa, string xmlString) - { - var parameters = new RSAParameters(); - var xmlDoc = new XmlDocument(); - xmlDoc.LoadXml(xmlString); - if (xmlDoc.DocumentElement.Name.Equals("RSAKeyValue")) - { - foreach (XmlNode node in xmlDoc.DocumentElement.ChildNodes) - { - switch (node.Name) - { - case "Modulus": - parameters.Modulus = (string.IsNullOrEmpty(node.InnerText) - ? null - : Convert.FromBase64String(node.InnerText)); - break; - case "Exponent": - parameters.Exponent = (string.IsNullOrEmpty(node.InnerText) - ? null - : Convert.FromBase64String(node.InnerText)); - break; - case "P": - parameters.P = (string.IsNullOrEmpty(node.InnerText) - ? null - : Convert.FromBase64String(node.InnerText)); - break; - case "Q": - parameters.Q = (string.IsNullOrEmpty(node.InnerText) - ? null - : Convert.FromBase64String(node.InnerText)); - break; - case "DP": - parameters.DP = (string.IsNullOrEmpty(node.InnerText) - ? null - : Convert.FromBase64String(node.InnerText)); - break; - case "DQ": - parameters.DQ = (string.IsNullOrEmpty(node.InnerText) - ? null - : Convert.FromBase64String(node.InnerText)); - break; - case "InverseQ": - parameters.InverseQ = (string.IsNullOrEmpty(node.InnerText) - ? null - : Convert.FromBase64String(node.InnerText)); - break; - case "D": - parameters.D = (string.IsNullOrEmpty(node.InnerText) - ? null - : Convert.FromBase64String(node.InnerText)); - break; - } - } - } - else - { - throw new Exception("Invalid XML RSA key."); - } - rsa.ImportParameters(parameters); - } - } -#endif -} diff --git a/src/GBNewEnergy.Protocol/NEEncrypts/Default_NERSAEncryptImpl_NET.cs b/src/GBNewEnergy.Protocol/NEEncrypts/Default_NERSAEncryptImpl_NET.cs deleted file mode 100644 index beb0094..0000000 --- a/src/GBNewEnergy.Protocol/NEEncrypts/Default_NERSAEncryptImpl_NET.cs +++ /dev/null @@ -1,90 +0,0 @@ -using System; -using System.Security.Cryptography; -using System.Text; - -namespace GBNewEnergy.Protocol.NEEncrypts -{ - public class Default_NERSAEncryptImpl_NET : NERSABase - { - private readonly Encoding _encoding; - - public Default_NERSAEncryptImpl_NET(Encoding encoding,string hashAlgorithmStr, string publicKey, string privateKey) - { - _encoding = encoding; - HashAlgorithmStr = hashAlgorithmStr; - PublicKey = publicKey; - PrivateKey = privateKey; - } - -#if NETSTANDARD2_0 - public override HashAlgorithmName HashAlgorithmName => throw new NotImplementedException(); -#endif - public override string HashAlgorithmStr { get;} - - public override string PublicKey { get; } - - public override string PrivateKey { get;} - - public override byte[] Decrypt(byte[] buffer) - { - using (RSACryptoServiceProvider provider=new RSACryptoServiceProvider()) - { - provider.FromXmlString(PrivateKey); - return provider.Decrypt(buffer, false); - } - } - - public override byte[] Encrypt(byte[] buffer) - { - using (RSACryptoServiceProvider provider = new RSACryptoServiceProvider()) - { - provider.FromXmlString(PublicKey); - return provider.Encrypt(buffer, false); - } - } - - /// - /// 使用私钥签名 - /// - /// 原始数据 - /// - public override string Sign(string data) - { - byte[] dataBytes = _encoding.GetBytes(data); - byte[] rgbHash = HashAlgorithm.Create(HashAlgorithmStr).ComputeHash(dataBytes); - using (RSACryptoServiceProvider key = new RSACryptoServiceProvider()) - { - key.FromXmlString(PrivateKey); - RSAPKCS1SignatureFormatter formatter = new RSAPKCS1SignatureFormatter(key); - formatter.SetHashAlgorithm(HashAlgorithmStr); - byte[] inArray = formatter.CreateSignature(rgbHash); - return Convert.ToBase64String(inArray); - } - } - - /// - /// 使用公钥验证签名 - /// - /// 原始数据 - /// 签名 - /// - public override bool Verify(string data, string sign) - { - byte[] dataBytes = _encoding.GetBytes(data); - byte[] signBytes = Convert.FromBase64String(sign); - byte[] rgbHash = HashAlgorithm.Create(HashAlgorithmStr).ComputeHash(dataBytes); - using (RSACryptoServiceProvider key = new RSACryptoServiceProvider()) - { - key.FromXmlString(PublicKey); - RSAPKCS1SignatureDeformatter deformatter = new RSAPKCS1SignatureDeformatter(key); - deformatter.SetHashAlgorithm(HashAlgorithmStr); - byte[] rgbSignature = Convert.FromBase64String(sign); - if (deformatter.VerifySignature(rgbHash, rgbSignature)) - { - return true; - } - return false; - } - } - } -} diff --git a/src/GBNewEnergy.Protocol/NEEncrypts/NEAESBase.cs b/src/GBNewEnergy.Protocol/NEEncrypts/NEAESBase.cs deleted file mode 100644 index 3bd8f34..0000000 --- a/src/GBNewEnergy.Protocol/NEEncrypts/NEAESBase.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace GBNewEnergy.Protocol.NEEncrypts -{ - public abstract class NEAESBase : INEEncrypt - { - public abstract string PrivateKey { get; } - public abstract byte[] SaltBytes { get; } - public abstract byte[] Decrypt(byte[] buffer); - public abstract byte[] Encrypt(byte[] buffer); - } -} diff --git a/src/GBNewEnergy.Protocol/NEEncrypts/NERSABase.cs b/src/GBNewEnergy.Protocol/NEEncrypts/NERSABase.cs deleted file mode 100644 index cdc3c18..0000000 --- a/src/GBNewEnergy.Protocol/NEEncrypts/NERSABase.cs +++ /dev/null @@ -1,45 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Security.Cryptography; -using System.Text; - -namespace GBNewEnergy.Protocol.NEEncrypts -{ - public abstract class NERSABase : INEEncrypt - { - public abstract byte[] Decrypt(byte[] buffer); - public abstract byte[] Encrypt(byte[] buffer); - -#if NETSTANDARD2_0 - /// - /// dotnet core 使用 - /// - public abstract HashAlgorithmName HashAlgorithmName { get; } -#endif - /// - /// .net framework 使用 - /// 哈希算法 - /// MD5 new MD5CryptoServiceProvider() - /// SHA1 new SHA1CryptoServiceProvider() - /// SHA256 new SHA256CryptoServiceProvider() - /// SHA384 new SHA384CryptoServiceProvider() - /// SHA512 new SHA512CryptoServiceProvider() - /// - public abstract string HashAlgorithmStr { get; } - public abstract string PublicKey { get; } - public abstract string PrivateKey { get; } - /// - /// 使用私钥签名 - /// - /// 原始数据 - /// - public abstract bool Verify(string data, string sign); - /// - /// 使用公钥验证签名 - /// - /// 原始数据 - /// 签名 - /// - public abstract string Sign(string data); - } -} diff --git a/src/GBNewEnergy.Protocol/NEGlobalConfigs.cs b/src/GBNewEnergy.Protocol/NEGlobalConfigs.cs deleted file mode 100644 index e736e0d..0000000 --- a/src/GBNewEnergy.Protocol/NEGlobalConfigs.cs +++ /dev/null @@ -1,27 +0,0 @@ -using GBNewEnergy.Protocol.Enums; -using System.Text; - -namespace GBNewEnergy.Protocol -{ - public class NEGlobalConfigs - { - /// - /// 加密编码 - /// - public Encoding NEEncryptEncoding { get; set; } = Encoding.UTF8; - /// - /// 字符串编码 - /// - public Encoding NEEncoding { get; set; } = Encoding.UTF8; - /// - /// 数据单元加密方式 - /// 0x01：数据不加密；0x02：数据经过 RSA 算法加密；0x03:数据经过 AES128 位算法加密；“0xFE”表示异常，“0xFF”表示无效 - /// - public NEEncryptMethod EncryptMethod { get; set; } = NEEncryptMethod.None; - /// - /// 数据单元加密 - /// 当数据单元存在加密时，应先加密后校验，先校验后解密 - /// - public INEEncrypt Encrypt { get; set; } - } -} diff --git a/src/GBNewEnergy.Protocol/NEHeader.cs b/src/GBNewEnergy.Protocol/NEHeader.cs deleted file mode 100644 index e5cfcd4..0000000 --- a/src/GBNewEnergy.Protocol/NEHeader.cs +++ /dev/null @@ -1,40 +0,0 @@ -using GBNewEnergy.Protocol.Enums; -using GBNewEnergy.Protocol.Exceptions; -using GBNewEnergy.Protocol.Extensions; -using System; -using System.Text; - -namespace GBNewEnergy.Protocol -{ - /// - /// 头部 - /// - public class NEHeader: BufferedEntityBase - { - public NEHeader(byte[] buffer):base(buffer) - { - - } - /// - /// 起始符 - /// - public const byte BeginFlag = 0x23; - /// - /// 命令标识 - /// - public MsgId MsgId { get; private set; } - /// - /// 应答标志 - /// - public AskId AskId { get; private set; } - /// - /// 车辆识别码 - /// - public string VIN { get; private set; } - /// - /// 数据加密方式 - /// 0x01：数据不加密；0x02：数据经过 RSA 算法加密；0x03:数据经过 AES128 位算法加密；“0xFE”表示异常，“0xFF”表示无效 - /// - public EncryptMethod EncryptMethod { get; private set; } - } -} diff --git a/src/GBNewEnergy.Protocol/NEPackage.cs b/src/GBNewEnergy.Protocol/NEPackage.cs deleted file mode 100644 index c84637a..0000000 --- a/src/GBNewEnergy.Protocol/NEPackage.cs +++ /dev/null @@ -1,143 +0,0 @@ -using GBNewEnergy.Protocol.Enums; -using GBNewEnergy.Protocol.Exceptions; -using GBNewEnergy.Protocol.Extensions; -using GBNewEnergy.Protocol.NEProperties; -using System; -using System.IO; - -namespace GBNewEnergy.Protocol -{ - /// - /// 新能源包 - /// - public class NEPackage : NEBufferedEntityBase - { - public NEPackage(byte[] header, byte[] body, NEGlobalConfigs nEConfigs) : base(header, body, nEConfigs) - { - } - - public NEPackage(byte[] buf, NEGlobalConfigs nEConfigs) : base(buf, nEConfigs) - { - } - - public NEPackage(INEProperties nEProperties, NEGlobalConfigs nEConfigs) - : base(nEProperties, nEConfigs) - { } - - /// - /// 固定为24个字节长度 - /// - public const int HeaderFixedByteLength = 24; - /// - /// 起始符 - /// - public const byte BeginFlag = 0x23; - /// - /// 校验位1字节 - /// - private const int CheckBit = 1; - /// - /// 命令标识 - /// - public NEMsgId MsgId { get; private set; } - /// - /// 应答标志 - /// - public NEAskId AskId { get; private set; } - /// - /// 车辆识别码 - /// - public string VIN { get; private set; } - /// - /// 数据加密方式 - /// 0x01：数据不加密；0x02：数据经过 RSA 算法加密；0x03:数据经过 AES128 位算法加密；“0xFE”表示异常，“0xFF”表示无效 - /// - public NEEncryptMethod EncryptMethod { get; private set; } - /// - /// 数据单元长度是数据单元的总字节数，有效值范围：0-65531 - /// - public int DataUnitLength { get; private set; } - /// - /// 采用BCC（异或检验）法，校验范围从命令单元的第一个字节开始，同后一个字节异或，直到校验码前一个字节为止， - /// 校验码占用一个字节，当数据单元存在加密时，应先加密后检验，先校验后解密 - /// - public byte BCCCode { get; private set; } - /// - /// 头数据 - /// - public byte[] Header { get; private set; } - /// - /// 数据体 - /// - public NEBodies Bodies { get; protected set; } - - protected override void ToBuffer() - { - // 固定单元长度 - DataUnitLength = Bodies.Buffer.Length; - Buffer = new byte[HeaderFixedByteLength + DataUnitLength + CheckBit]; - Buffer[0] = BeginFlag; - Buffer[1] = BeginFlag; - Buffer[2] = (byte)MsgId; - Buffer[3] = (byte)AskId; - Buffer.WriteLittle(VIN, 4); - Buffer[21] = (byte)EncryptMethod; - Buffer.WriteLittle(DataUnitLength, 22, 2); - if (NEConfigs.Encrypt != null) - { - Buffer.WriteLittle(NEConfigs.Encrypt.Encrypt(Bodies.Buffer), 24, DataUnitLength); - } - else - { - Buffer.WriteLittle(Bodies.Buffer, 24, DataUnitLength); - } - BCCCode = Buffer.ToXor(2, (HeaderFixedByteLength + DataUnitLength - 1)); - Buffer[HeaderFixedByteLength + DataUnitLength] = BCCCode; - Header = new byte[HeaderFixedByteLength]; - Array.Copy(Buffer, 0, Header, 0, HeaderFixedByteLength); - } - - protected override void InitializeProperties(INEProperties nEProperties) - { - NEPackageProperty nEPackageProperty = (NEPackageProperty)nEProperties; - VIN = nEPackageProperty.VIN; - MsgId = nEPackageProperty.MsgId; - AskId = nEPackageProperty.AskId; - Bodies = nEPackageProperty.Bodies; - EncryptMethod = NEConfigs.EncryptMethod; - } - - protected override void InitializePropertiesFromBuffer() - { - if (Buffer[0] != BeginFlag && Buffer[1] == BeginFlag) throw new NEException(NEErrorCode.BeginFlagError, $"{Buffer[0]},{Buffer[1]}"); - MsgId = (NEMsgId)Buffer[2]; - AskId = (NEAskId)Buffer[3]; - VIN = Buffer.ReadStringLittle(4, 17); - EncryptMethod = (NEEncryptMethod)Buffer[21]; - DataUnitLength = Buffer.ReadUShortH2LLittle(22, 2); - // 2.4. 验证校验码 - // 进行BCC校验码 - // 校验位 = 报文长度 - 最后一位（校验位） - 偏移量（2） - int checkBit = Buffer.Length - CheckBit - 2; - byte bCCCode = Buffer.ToXor(2, checkBit); - byte bCCCode2 = Buffer[Buffer.Length - CheckBit]; - if (bCCCode != bCCCode2) - { - throw new NEException(NEErrorCode.BCCCodeError, $"request:{bCCCode2}!=calculate:{bCCCode}"); - } - BCCCode = bCCCode2; - byte[] bodiesBytes = new byte[DataUnitLength + CheckBit]; - Array.Copy(Buffer, HeaderFixedByteLength, bodiesBytes, 0, bodiesBytes.Length); - if (NEConfigs.Encrypt != null) - { - Bodies = NEBodiesFactory.GetNEBodiesByMsgId(MsgId, NEConfigs.Encrypt.Decrypt(bodiesBytes),NEConfigs); - } - else - { - Bodies = NEBodiesFactory.GetNEBodiesByMsgId(MsgId, bodiesBytes, NEConfigs); - } - Header = new byte[HeaderFixedByteLength]; - Array.Copy(Buffer, 0, Header, 0, HeaderFixedByteLength); - } - } -} diff --git a/src/GBNewEnergy.Protocol/NEProperties/NEControlAlarmParameter.cs b/src/GBNewEnergy.Protocol/NEProperties/NEControlAlarmParameter.cs deleted file mode 100644 index 6f51269..0000000 --- a/src/GBNewEnergy.Protocol/NEProperties/NEControlAlarmParameter.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; -using GBNewEnergy.Protocol.Enums; - -namespace GBNewEnergy.Protocol.NEProperties -{ - /// - /// 控制命令 报警、预警 - /// - public class NEControlAlarmParameter - { - /// - /// 报警等级 - /// - public NEAlarmLevel nEAlarmLevel { get; set; } - } -} diff --git a/src/GBNewEnergy.Protocol/NEProperties/NEControlProperty.cs b/src/GBNewEnergy.Protocol/NEProperties/NEControlProperty.cs deleted file mode 100644 index bab00e7..0000000 --- a/src/GBNewEnergy.Protocol/NEProperties/NEControlProperty.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; -using GBNewEnergy.Protocol.Enums; - -namespace GBNewEnergy.Protocol.NEProperties -{ - /// - /// 控制命令属性 - /// - public class NEControlProperty : INEProperties - { - public string VIN { get; set ; } - /// - /// 命令ID 只能发送一个 - /// - public NEControlCmd CmdID { get; set; } - /// - /// 升级参数 - /// - public NEControlUpgradeParameter UpgradeParameter { get; set; } - /// - /// 报警，预警参数 - /// - public NEControlAlarmParameter AlarmParameter { get; set; } - } -} diff --git a/src/GBNewEnergy.Protocol/NEProperties/NEControlUpgradeParameter.cs b/src/GBNewEnergy.Protocol/NEProperties/NEControlUpgradeParameter.cs deleted file mode 100644 index e3be834..0000000 --- a/src/GBNewEnergy.Protocol/NEProperties/NEControlUpgradeParameter.cs +++ /dev/null @@ -1,57 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace GBNewEnergy.Protocol.NEProperties -{ - /// - /// 控制命令，升级 - /// - public class NEControlUpgradeParameter - { - /// - /// URL地址 - /// - public string Url { get; set; } - /// - /// 拨号点名称 - /// - public string DialPointName { get; set; } - /// - /// 拨号用户名 - /// - public string DialUserName { get; set; } - /// - /// 拨号密码 - /// - public string DialPassword { get; set; } - /// - /// 服务器地址 - /// - public string ServerUrl { get; set; } - /// - /// 服务器端口 - /// - public string ServerPort { get; set; } - /// - /// 生产厂商代码 - /// - public string ProviderCode { get; set; } - /// - /// 硬件版本 - /// - public string HardwareVersion { get; set; } - /// - /// 固件版本 - /// - public string FirmwareVersion { get; set; } - /// - /// 升级服务器时限 - /// - public string UpLimitTime { get; set; } - public override string ToString() - { - return $"{Url};{DialPointName};{DialUserName};{DialPassword};{ServerUrl};{ServerPort};{ProviderCode};{HardwareVersion};{FirmwareVersion};{UpLimitTime}"; - } - } -} diff --git a/src/GBNewEnergy.Protocol/NEProperties/NEEmptyProperty.cs b/src/GBNewEnergy.Protocol/NEProperties/NEEmptyProperty.cs deleted file mode 100644 index f3d6ef8..0000000 --- a/src/GBNewEnergy.Protocol/NEProperties/NEEmptyProperty.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace GBNewEnergy.Protocol.NEProperties -{ - /// - /// 空包属性 - /// - public class NEEmptyProperty : INEProperties - { - public string VIN { get => throw new NotImplementedException(); set => throw new NotImplementedException(); } - } -} diff --git a/src/GBNewEnergy.Protocol/NEProperties/NELoginProperty.cs b/src/GBNewEnergy.Protocol/NEProperties/NELoginProperty.cs deleted file mode 100644 index 0a558a3..0000000 --- a/src/GBNewEnergy.Protocol/NEProperties/NELoginProperty.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace GBNewEnergy.Protocol.NEProperties -{ - public class NELoginProperty : INEProperties - { - public string VIN { get; set; } - - public string SIM { get; set; } - - public byte BatteryCount { get; set; } - - public byte BatteryLength { get; set; } - - public IEnumerable BatteryNos { get; set;} - } -} diff --git a/src/GBNewEnergy.Protocol/NEProperties/NELogoutProperty.cs b/src/GBNewEnergy.Protocol/NEProperties/NELogoutProperty.cs deleted file mode 100644 index e002a99..0000000 --- a/src/GBNewEnergy.Protocol/NEProperties/NELogoutProperty.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace GBNewEnergy.Protocol.NEProperties -{ - public class NELogoutProperty : INEProperties - { - public string VIN { get; set; } - } -} diff --git a/src/GBNewEnergy.Protocol/NEProperties/NEPackageProperty.cs b/src/GBNewEnergy.Protocol/NEProperties/NEPackageProperty.cs deleted file mode 100644 index 3e74c9f..0000000 --- a/src/GBNewEnergy.Protocol/NEProperties/NEPackageProperty.cs +++ /dev/null @@ -1,15 +0,0 @@ -using GBNewEnergy.Protocol.Enums; -using System; -using System.Collections.Generic; -using System.Text; - -namespace GBNewEnergy.Protocol.NEProperties -{ - public class NEPackageProperty : INEProperties - { - public string VIN { get; set; } - public NEMsgId MsgId { get; set; } - public NEAskId AskId { get; set; } - public NEBodies Bodies { get; set; } - } -} diff --git a/src/GBNewEnergy.Protocol/NEProperties/NEPlatformLoginProperty.cs b/src/GBNewEnergy.Protocol/NEProperties/NEPlatformLoginProperty.cs deleted file mode 100644 index 7ba7265..0000000 --- a/src/GBNewEnergy.Protocol/NEProperties/NEPlatformLoginProperty.cs +++ /dev/null @@ -1,27 +0,0 @@ -using GBNewEnergy.Protocol.Enums; -using System; -using System.Collections.Generic; -using System.Text; - -namespace GBNewEnergy.Protocol.NEProperties -{ - public class NEPlatformLoginProperty : INEProperties - { - [Obsolete("平台登入无用字段")] - public string VIN { get ; set; } - /// - /// 平台用户名 - /// - public string UserName { get; set; } - - /// - /// 加密规则 - /// - public NEEncryptMethod EncryptMethod { get; set; } - - /// - /// 平台密码 - /// - public string Password { get; set; } - } -} diff --git a/src/GBNewEnergy.Protocol/NEProperties/NEPlatformLogoutProperty.cs b/src/GBNewEnergy.Protocol/NEProperties/NEPlatformLogoutProperty.cs deleted file mode 100644 index b319ab7..0000000 --- a/src/GBNewEnergy.Protocol/NEProperties/NEPlatformLogoutProperty.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace GBNewEnergy.Protocol.NEProperties -{ - public class NEPlatformLogoutProperty : INEProperties - { - [Obsolete("平台登入无用字段")] - public string VIN { get; set; } - /// - /// 平台用户名 - /// - public string UserName { get; set; } - } -} diff --git a/src/GBNewEnergy.Protocol/NEProperties/NEUploadProperties/NEUploadAlarmProperty.cs b/src/GBNewEnergy.Protocol/NEProperties/NEUploadProperties/NEUploadAlarmProperty.cs deleted file mode 100644 index 706d3f8..0000000 --- a/src/GBNewEnergy.Protocol/NEProperties/NEUploadProperties/NEUploadAlarmProperty.cs +++ /dev/null @@ -1,60 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; -using GBNewEnergy.Protocol.Enums; - -namespace GBNewEnergy.Protocol.NEProperties.NEUploadProperties -{ - /// - /// 报警数据 - /// - public class NEUploadAlarmProperty : NEUploadPropertyBase - { - public override NEInfoType NEInfoType => NEInfoType.报警数据; - - /// - /// 报警等级 - /// - public byte AlarmLevel { get; set; } - /// - /// 通用报警标志 - /// - public int AlarmBatteryFlag { get; set; } - /// - /// 报警没变化 0，有报警 1 - /// - public byte AlarmBatteryChanged { get; set; } - /// - /// 可充电储能装置故障总数 - /// - public byte AlarmBatteryOtherCount { get; set; } - /// - /// 可充电储能装置故障代码列表 - /// - public List AlarmBatteryOtherList { get; set; } = new List(); - /// - /// 驱动电机故障总数 - /// - public byte AlarmElCount { get; set; } - /// - /// 驱动电机故障代码列表 - /// - public List AlarmElList { get; set; } = new List(); - /// - /// 发动机故障总数 - /// - public byte AlarmEngineCount { get; set; } - /// - /// 发动机故障列表 - /// - public ListAlarmEngineList { get; set; } = new List(); - /// - /// 其他故障总数 - /// - public byte AlarmOtherCount { get; set; } - /// - /// 其他故障代码列表 - /// - public List AlarmOtherList { get; set; } = new List(); - } -} diff --git a/src/GBNewEnergy.Protocol/NEProperties/NEUploadProperties/NEUploadDrivenElectricalProperty.cs b/src/GBNewEnergy.Protocol/NEProperties/NEUploadProperties/NEUploadDrivenElectricalProperty.cs deleted file mode 100644 index 37a685a..0000000 --- a/src/GBNewEnergy.Protocol/NEProperties/NEUploadProperties/NEUploadDrivenElectricalProperty.cs +++ /dev/null @@ -1,63 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; -using GBNewEnergy.Protocol.Enums; - -namespace GBNewEnergy.Protocol.NEProperties.NEUploadProperties -{ - /// - /// 驱动电机数据 - /// - public class NEUploadDrivenElectricalProperty : NEUploadPropertyBase - { - public override NEInfoType NEInfoType => NEInfoType.驱动电机数据; - - /// - /// 电机个数 - /// - public byte ElectricalCount; - /// - /// 电机信息集合 - /// - public IEnumerable ElectricalList { get; set; } - - /// - /// 电机信息 - /// - public class ElectricalInfo - { - /// - /// 电机序号 - /// - public byte ElNo { get; set; } - /// - /// 电机状态 - /// - public byte ElStatus { get; set; } - /// - /// 电机控制器温度 - /// - public int ElControlTemp { get; set; } - /// - /// 电机转速 - /// - public int ElSpeed { get; set; } - /// - /// 电机转矩 - /// - public double ElTorque { get; set; } - /// - /// 电机温度 - /// - public int ElTemp { get; set; } - /// - /// 电机电压 - /// - public double ElVoltage { get; set; } - /// - /// 电机母线电流 - /// - public double ElCurrent { get; set; } - } - } -} diff --git a/src/GBNewEnergy.Protocol/NEProperties/NEUploadProperties/NEUploadEnergyStorageProperty.cs b/src/GBNewEnergy.Protocol/NEProperties/NEUploadProperties/NEUploadEnergyStorageProperty.cs deleted file mode 100644 index 0541c0f..0000000 --- a/src/GBNewEnergy.Protocol/NEProperties/NEUploadProperties/NEUploadEnergyStorageProperty.cs +++ /dev/null @@ -1,60 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; -using GBNewEnergy.Protocol.Enums; - -namespace GBNewEnergy.Protocol.NEProperties.NEUploadProperties -{ - /// - /// 可充电储能装置电压数据 - /// - public class NEUploadEnergyStorageProperty : NEUploadPropertyBase - { - public override NEInfoType NEInfoType => NEInfoType.可充电储能装置电压数据; - - /// - /// 可充电储能子系统个数 - /// - public byte BatteryAssemblyCount { get; set; } - - /// - /// 可充电储能子系统电压信息列表 - /// - public List BatteryAssemblyList { get; set; } = new List(); - - /// - /// 每个电池总成数据 - /// - public class BatteryAssembly - { - /// - /// 可充电储能子系统号 - /// - public byte BatteryAssemblyNo { get; set; } - /// - /// 可充电储能装置电压 - /// - public double BatteryAssemblyVoltage { get; set; } - /// - /// 可充电储能装置电流 - /// - public double BatteryAssemblyCurrent { get; set; } - /// - /// 单体电池总数 - /// - public int SingleBatteryCount { get; set; } - /// - /// 本帧起始电池序号 - /// - public int ThisSingleBatteryBeginNo { get; set; } - /// - /// /本帧单体电池总数 - /// - public int ThisSingleBatteryBeginCount { get; set; } - /// - /// 单体电池电压 - /// - public List SingleBatteryVoltageList { get; set; } = new List(); - } - } -} diff --git a/src/GBNewEnergy.Protocol/NEProperties/NEUploadProperties/NEUploadEnergyStorageTemperatureProperty.cs b/src/GBNewEnergy.Protocol/NEProperties/NEUploadProperties/NEUploadEnergyStorageTemperatureProperty.cs deleted file mode 100644 index 9302658..0000000 --- a/src/GBNewEnergy.Protocol/NEProperties/NEUploadProperties/NEUploadEnergyStorageTemperatureProperty.cs +++ /dev/null @@ -1,43 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; -using GBNewEnergy.Protocol.Enums; - -namespace GBNewEnergy.Protocol.NEProperties.NEUploadProperties -{ - /// - /// 可充电储能装置温度数据 - /// - public class NEUploadEnergyStorageTemperatureProperty : NEUploadPropertyBase - { - public override NEInfoType NEInfoType => NEInfoType.可充电储能装置温度数据; - - /// - /// 动力蓄电池总成个数 - /// - public byte BatteryAssemblyCount { get; set; } - /// - /// 每个可充电储能子系统温度信息长度 - /// - public List BatteryAssemblyList { get; set; } = new List(); - - /// - /// 每个动力蓄电池上温度数据 - /// - public class BatteryTemperature - { - /// - /// 可充电储能子系统号 - /// - public byte BatteryAssemblyNo { get; set; } - /// - /// 可充电储能温度探针个数 - /// - public int TemperatureProbeCount { get; set; } - /// - /// 可充电储能子系统各温度探针检测到的温度值 - /// - public List TemperatureList { get; set; } = new List(); - } - } -} diff --git a/src/GBNewEnergy.Protocol/NEProperties/NEUploadProperties/NEUploadEnginePartProperty.cs b/src/GBNewEnergy.Protocol/NEProperties/NEUploadProperties/NEUploadEnginePartProperty.cs deleted file mode 100644 index 0ca2431..0000000 --- a/src/GBNewEnergy.Protocol/NEProperties/NEUploadProperties/NEUploadEnginePartProperty.cs +++ /dev/null @@ -1,39 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; -using GBNewEnergy.Protocol.Enums; - -namespace GBNewEnergy.Protocol.NEProperties.NEUploadProperties -{ - /// - /// 发动机部分数据 - /// - public class NEUploadEnginePartProperty : NEUploadPropertyBase - { - public override NEInfoType NEInfoType => NEInfoType.发动机数据; - /// - /// 发动机状态 - /// 0x01：启动状态 - /// 0x02：关闭状态 - /// 0xFE：异常 - /// 0xFF：无效 - /// - public byte EngineStatus { get; set; } - /// - /// 曲轴转速 - /// 有效范围：0-60000（表示0 r/min-60000 r/min） - /// 最小计量单元：1 r/min - /// 异常：0xFF,0XFE - /// 无效：0xFF,0xFF - /// - public int Revs { get; set; } - /// - /// 燃料消耗率 - /// 有效值范围：0-60000（表示0L/100km - 600L/100km） - /// 最小计量单元：0.01L/km - /// 异常：0xFF,0XFE - /// 无效：0xFF,0xFF - /// - public double FuelRate { get; set; } - } -} diff --git a/src/GBNewEnergy.Protocol/NEProperties/NEUploadProperties/NEUploadExtremeProperty.cs b/src/GBNewEnergy.Protocol/NEProperties/NEUploadProperties/NEUploadExtremeProperty.cs deleted file mode 100644 index 84bd2cf..0000000 --- a/src/GBNewEnergy.Protocol/NEProperties/NEUploadProperties/NEUploadExtremeProperty.cs +++ /dev/null @@ -1,94 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; -using GBNewEnergy.Protocol.Enums; - -namespace GBNewEnergy.Protocol.NEProperties.NEUploadProperties -{ - /// - /// 极值数据 - /// - public class NEUploadExtremeProperty : NEUploadPropertyBase - { - public override NEInfoType NEInfoType => NEInfoType.极值数据; - - /// - /// 最高电压电池总成号 - /// 有效值范围：1-250 - /// 异常：0XFE - /// 无效：0xFF - /// - public byte MaxVoltageBatteryAssemblyNo { get; set; } - /// - /// 最高电压电池单体代号 - /// 有效值范围：1-250 - /// 异常：0XFE - /// 无效：0xFF - /// - public byte MaxVoltageSingleBatteryNo { get; set; } - /// - /// 电池单体电压最高值 - /// 有效值范围：0-15000（表示0V - 15V） - /// 最小计量单元：0.001V - /// 异常：0xFF,0XFE - /// 无效：0xFF,0xFF - /// - public double MaxVoltageSingleBatteryValue { get; set; } - /// - /// 最低电压电池子系统号 - /// 有效值范围：1-250 - /// 异常：0XFE - /// 无效：0xFF - /// - public byte MinVoltageBatteryAssemblyNo { get; set; } - /// - /// 最低电压电池单体代号 - /// 有效值范围：1-250 - /// 异常：0XFE - /// 无效：0xFF - /// - public byte MinVoltageSingleBatteryNo { get; set; } - /// - /// 最低单体电压最低值 - /// 有效值范围：0-15000（表示0V - 15V） - /// 最小计量单元：0.001V - /// 异常：0xFF,0XFE - /// 无效：0xFF,0xFF - /// - public double MinVoltageSingleBatteryValue { get; set; } - /// - /// 蓄电池中最高温度子系统号 - /// 有效值范围：1-250 - /// 异常：0XFE - /// 无效：0xFF - /// - public byte MaxTempProbeBatteryNo { get; set; } - /// - /// 蓄电池中最高温度探针序号 - /// 有效值范围：1-250 - /// 异常：0XFE - /// 无效：0xFF - /// - public byte MaxTempBatteryAssemblyNo { get; set; } - /// - /// 最高温度值 - /// 有效值范围：0-250（数值偏移量40℃，表示-40℃ - +210℃） - /// 最小计量单元：1℃ - /// 异常：0XFE - /// 无效：0xFF - /// - public int MaxTempProbeBatteryValue { get; set; } - /// - /// 最低温度子系统号 - /// - public byte MinTempProbeBatteryNo { get; set; } - /// - /// 蓄电池中最低温度探针序号 - /// - public byte MinTempBatteryAssemblyNo { get; set; } - /// - /// 最低温度值 - /// - public int MinTempProbeBatteryValue { get; set; } - } -} diff --git a/src/GBNewEnergy.Protocol/NEProperties/NEUploadProperties/NEUploadFuelBatteryProperty.cs b/src/GBNewEnergy.Protocol/NEProperties/NEUploadProperties/NEUploadFuelBatteryProperty.cs deleted file mode 100644 index 77a2dd8..0000000 --- a/src/GBNewEnergy.Protocol/NEProperties/NEUploadProperties/NEUploadFuelBatteryProperty.cs +++ /dev/null @@ -1,103 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; -using GBNewEnergy.Protocol.Enums; - -namespace GBNewEnergy.Protocol.NEProperties.NEUploadProperties -{ - /// - /// 燃料电池数据 - /// - public class NEUploadFuelBatteryProperty : NEUploadPropertyBase - { - public override NEInfoType NEInfoType => NEInfoType.燃料电池数据; - /// - /// 燃料电池电压 - /// 有效值范围：0 - 20000（表示 0V-2000V） - /// 最小计量单元：0.1V - /// 异常：0xFF,0XFE - /// 无效：0xFF,0xFF - /// - public double FuelBatteryVoltage { get; set; } - /// - /// 燃料电池电流 - /// 有效值范围：0 - 20000（表示 0A- +2000A） - /// 最小计量单元：0.1 A - /// 异常：0xFF,0XFE - /// 无效：0xFF,0xFF - /// - public double FuelBatteryCurrent { get; set; } - /// - /// 燃料消耗率 - /// 有效值范围：0-60000（表示 0kg/100km - 600kg/100km） - /// 最小计量单元：0.01kg/100km - /// 异常：0xFF,0XFE - /// 无效：0xFF,0xFF - /// - public double FuelConsumptionRate { get; set; } - /// - /// 燃料电池温度探针总数 - /// N个燃料电池温度探针 - /// 有效值范围：0-65531 - /// 异常：0xFF,0XFE - /// 无效：0xFF,0xFF - /// - public int TemperatureProbeCount { get; set; } - /// - /// 探针温度值 - /// 有效值范围：0-240（数值偏移量40 ℃，表示-40 ℃ - +200 ℃） - /// 最小计量单元：1 ℃ - /// - public List TemperatureList { get; set; } = new List(); - /// - /// 氢系统中最高温度 - /// 有效值范围：0-2400（偏移量40 ℃，表示-40 ℃ - 200 ℃） - /// 最小计量单元：0.1 ℃ - /// 异常：0xFF,0XFE - /// 无效：0xFF,0xFF - /// - public double HydrogenSystemMaxTemp { get; set; } - /// - /// 氢系统中最高温度探针代号 - /// 有效值范围：1-252 - /// 异常：0XFE - /// 无效：0xFF - /// - public byte HydrogenSystemMaxTempNo { get; set; } - /// - /// 氢气最高浓度 - /// 有效值范围：0-60000（表示0 mg/kg - 50000 mg/kg） - /// 最小计量单元：1 mg/kg - /// 异常：0xFF,0XFE - /// 无效：0xFF,0xFF - /// - public double HydrogenSystemMaxConcentrations { get; set; } - /// - /// 氢气最高浓度传感器代号 - /// 有效值范围：1-252 - /// 异常：0XFE - /// 无效：0xFF - /// - public byte HydrogenSystemMaxConcentrationsNo { get; set; } - /// - /// 氢气最高压力 - /// 有效值范围：0-1000（表示0MPa - 100MPa）,最小计量单位：0.1MPa - /// - public double HydrogenSystemMaxPressure { get; set; } - /// - /// 氢气最高压力传感器代号 - /// 有效值访问:1-252 - /// 异常:0xFE - /// 无效:0xFF - /// - public byte HydrogenSystemMaxPressureNo { get; set; } - /// - /// 高压DC/DC状态 - /// 0x01:工作 - /// 0x02:断开 - /// 0xFE:表示异常 - /// 0xFF:表示无效 - /// - public byte DCStatus { get; set; } - } -} diff --git a/src/GBNewEnergy.Protocol/NEProperties/NEUploadProperties/NEUploadProperty.cs b/src/GBNewEnergy.Protocol/NEProperties/NEUploadProperties/NEUploadProperty.cs deleted file mode 100644 index f31683d..0000000 --- a/src/GBNewEnergy.Protocol/NEProperties/NEUploadProperties/NEUploadProperty.cs +++ /dev/null @@ -1,26 +0,0 @@ -using GBNewEnergy.Protocol.Enums; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace GBNewEnergy.Protocol.NEProperties.NEUploadProperties -{ - /// - /// 上报信息 - /// - public class NEUploadProperty : INEProperties - { - public string VIN { get ; set; } - - public NEUploadProperty(params NEUploadPropertyBase[] NEUploadPropertyBase) - { - if (NEUploadPropertyBase != null) - { - NEUploadPropertys = NEUploadPropertyBase.ToList(); - } - } - - public List NEUploadPropertys { get; set; } - } -} diff --git a/src/GBNewEnergy.Protocol/NEProperties/NEUploadProperties/NEUploadPropertyBase.cs b/src/GBNewEnergy.Protocol/NEProperties/NEUploadProperties/NEUploadPropertyBase.cs deleted file mode 100644 index 97df227..0000000 --- a/src/GBNewEnergy.Protocol/NEProperties/NEUploadProperties/NEUploadPropertyBase.cs +++ /dev/null @@ -1,12 +0,0 @@ -using GBNewEnergy.Protocol.Enums; -using System; -using System.Collections.Generic; -using System.Text; - -namespace GBNewEnergy.Protocol.NEProperties.NEUploadProperties -{ - public abstract class NEUploadPropertyBase - { - public abstract NEInfoType NEInfoType { get; } - } -} diff --git a/src/GBNewEnergy.Protocol/NEProperties/NEUploadProperties/NEUploadVehiclePositionProperty.cs b/src/GBNewEnergy.Protocol/NEProperties/NEUploadProperties/NEUploadVehiclePositionProperty.cs deleted file mode 100644 index 0bd82cc..0000000 --- a/src/GBNewEnergy.Protocol/NEProperties/NEUploadProperties/NEUploadVehiclePositionProperty.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; -using GBNewEnergy.Protocol.Enums; - -namespace GBNewEnergy.Protocol.NEProperties.NEUploadProperties -{ - /// - /// 车辆位置数据 - /// - public class NEUploadVehiclePositionProperty : NEUploadPropertyBase - { - public override NEInfoType NEInfoType => NEInfoType.车辆位置数据; - /// - /// 定位状态 - /// 0位：0：有效定位；1：无效定位（当数据通信正常，而不能获取定位信息时，发送最后一次有效定位信息，并将定位状态置为无效。） - /// 1位：0：北纬；1：南纬 - /// 2位：0：东经；1：西经 - /// 3-7位：保留 - /// - public byte PositioStatus { get; set; } - /// - /// 经度 - /// 以度位单位的经度值乘以10^6，精确到百万分之一度 - /// - public double Lng { get; set; } - /// - /// 纬度 - /// 以度位单位的纬度值乘以10^6，精确到百万分之一度 - /// - public double Lat { get; set; } - } -} diff --git a/src/GBNewEnergy.Protocol/NEProperties/NEUploadProperties/NEUploadVehicleProperty.cs b/src/GBNewEnergy.Protocol/NEProperties/NEUploadProperties/NEUploadVehicleProperty.cs deleted file mode 100644 index b01a676..0000000 --- a/src/GBNewEnergy.Protocol/NEProperties/NEUploadProperties/NEUploadVehicleProperty.cs +++ /dev/null @@ -1,72 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; -using GBNewEnergy.Protocol.Enums; - -namespace GBNewEnergy.Protocol.NEProperties.NEUploadProperties -{ - /// - /// 整车数据 - /// - public class NEUploadVehicleProperty : NEUploadPropertyBase - { - public override NEInfoType NEInfoType => NEInfoType.整车数据; - - /// - /// 车辆状态 - /// - public byte CarStatus { get; set; } - /// - /// 充放电状态 - /// - public byte ChargeStatus { get; set; } - /// - /// 运行模式 - /// - public byte OperationMode { get; set; } - /// - /// 车速 - /// - public double Speed { get; set; } - /// - /// 当前里程 - /// - public double Dis { get; set; } - /// - /// 总里程 - /// - public double TotalDis { get; set; } - /// - /// 总电压 - /// - public double TotalVoltage { get; set; } - /// - /// 总电流 - /// - public double TotalTemp { get; set; } - /// - /// SOC - /// - public byte soc { get; set; } - /// - /// DC-DC 状态 - /// - public byte DCStatus { get; set; } - /// - /// 档位 - /// - public byte Stall { get; set; } - /// - /// 加速踏板行程值 - /// - public byte Accelerator { get; set; } - /// - /// 制动踏板状态 - /// - public byte Brakes { get; set; } - /// - /// 绝缘电阻 - /// - public int Resistance { get; set; } - } -} diff --git a/src/GBNewEnergy.Protocol/NEUpStreamBase.cs b/src/GBNewEnergy.Protocol/NEUpStreamBase.cs deleted file mode 100644 index f94a94e..0000000 --- a/src/GBNewEnergy.Protocol/NEUpStreamBase.cs +++ /dev/null @@ -1,14 +0,0 @@ -using GBNewEnergy.Protocol.Enums; -using System; -using System.Collections.Generic; -using System.Text; - -namespace GBNewEnergy.Protocol -{ - public abstract class NEUpStreamBase - { - public DateTime Utc{ get; set; } - public byte[] Buffer { get;protected set; } - public abstract void ToBuffer(); - } -} diff --git a/src/GBNewEnergy.Protocol/UpStream/CommonUpStream.cs b/src/GBNewEnergy.Protocol/UpStream/CommonUpStream.cs deleted file mode 100644 index 18ee1f7..0000000 --- a/src/GBNewEnergy.Protocol/UpStream/CommonUpStream.cs +++ /dev/null @@ -1,37 +0,0 @@ -using GBNewEnergy.Protocol.Extensions; -using System; -using System.Collections.Generic; -using System.Text; - -namespace GBNewEnergy.Protocol.UpStream -{ - /// - /// 通用应答 - /// - public class CommonUpStream : NEBodies - { - public CommonUpStream(byte[] buffer, NEGlobalConfigs nEConfigs) : base(buffer, nEConfigs) - { - } - - public CommonUpStream(INEProperties nEProperties, NEGlobalConfigs nEConfigs) : base(nEProperties, nEConfigs) - { - } - - protected override void InitializeProperties(INEProperties nEProperties) - { - - } - - protected override void InitializePropertiesFromBuffer() - { - CurrentDateTime = Buffer.ReadDateTimeLittle(0, 6); - } - - protected override void ToBuffer() - { - Buffer = new byte[6]; - Buffer.WriteLittle(CurrentDateTime, 0, 6); - } - } -} diff --git a/src/GBNewEnergy.Protocol/UpStream/NELoginUpStream.cs b/src/GBNewEnergy.Protocol/UpStream/NELoginUpStream.cs deleted file mode 100644 index f72593d..0000000 --- a/src/GBNewEnergy.Protocol/UpStream/NELoginUpStream.cs +++ /dev/null @@ -1,106 +0,0 @@ -using GBNewEnergy.Protocol.Extensions; -using GBNewEnergy.Protocol.NEProperties; -using System; -using System.Collections.Generic; -using System.IO; -using System.Text; - -namespace GBNewEnergy.Protocol.UpStream -{ - /// - /// 车辆登入 - /// - public class NELoginUpStream : NEBodies - { - public NELoginUpStream(INEProperties nEProperties, NEGlobalConfigs nEConfigs) : base(nEProperties, nEConfigs) - { - } - - public NELoginUpStream(byte[] buffer, NEGlobalConfigs nEConfigs) : base(buffer, nEConfigs) - { - } - - /// - /// SIM 卡号 - /// - public string SIM { get; set; } - /// - /// 电池总成数 - /// 可充电储能子系统数 - /// - public byte BatteryCount { get; set; } - /// - /// 电池编码长度 - /// 可充电储能系统编码长度 - /// - public byte BatteryLength { get; set; } - /// - /// 电池编码 - /// 可充电储能系统编码 - /// - public IEnumerable BatteryNos { get; set; } - - protected override void ToBuffer() - { - // 根据协议说明书 - Buffer = new byte[6 + 2 + 20 + 1 + 1 + (BatteryCount * BatteryLength)]; - Buffer.WriteLittle(CurrentDateTime, 0, 6); - Buffer.WriteLittle(LoginNum, 6, 2); - Buffer.WriteLittle(SIM, 8); - Buffer[28] = BatteryCount; - Buffer[29] = BatteryLength; - if ((BatteryCount * BatteryLength) != 0) - { - string str = string.Join("", BatteryNos); - Buffer.WriteLittle(str, 30); - } - } - - protected override void InitializeProperties(INEProperties nEProperties) - { - NELoginProperty nELoginProperty = (NELoginProperty)nEProperties; - if (LoginNumDict.ContainsKey(nELoginProperty.VIN)) - { - LoginInfo temp; - if (LoginNumDict.TryGetValue(nELoginProperty.VIN, out temp)) - { - // 不等于当天 - if (temp.ExpirationTime != DateTime.Now.Date) - { - LoginNum = 1; - LoginNumDict.TryUpdate(nELoginProperty.VIN, new LoginInfo { LoginNum = LoginNum, ExpirationTime=DateTime.Now.Date }, temp); - } - else - {// 自增1 更新字典 - LoginNum = temp.LoginNum++; - LoginNumDict.TryUpdate(nELoginProperty.VIN, new LoginInfo { LoginNum = LoginNum, ExpirationTime = DateTime.Now.Date }, temp); - } - } - } - else - { - LoginNum = 1; - LoginNumDict.TryAdd(nELoginProperty.VIN, new LoginInfo { LoginNum = LoginNum, ExpirationTime = DateTime.Now.Date }); - } - SIM = nELoginProperty.SIM; - BatteryCount = nELoginProperty.BatteryCount; - BatteryLength = nELoginProperty.BatteryLength; - BatteryNos = nELoginProperty.BatteryNos; - } - - protected override void InitializePropertiesFromBuffer() - { - CurrentDateTime = Buffer.ReadDateTimeLittle(0, 6); - LoginNum = Buffer.ReadUShortH2LLittle(6, 2); - SIM = Buffer.ReadStringLittle(8, 20); - BatteryCount = Buffer[28]; - BatteryLength = Buffer[29]; - List batteryNos = new List(); - for (int i = 0; i < BatteryCount; i++) - { - batteryNos.Add(Buffer.ReadStringLittle(i * BatteryLength + 30, BatteryLength)); - } - BatteryNos = batteryNos; - } - } -} diff --git a/src/GBNewEnergy.Protocol/UpStream/NELogoutUpStream.cs b/src/GBNewEnergy.Protocol/UpStream/NELogoutUpStream.cs deleted file mode 100644 index 1be54f8..0000000 --- a/src/GBNewEnergy.Protocol/UpStream/NELogoutUpStream.cs +++ /dev/null @@ -1,50 +0,0 @@ -using GBNewEnergy.Protocol.Exceptions; -using GBNewEnergy.Protocol.Extensions; -using System; -using System.Collections.Generic; -using System.Text; -using GBNewEnergy.Protocol.NEProperties; - -namespace GBNewEnergy.Protocol.UpStream -{ - /// - /// 车辆登出 - /// - public class NELogoutUpStream : NEBodies - { - public NELogoutUpStream(INEProperties nEProperties, NEGlobalConfigs nEConfigs) : base(nEProperties, nEConfigs) - { - } - - public NELogoutUpStream(byte[] buffer, NEGlobalConfigs nEConfigs) : base(buffer, nEConfigs) - { - } - - protected override void InitializeProperties(INEProperties nEProperties) - { - NELogoutProperty nELogoutProperty = (NELogoutProperty)nEProperties; - LoginInfo temp; - if (LoginNumDict.TryGetValue(nELogoutProperty.VIN, out temp)) - { - LoginNum = temp.LoginNum; - } - else - { - throw new NEException(Enums.NEErrorCode.LoginSerialNoError, "Must Dependency NELoginUpStream Class."); - } - } - - protected override void InitializePropertiesFromBuffer() - { - CurrentDateTime = Buffer.ReadDateTimeLittle(0, 6); - LoginNum = Buffer.ReadUShortH2LLittle(6, 2); - } - - protected override void ToBuffer() - { - Buffer = new byte[8]; - Buffer.WriteLittle(CurrentDateTime, 0, 6); - Buffer.WriteLittle(LoginNum, 6, 2); - } - } -} diff --git a/src/GBNewEnergy.Protocol/UpStream/NEPlatformLoginUpStream.cs b/src/GBNewEnergy.Protocol/UpStream/NEPlatformLoginUpStream.cs deleted file mode 100644 index 7935414..0000000 --- a/src/GBNewEnergy.Protocol/UpStream/NEPlatformLoginUpStream.cs +++ /dev/null @@ -1,88 +0,0 @@ -using GBNewEnergy.Protocol.Enums; -using GBNewEnergy.Protocol.Extensions; -using GBNewEnergy.Protocol.NEProperties; -using System; -using System.Collections.Generic; -using System.Text; - -namespace GBNewEnergy.Protocol.UpStream -{ - /// - /// 平台登入 - /// - public class NEPlatformLoginUpStream : NEBodies - { - public NEPlatformLoginUpStream(byte[] buffer, NEGlobalConfigs nEConfigs) : base(buffer, nEConfigs) - { - } - - public NEPlatformLoginUpStream(INEProperties nEProperties, NEGlobalConfigs nEConfigs) : base(nEProperties, nEConfigs) - { - } - - /// - /// 平台用户名 - /// - public string UserName { get; set; } - - /// - /// 加密规则 - /// - public NEEncryptMethod EncryptMethod { get; set; } - - /// - /// 平台密码 - /// - public string Password { get; set; } - - protected override void InitializeProperties(INEProperties nEProperties) - { - NEPlatformLoginProperty nEPlatformLoginProperty = (NEPlatformLoginProperty)nEProperties; - if (PlatformLoginNumDict.ContainsKey(nEPlatformLoginProperty.UserName)) - { - PlatformLoginInfo temp; - if (PlatformLoginNumDict.TryGetValue(nEPlatformLoginProperty.UserName, out temp)) - { - // 不等于当天 - if (temp.ExpirationTime != DateTime.Now.Date) - { - LoginNum = 1; - PlatformLoginNumDict.TryUpdate(nEPlatformLoginProperty.UserName, new PlatformLoginInfo { LoginNum = LoginNum, ExpirationTime = DateTime.Now.Date }, temp); - } - else - {// 自增1 更新字典 - LoginNum = temp.LoginNum++; - PlatformLoginNumDict.TryUpdate(nEPlatformLoginProperty.UserName, new PlatformLoginInfo { LoginNum = LoginNum, ExpirationTime = DateTime.Now.Date }, temp); - } - } - } - else - { - LoginNum = 1; - PlatformLoginNumDict.TryAdd(nEPlatformLoginProperty.UserName, new PlatformLoginInfo { LoginNum = LoginNum, ExpirationTime = DateTime.Now.Date }); - } - UserName = nEPlatformLoginProperty.UserName; - EncryptMethod = nEPlatformLoginProperty.EncryptMethod; - Password = nEPlatformLoginProperty.Password; - } - - protected override void InitializePropertiesFromBuffer() - { - CurrentDateTime = Buffer.ReadDateTimeLittle(0, 6); - LoginNum = Buffer.ReadUShortH2LLittle(6, 2); - UserName = Buffer.ReadStringLittle(8, 12); - Password = Buffer.ReadStringLittle(20, 20); - EncryptMethod= (NEEncryptMethod)Buffer[40]; - } - - protected override void ToBuffer() - { - Buffer = new byte[6+2+12+20+1]; - Buffer.WriteLittle(CurrentDateTime, 0, 6); - Buffer.WriteLittle(LoginNum, 6, 2); - Buffer.WriteLittle(UserName, 12); - Buffer.WriteLittle(Password, 20); - Buffer.WriteLittle((byte)EncryptMethod, 40); - } - } -} diff --git a/src/GBNewEnergy.Protocol/UpStream/NEPlatformLogoutUpStream.cs b/src/GBNewEnergy.Protocol/UpStream/NEPlatformLogoutUpStream.cs deleted file mode 100644 index 4323a91..0000000 --- a/src/GBNewEnergy.Protocol/UpStream/NEPlatformLogoutUpStream.cs +++ /dev/null @@ -1,47 +0,0 @@ -using GBNewEnergy.Protocol.Exceptions; -using GBNewEnergy.Protocol.Extensions; -using GBNewEnergy.Protocol.NEProperties; - -namespace GBNewEnergy.Protocol.UpStream -{ - /// - /// 平台登出 - /// - public class NEPlatformLogoutUpStream : NEBodies - { - public NEPlatformLogoutUpStream(INEProperties nEProperties, NEGlobalConfigs nEConfigs) : base(nEProperties, nEConfigs) - { - } - - public NEPlatformLogoutUpStream(byte[] buffer, NEGlobalConfigs nEConfigs) : base(buffer, nEConfigs) - { - } - - protected override void InitializeProperties(INEProperties nEProperties) - { - NEPlatformLogoutProperty nEPlatformLogoutProperty = (NEPlatformLogoutProperty)nEProperties; - PlatformLoginInfo temp; - if (PlatformLoginNumDict.TryGetValue(nEPlatformLogoutProperty.UserName, out temp)) - { - LoginNum = temp.LoginNum; - } - else - { - throw new NEException(Enums.NEErrorCode.LoginSerialNoError, "Must Dependency NEPlatformLoginUpStream Class."); - } - } - - protected override void InitializePropertiesFromBuffer() - { - CurrentDateTime = Buffer.ReadDateTimeLittle(0, 6); - LoginNum = Buffer.ReadUShortH2LLittle(6, 2); - } - - protected override void ToBuffer() - { - Buffer = new byte[8]; - Buffer.WriteLittle(CurrentDateTime, 0, 6); - Buffer.WriteLittle(LoginNum, 6, 2); - } - } -} diff --git a/src/GBNewEnergy.Protocol/UpStream/NERealUploadUpStream.cs b/src/GBNewEnergy.Protocol/UpStream/NERealUploadUpStream.cs deleted file mode 100644 index db8217a..0000000 --- a/src/GBNewEnergy.Protocol/UpStream/NERealUploadUpStream.cs +++ /dev/null @@ -1,38 +0,0 @@ -using GBNewEnergy.Protocol.NEProperties.NEUploadProperties; -using System; -using System.Collections.Generic; -using System.Text; - -namespace GBNewEnergy.Protocol.UpStream -{ - /// - /// 实时信息上报 - /// - public class NERealUploadUpStream : NEBodies - { - public NERealUploadUpStream(byte[] buffer, NEGlobalConfigs nEConfigs) : base(buffer, nEConfigs) - { - } - - public NERealUploadUpStream(INEProperties nEProperties, NEGlobalConfigs nEConfigs) : base(nEProperties, nEConfigs) - { - } - - public NEUploadProperty NEUploadProperty { get;private set; } - - protected override void InitializeProperties(INEProperties nEProperties) - { - NEUploadProperty = (NEUploadProperty)nEProperties; - } - - protected override void InitializePropertiesFromBuffer() - { - throw new NotImplementedException(); - } - - protected override void ToBuffer() - { - throw new NotImplementedException(); - } - } -} diff --git a/src/GBNewEnergy.sln b/src/GBNewEnergy.sln deleted file mode 100644 index 36b30b5..0000000 --- a/src/GBNewEnergy.sln +++ /dev/null @@ -1,56 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27703.2018 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GBNewEnergy.Protocol", "GBNewEnergy.Protocol\GBNewEnergy.Protocol.csproj", "{1934F3A6-1396-46C2-BFD6-1E2DC1A26E3A}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GBNewEnergy.Protocol.Test", "GBNewEnergy.Protocol.Test\GBNewEnergy.Protocol.Test.csproj", "{AAA669F5-E689-40CA-97EF-B5BA672B11DD}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NEEncrypts.Tests", "NEEncrypts.Tests", "{1D162FFB-5944-470C-B6F0-8F7387C706DF}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NEEncryptsNET4.Test", "NEEncrypts.Tests\NEEncryptsNET4.Test\NEEncryptsNET4.Test.csproj", "{7C7C1511-EB17-4DBF-B04F-EFE8FF4ECE92}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NEEncryptsNET45.Test", "NEEncrypts.Tests\NEEncryptsNET45.Test\NEEncryptsNET45.Test.csproj", "{1ED77002-D542-4013-B71A-C52CE92D5747}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NEEncryptsNETCore.Test", "NEEncrypts.Tests\NEEncryptsNETCore.Test\NEEncryptsNETCore.Test.csproj", "{361FD688-A06B-4D68-9B76-93C6559278E8}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {1934F3A6-1396-46C2-BFD6-1E2DC1A26E3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1934F3A6-1396-46C2-BFD6-1E2DC1A26E3A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1934F3A6-1396-46C2-BFD6-1E2DC1A26E3A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1934F3A6-1396-46C2-BFD6-1E2DC1A26E3A}.Release|Any CPU.Build.0 = Release|Any CPU - {AAA669F5-E689-40CA-97EF-B5BA672B11DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AAA669F5-E689-40CA-97EF-B5BA672B11DD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AAA669F5-E689-40CA-97EF-B5BA672B11DD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AAA669F5-E689-40CA-97EF-B5BA672B11DD}.Release|Any CPU.Build.0 = Release|Any CPU - {7C7C1511-EB17-4DBF-B04F-EFE8FF4ECE92}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7C7C1511-EB17-4DBF-B04F-EFE8FF4ECE92}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7C7C1511-EB17-4DBF-B04F-EFE8FF4ECE92}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7C7C1511-EB17-4DBF-B04F-EFE8FF4ECE92}.Release|Any CPU.Build.0 = Release|Any CPU - {1ED77002-D542-4013-B71A-C52CE92D5747}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1ED77002-D542-4013-B71A-C52CE92D5747}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1ED77002-D542-4013-B71A-C52CE92D5747}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1ED77002-D542-4013-B71A-C52CE92D5747}.Release|Any CPU.Build.0 = Release|Any CPU - {361FD688-A06B-4D68-9B76-93C6559278E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {361FD688-A06B-4D68-9B76-93C6559278E8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {361FD688-A06B-4D68-9B76-93C6559278E8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {361FD688-A06B-4D68-9B76-93C6559278E8}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {7C7C1511-EB17-4DBF-B04F-EFE8FF4ECE92} = {1D162FFB-5944-470C-B6F0-8F7387C706DF} - {1ED77002-D542-4013-B71A-C52CE92D5747} = {1D162FFB-5944-470C-B6F0-8F7387C706DF} - {361FD688-A06B-4D68-9B76-93C6559278E8} = {1D162FFB-5944-470C-B6F0-8F7387C706DF} - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {E7AF20B3-4327-4DF7-B503-9FE08AA92A75} - EndGlobalSection -EndGlobal diff --git a/src/NEEncrypts.Tests/NEEncrypts for linux.png b/src/NEEncrypts.Tests/NEEncrypts for linux.png deleted file mode 100644 index 83c58b3dbacf23bbf3e61fc25734d5dc66afdebc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 85989 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

p#!aF5urSV#BNbtNxPK(UHH~n8JkSe5WhIU*pt* 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 WSM - - - - Debug - AnyCPU - {7C7C1511-EB17-4DBF-B04F-EFE8FF4ECE92} - Exe - NEEncryptsNET4.Test - NEEncryptsNET4.Test - v4.0 - 512 - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - - - - - - {1934f3a6-1396-46c2-bfd6-1e2dc1a26e3a} - GBNewEnergy.Protocol - - - - \ No newline at end of file diff --git a/src/NEEncrypts.Tests/NEEncryptsNET4.Test/Program.cs b/src/NEEncrypts.Tests/NEEncryptsNET4.Test/Program.cs deleted file mode 100644 index aa38ed5..0000000 --- a/src/NEEncrypts.Tests/NEEncryptsNET4.Test/Program.cs +++ /dev/null @@ -1,46 +0,0 @@ -using GBNewEnergy.Protocol.NEEncrypts; -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Security.Cryptography; -using System.Text; -using GBNewEnergy.Protocol.Extensions; - -namespace NEEncryptsNET4.Test -{ - class Program - { - static void Main(string[] args) - { - Default_NEAES128EncryptImpl nE_AES128EncryptImpl = new Default_NEAES128EncryptImpl("smallchi"); - string str = "aaasssddd123"; - var bytes = Encoding.UTF8.GetBytes(str); - var encrypt = nE_AES128EncryptImpl.Encrypt(bytes); - Console.WriteLine("原数据:" + str); - Console.WriteLine("加密后:" + encrypt.ToHexString()); - Console.WriteLine("解密后:" + Encoding.UTF8.GetString(nE_AES128EncryptImpl.Decrypt(encrypt))); - - Default_NERSAEncryptImpl_NET rsa = new Default_NERSAEncryptImpl_NET(Encoding.UTF8, - "SHA256", - "s+rl5mtcckCF9mEECD86L9UE2pbCR4CuiqDepwpiZCEflymQLNC3qNUPDlua9/kltyu6L489uimHRbEp4C7Gl7dDmaXVZLUVGkgUCZoRc8MrOw4+BiVAeQtCDdilPpA7DMN0bMfJAj3U4GuTU89/OWZMb9SYFfqEHM2e60PZHIU=AQAB

8qSTX42w2NaMCXL0PTZuacUFdJj93KopOJPD2q/JfmXSjXHV/IQK9YlCVKXHucqy8xcQgjkaKHqy3Rse14SZ7Q==

vdJfDZ6ZIAQDx0sQbmbadHb6EOr8/oXo8B1CUSG0LqFZgDY7vBj17ujd6UhJWzhsg/5/3L+m4wDjMkUpOExZ+Q==Av3Uc1Ej5QiAIX2xVS/enJ85Of7I4neWmoP33jJcoZpPxj6pDLv0BqLylmiU1c2R9z1JjtF1aRpaKi+zaaTQ4Q==Pv5yhv2MCYDrlBbIJCtD8gSN5lFllj3wWMcM/Am4VwU6w368Aicybo+fHUzc80XdVUx/OE3t30WrIEKtdD56WQ==OcUQg0/kEGi9l2CgXCLKmQ1/1VVb+r89LXTO6rqi2wg5txkJIIXXePx7ce0Bh0eEnZzeSudwBLA3kqXmeAyYaw==mnPL+zwtd7OmjTUJ5h6JUCi56wFDNWjl7gJeQd4rSzQYT4eRyrc/A4QsUbIYXkqXsyCpzExWvGsMQqrtfRQKzR53MBL3MQln5BjAUql2NqCkM2KT/D8Px5M21/TpMAycK4tGLOHgcCQRH1PQLHG1OfpfDASIzLwLgMjvMuHnIyE=", - "s+rl5mtcckCF9mEECD86L9UE2pbCR4CuiqDepwpiZCEflymQLNC3qNUPDlua9/kltyu6L489uimHRbEp4C7Gl7dDmaXVZLUVGkgUCZoRc8MrOw4+BiVAeQtCDdilPpA7DMN0bMfJAj3U4GuTU89/OWZMb9SYFfqEHM2e60PZHIU=AQAB

8qSTX42w2NaMCXL0PTZuacUFdJj93KopOJPD2q/JfmXSjXHV/IQK9YlCVKXHucqy8xcQgjkaKHqy3Rse14SZ7Q==

vdJfDZ6ZIAQDx0sQbmbadHb6EOr8/oXo8B1CUSG0LqFZgDY7vBj17ujd6UhJWzhsg/5/3L+m4wDjMkUpOExZ+Q==Av3Uc1Ej5QiAIX2xVS/enJ85Of7I4neWmoP33jJcoZpPxj6pDLv0BqLylmiU1c2R9z1JjtF1aRpaKi+zaaTQ4Q==Pv5yhv2MCYDrlBbIJCtD8gSN5lFllj3wWMcM/Am4VwU6w368Aicybo+fHUzc80XdVUx/OE3t30WrIEKtdD56WQ==OcUQg0/kEGi9l2CgXCLKmQ1/1VVb+r89LXTO6rqi2wg5txkJIIXXePx7ce0Bh0eEnZzeSudwBLA3kqXmeAyYaw==mnPL+zwtd7OmjTUJ5h6JUCi56wFDNWjl7gJeQd4rSzQYT4eRyrc/A4QsUbIYXkqXsyCpzExWvGsMQqrtfRQKzR53MBL3MQln5BjAUql2NqCkM2KT/D8Px5M21/TpMAycK4tGLOHgcCQRH1PQLHG1OfpfDASIzLwLgMjvMuHnIyE=" - ); - - Console.WriteLine("原始字符串：" + str); - //加密 - byte[] enBytes = rsa.Encrypt(Encoding.UTF8.GetBytes(str)); - Console.WriteLine("加密字符串：" + enBytes.ToHexString()); - //解密 - byte[] deBytes = rsa.Decrypt(enBytes); - Console.WriteLine("解密字符串：" + Encoding.UTF8.GetString(deBytes)); - //私钥签名 - string signStr = rsa.Sign(str); - Console.WriteLine("字符串签名：" + signStr); - //公钥验证签名 - bool signVerify = rsa.Verify(str, signStr); - Console.WriteLine("验证签名：" + signVerify); - Console.ReadKey(); - } - } -} diff --git a/src/NEEncrypts.Tests/NEEncryptsNET4.Test/Properties/AssemblyInfo.cs b/src/NEEncrypts.Tests/NEEncryptsNET4.Test/Properties/AssemblyInfo.cs deleted file mode 100644 index dc3d42f..0000000 --- a/src/NEEncrypts.Tests/NEEncryptsNET4.Test/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// 有关程序集的一般信息由以下 -// 控制。更改这些特性值可修改 -// 与程序集关联的信息。 -[assembly: AssemblyTitle("NEEncryptsNET4.Test")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("NEEncryptsNET4.Test")] -[assembly: AssemblyCopyright("Copyright © 2018")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// 将 ComVisible 设置为 false 会使此程序集中的类型 -//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型 -//请将此类型的 ComVisible 特性设置为 true。 -[assembly: ComVisible(false)] - -// 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID -[assembly: Guid("7c7c1511-eb17-4dbf-b04f-efe8ff4ece92")] - -// 程序集的版本信息由下列四个值组成: -// -// 主版本 -// 次版本 -// 生成号 -// 修订号 -// -// 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号 -// 方法是按如下所示使用“*”: : -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/NEEncrypts.Tests/NEEncryptsNET45.Test/App.config b/src/NEEncrypts.Tests/NEEncryptsNET45.Test/App.config deleted file mode 100644 index 8e15646..0000000 --- a/src/NEEncrypts.Tests/NEEncryptsNET45.Test/App.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/NEEncrypts.Tests/NEEncryptsNET45.Test/NEEncryptsNET45.Test.csproj b/src/NEEncrypts.Tests/NEEncryptsNET45.Test/NEEncryptsNET45.Test.csproj deleted file mode 100644 index 4772fa8..0000000 --- a/src/NEEncrypts.Tests/NEEncryptsNET45.Test/NEEncryptsNET45.Test.csproj +++ /dev/null @@ -1,57 +0,0 @@ - - - - - Debug - AnyCPU - {1ED77002-D542-4013-B71A-C52CE92D5747} - Exe - NEEncryptsNET45.Test - NEEncryptsNET45.Test - v4.5 - 512 - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - - - - - - - - - - {1934f3a6-1396-46c2-bfd6-1e2dc1a26e3a} - GBNewEnergy.Protocol - - - - \ No newline at end of file diff --git a/src/NEEncrypts.Tests/NEEncryptsNET45.Test/Program.cs b/src/NEEncrypts.Tests/NEEncryptsNET45.Test/Program.cs deleted file mode 100644 index ec6bed1..0000000 --- a/src/NEEncrypts.Tests/NEEncryptsNET45.Test/Program.cs +++ /dev/null @@ -1,45 +0,0 @@ -using GBNewEnergy.Protocol.Extensions; -using GBNewEnergy.Protocol.NEEncrypts; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace NEEncryptsNET45.Test -{ - class Program - { - static void Main(string[] args) - { - Default_NEAES128EncryptImpl nE_AES128EncryptImpl = new Default_NEAES128EncryptImpl("smallchi"); - string str = "aaasssddd123"; - var bytes = Encoding.UTF8.GetBytes(str); - var encrypt = nE_AES128EncryptImpl.Encrypt(bytes); - Console.WriteLine("原数据:" + str); - Console.WriteLine("加密后:" + encrypt.ToHexString()); - Console.WriteLine("解密后:" + Encoding.UTF8.GetString(nE_AES128EncryptImpl.Decrypt(encrypt))); - - Default_NERSAEncryptImpl_NET rsa = new Default_NERSAEncryptImpl_NET(Encoding.UTF8, - "SHA256", - "s+rl5mtcckCF9mEECD86L9UE2pbCR4CuiqDepwpiZCEflymQLNC3qNUPDlua9/kltyu6L489uimHRbEp4C7Gl7dDmaXVZLUVGkgUCZoRc8MrOw4+BiVAeQtCDdilPpA7DMN0bMfJAj3U4GuTU89/OWZMb9SYFfqEHM2e60PZHIU=AQAB

8qSTX42w2NaMCXL0PTZuacUFdJj93KopOJPD2q/JfmXSjXHV/IQK9YlCVKXHucqy8xcQgjkaKHqy3Rse14SZ7Q==

vdJfDZ6ZIAQDx0sQbmbadHb6EOr8/oXo8B1CUSG0LqFZgDY7vBj17ujd6UhJWzhsg/5/3L+m4wDjMkUpOExZ+Q==Av3Uc1Ej5QiAIX2xVS/enJ85Of7I4neWmoP33jJcoZpPxj6pDLv0BqLylmiU1c2R9z1JjtF1aRpaKi+zaaTQ4Q==Pv5yhv2MCYDrlBbIJCtD8gSN5lFllj3wWMcM/Am4VwU6w368Aicybo+fHUzc80XdVUx/OE3t30WrIEKtdD56WQ==OcUQg0/kEGi9l2CgXCLKmQ1/1VVb+r89LXTO6rqi2wg5txkJIIXXePx7ce0Bh0eEnZzeSudwBLA3kqXmeAyYaw==mnPL+zwtd7OmjTUJ5h6JUCi56wFDNWjl7gJeQd4rSzQYT4eRyrc/A4QsUbIYXkqXsyCpzExWvGsMQqrtfRQKzR53MBL3MQln5BjAUql2NqCkM2KT/D8Px5M21/TpMAycK4tGLOHgcCQRH1PQLHG1OfpfDASIzLwLgMjvMuHnIyE=", - "s+rl5mtcckCF9mEECD86L9UE2pbCR4CuiqDepwpiZCEflymQLNC3qNUPDlua9/kltyu6L489uimHRbEp4C7Gl7dDmaXVZLUVGkgUCZoRc8MrOw4+BiVAeQtCDdilPpA7DMN0bMfJAj3U4GuTU89/OWZMb9SYFfqEHM2e60PZHIU=AQAB

8qSTX42w2NaMCXL0PTZuacUFdJj93KopOJPD2q/JfmXSjXHV/IQK9YlCVKXHucqy8xcQgjkaKHqy3Rse14SZ7Q==

vdJfDZ6ZIAQDx0sQbmbadHb6EOr8/oXo8B1CUSG0LqFZgDY7vBj17ujd6UhJWzhsg/5/3L+m4wDjMkUpOExZ+Q==Av3Uc1Ej5QiAIX2xVS/enJ85Of7I4neWmoP33jJcoZpPxj6pDLv0BqLylmiU1c2R9z1JjtF1aRpaKi+zaaTQ4Q==Pv5yhv2MCYDrlBbIJCtD8gSN5lFllj3wWMcM/Am4VwU6w368Aicybo+fHUzc80XdVUx/OE3t30WrIEKtdD56WQ==OcUQg0/kEGi9l2CgXCLKmQ1/1VVb+r89LXTO6rqi2wg5txkJIIXXePx7ce0Bh0eEnZzeSudwBLA3kqXmeAyYaw==mnPL+zwtd7OmjTUJ5h6JUCi56wFDNWjl7gJeQd4rSzQYT4eRyrc/A4QsUbIYXkqXsyCpzExWvGsMQqrtfRQKzR53MBL3MQln5BjAUql2NqCkM2KT/D8Px5M21/TpMAycK4tGLOHgcCQRH1PQLHG1OfpfDASIzLwLgMjvMuHnIyE=" - ); - - Console.WriteLine("原始字符串：" + str); - //加密 - byte[] enBytes = rsa.Encrypt(Encoding.UTF8.GetBytes(str)); - Console.WriteLine("加密字符串：" + enBytes.ToHexString()); - //解密 - byte[] deBytes = rsa.Decrypt(enBytes); - Console.WriteLine("解密字符串：" + Encoding.UTF8.GetString(deBytes)); - //私钥签名 - string signStr = rsa.Sign(str); - Console.WriteLine("字符串签名：" + signStr); - //公钥验证签名 - bool signVerify = rsa.Verify(str, signStr); - Console.WriteLine("验证签名：" + signVerify); - Console.ReadKey(); - } - } -} diff --git a/src/NEEncrypts.Tests/NEEncryptsNET45.Test/Properties/AssemblyInfo.cs b/src/NEEncrypts.Tests/NEEncryptsNET45.Test/Properties/AssemblyInfo.cs deleted file mode 100644 index 4fc5026..0000000 --- a/src/NEEncrypts.Tests/NEEncryptsNET45.Test/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// 有关程序集的一般信息由以下 -// 控制。更改这些特性值可修改 -// 与程序集关联的信息。 -[assembly: AssemblyTitle("NEEncryptsNET45.Test")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("NEEncryptsNET45.Test")] -[assembly: AssemblyCopyright("Copyright © 2018")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// 将 ComVisible 设置为 false 会使此程序集中的类型 -//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型 -//请将此类型的 ComVisible 特性设置为 true。 -[assembly: ComVisible(false)] - -// 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID -[assembly: Guid("1ed77002-d542-4013-b71a-c52ce92d5747")] - -// 程序集的版本信息由下列四个值组成: -// -// 主版本 -// 次版本 -// 生成号 -// 修订号 -// -// 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号 -// 方法是按如下所示使用“*”: : -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/NEEncrypts.Tests/NEEncryptsNETCore.Test/NEEncryptsNETCore.Test.csproj b/src/NEEncrypts.Tests/NEEncryptsNETCore.Test/NEEncryptsNETCore.Test.csproj deleted file mode 100644 index 8062fb2..0000000 --- a/src/NEEncrypts.Tests/NEEncryptsNETCore.Test/NEEncryptsNETCore.Test.csproj +++ /dev/null @@ -1,12 +0,0 @@ - - - - Exe - netcoreapp2.1 - - - - - - - diff --git a/src/NEEncrypts.Tests/NEEncryptsNETCore.Test/Program.cs b/src/NEEncrypts.Tests/NEEncryptsNETCore.Test/Program.cs deleted file mode 100644 index dcaadf5..0000000 --- a/src/NEEncrypts.Tests/NEEncryptsNETCore.Test/Program.cs +++ /dev/null @@ -1,52 +0,0 @@ -using GBNewEnergy.Protocol.NEEncrypts; -using GBNewEnergy.Protocol.Extensions; -using System; -using System.Text; -using System.Security.Cryptography; - -namespace NEEncryptsNETCore.Test -{ - class Program - { - static void Main(string[] args) - { - //Default_NEAES128EncryptImpl nE_AES128EncryptImpl = new Default_NEAES128EncryptImpl("smallchi"); - string str = "aaaaaa111111"; - //var bytes = Encoding.UTF8.GetBytes(str); - //var encrypt = nE_AES128EncryptImpl.Encrypt(bytes); - //Console.WriteLine("原数据:" + str); - //Console.WriteLine("加密后:" + encrypt.ToHexString()); - //Console.WriteLine("解密后:" + Encoding.ASCII.GetString(nE_AES128EncryptImpl.Decrypt(encrypt))); - - //NERSAEncryptImpl rsa = new NERSAEncryptImpl( - // new GBNewEnergy.Protocol.NEGlobalConfigs() - // { - // NEEncryptRSAPublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoQh0wEqx/R2H1v00IU12Oc30fosRC/frhH89L6G+fzeaqI19MYQhEPMU13wpeqRONCUta+2iC1sgCNQ9qGGf19yGdZUfueaB1Nu9rdueQKXgVurGHJ+5N71UFm+OP1XcnFUCK4wT5d7ZIifXxuqLehP9Ts6sNjhVfa+yU+VjF5HoIe69OJEPo7OxRZcRTe17khc93Ic+PfyqswQJJlY/bgpcLJQnM+QuHmxNtF7/FpAx9YEQsShsGpVo7JaKgLo+s6AFoJ4QldQKir2vbN9vcKRbG3piElPilWDpjXQkOJZhUloh/jd7QrKFimZFldJ1r6Q59QYUyGKZARUe0KZpMQIDAQAB", - // NEEncryptRSAPrivateKey = "MIIEpAIBAAKCAQEAoQh0wEqx/R2H1v00IU12Oc30fosRC/frhH89L6G+fzeaqI19MYQhEPMU13wpeqRONCUta+2iC1sgCNQ9qGGf19yGdZUfueaB1Nu9rdueQKXgVurGHJ+5N71UFm+OP1XcnFUCK4wT5d7ZIifXxuqLehP9Ts6sNjhVfa+yU+VjF5HoIe69OJEPo7OxRZcRTe17khc93Ic+PfyqswQJJlY/bgpcLJQnM+QuHmxNtF7/FpAx9YEQsShsGpVo7JaKgLo+s6AFoJ4QldQKir2vbN9vcKRbG3piElPilWDpjXQkOJZhUloh/jd7QrKFimZFldJ1r6Q59QYUyGKZARUe0KZpMQIDAQABAoIBAQCRZLUlOUvjIVqYvhznRK1OG6p45s8JY1r+UnPIId2Bt46oSLeUkZvZVeCnfq9k0Bzb8AVGwVPhtPEDh73z3dEYcT/lwjLXAkyPB6gG5ZfI/vvC/k7JYV01+neFmktw2/FIJWjEMMF2dvLNZ/Pm4bX1Dz9SfD/45Hwr8wqrvRzvFZsj5qqOxv9RPAudOYwCwZskKp/GF+L+3Ycod1Wu98imzMZUH+L5dQuDGg3kvf3ljIAegTPoqYBg0imNPYY/EGoFKnbxlK5S5/5uAFb16dGJqAz3XQCz9Is/IWrOTu0etteqV2Ncs8uqPdjed+b0j8CMsr4U1xjwPQ8WwdaJtTkRAoGBANAndgiGZkCVcc9975/AYdgFp35W6D+hGQAZlL6DmnucUFdXbWa/x2rTSEXlkvgk9X/PxOptUYsLJkzysTgfDywZwuIXLm9B3oNmv3bVgPXsgDsvDfaHYCgz0nHK6NSrX2AeX3yO/dFuoZsuk+J+UyRigMqYj0wjmxUlqj183hinAoGBAMYMOBgF77OXRII7GAuEut/nBeh2sBrgyzR7FmJMs5kvRh6Ck8wp3ysgMvX4lxh1ep8iCw1R2cguqNATr1klOdsCTOE9RrhuvOp3JrYzuIAK6MpH/uBICy4w1rW2+gQySsHcH40r+tNaTFQ7dQ1tef//iy/IW8v8i0t+csztE1JnAoGABdtWYt8FOYP688+jUmdjWWSvVcq0NjYeMfaGTOX/DsNTL2HyXhW/Uq4nNnBDNmAz2CjMbZwt0y+5ICkj+2REVQVUinAEinTcAe5+LKXNPx4sbX3hcrJUbk0m+rSu4G0B/f5cyXBsi9wFCAzDdHgBduCepxSr04Sc9Hde1uQQi7kCgYB0U20HP0Vh+TG2RLuE2HtjVDD2L/CUeQEiXEHzjxXWnhvTg+MIAnggvpLwQwmMxkQ2ACr5sd/3YuCpB0bxV5o594nsqq9FWVYBaecFEjAGlWHSnqMoXWijwu/6X/VOTbP3VjH6G6ECT4GR4DKKpokIQrMgZ9DzaezvdOA9WesFdQKBgQCWfeOQTitRJ0NZACFUn3Fs3Rvgc9eN9YSWj4RtqkmGPMPvguWo+SKhlk3IbYjrRBc5WVOdoX8JXb2/+nAGhPCuUZckWVmZe5pMSr4EkNQdYeY8kOXGSjoTOUH34ZdKeS+e399BkBWIiXUejX/Srln0H4KoHnTWgxwNpTsBCgXu8Q==", - // NERSAType = GBNewEnergy.Protocol.NEGlobalConfigs.RSAType.RSA2 - // }); - - Default_NERSAEncryptImpl rsa = new Default_NERSAEncryptImpl( - Encoding.UTF8, - HashAlgorithmName.SHA256, - "s+rl5mtcckCF9mEECD86L9UE2pbCR4CuiqDepwpiZCEflymQLNC3qNUPDlua9/kltyu6L489uimHRbEp4C7Gl7dDmaXVZLUVGkgUCZoRc8MrOw4+BiVAeQtCDdilPpA7DMN0bMfJAj3U4GuTU89/OWZMb9SYFfqEHM2e60PZHIU=AQAB

8qSTX42w2NaMCXL0PTZuacUFdJj93KopOJPD2q/JfmXSjXHV/IQK9YlCVKXHucqy8xcQgjkaKHqy3Rse14SZ7Q==

vdJfDZ6ZIAQDx0sQbmbadHb6EOr8/oXo8B1CUSG0LqFZgDY7vBj17ujd6UhJWzhsg/5/3L+m4wDjMkUpOExZ+Q==Av3Uc1Ej5QiAIX2xVS/enJ85Of7I4neWmoP33jJcoZpPxj6pDLv0BqLylmiU1c2R9z1JjtF1aRpaKi+zaaTQ4Q==Pv5yhv2MCYDrlBbIJCtD8gSN5lFllj3wWMcM/Am4VwU6w368Aicybo+fHUzc80XdVUx/OE3t30WrIEKtdD56WQ==OcUQg0/kEGi9l2CgXCLKmQ1/1VVb+r89LXTO6rqi2wg5txkJIIXXePx7ce0Bh0eEnZzeSudwBLA3kqXmeAyYaw==mnPL+zwtd7OmjTUJ5h6JUCi56wFDNWjl7gJeQd4rSzQYT4eRyrc/A4QsUbIYXkqXsyCpzExWvGsMQqrtfRQKzR53MBL3MQln5BjAUql2NqCkM2KT/D8Px5M21/TpMAycK4tGLOHgcCQRH1PQLHG1OfpfDASIzLwLgMjvMuHnIyE=", - "s+rl5mtcckCF9mEECD86L9UE2pbCR4CuiqDepwpiZCEflymQLNC3qNUPDlua9/kltyu6L489uimHRbEp4C7Gl7dDmaXVZLUVGkgUCZoRc8MrOw4+BiVAeQtCDdilPpA7DMN0bMfJAj3U4GuTU89/OWZMb9SYFfqEHM2e60PZHIU=AQAB

8qSTX42w2NaMCXL0PTZuacUFdJj93KopOJPD2q/JfmXSjXHV/IQK9YlCVKXHucqy8xcQgjkaKHqy3Rse14SZ7Q==

vdJfDZ6ZIAQDx0sQbmbadHb6EOr8/oXo8B1CUSG0LqFZgDY7vBj17ujd6UhJWzhsg/5/3L+m4wDjMkUpOExZ+Q==Av3Uc1Ej5QiAIX2xVS/enJ85Of7I4neWmoP33jJcoZpPxj6pDLv0BqLylmiU1c2R9z1JjtF1aRpaKi+zaaTQ4Q==Pv5yhv2MCYDrlBbIJCtD8gSN5lFllj3wWMcM/Am4VwU6w368Aicybo+fHUzc80XdVUx/OE3t30WrIEKtdD56WQ==OcUQg0/kEGi9l2CgXCLKmQ1/1VVb+r89LXTO6rqi2wg5txkJIIXXePx7ce0Bh0eEnZzeSudwBLA3kqXmeAyYaw==mnPL+zwtd7OmjTUJ5h6JUCi56wFDNWjl7gJeQd4rSzQYT4eRyrc/A4QsUbIYXkqXsyCpzExWvGsMQqrtfRQKzR53MBL3MQln5BjAUql2NqCkM2KT/D8Px5M21/TpMAycK4tGLOHgcCQRH1PQLHG1OfpfDASIzLwLgMjvMuHnIyE=" - ); - - Console.WriteLine("原始字符串：" + str); - //加密 - byte[] enBytes = rsa.Encrypt(Encoding.UTF8.GetBytes(str)); - Console.WriteLine("加密字符串：" + enBytes.ToHexString()); - //解密 - byte[] deBytes = rsa.Decrypt(enBytes); - Console.WriteLine("解密字符串：" + Encoding.UTF8.GetString(deBytes)); - //私钥签名 - string signStr = rsa.Sign(str); - Console.WriteLine("字符串签名：" + signStr); - //公钥验证签名 - bool signVerify = rsa.Verify(str, signStr); - Console.WriteLine("验证签名：" + signVerify); - Console.ReadKey(); - } - } -}