From 32bc6a55788ad5dc0b8a2c62c96b6bc74576c5bf Mon Sep 17 00:00:00 2001
From: SmallChi <564952747@qq.com>
Date: Fri, 15 Jun 2018 00:39:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=8A=E6=8A=A5=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../NEProperties/NEControlProperty.cs         |  4 +-
 .../NEUploadDrivenElectricalProperty.cs       | 63 ++++++++++++++++
 .../NEUploadProperties/NEUploadProperty.cs    | 17 +++++
 .../NEUploadPropertyBase.cs                   | 12 ++++
 .../NEUploadVehicleProperty.cs                | 72 +++++++++++++++++++
 5 files changed, 166 insertions(+), 2 deletions(-)
 create mode 100644 src/GBNewEnergy.Protocol/NEProperties/NEUploadProperties/NEUploadDrivenElectricalProperty.cs
 create mode 100644 src/GBNewEnergy.Protocol/NEProperties/NEUploadProperties/NEUploadProperty.cs
 create mode 100644 src/GBNewEnergy.Protocol/NEProperties/NEUploadProperties/NEUploadPropertyBase.cs
 create mode 100644 src/GBNewEnergy.Protocol/NEProperties/NEUploadProperties/NEUploadVehicleProperty.cs

diff --git a/src/GBNewEnergy.Protocol/NEProperties/NEControlProperty.cs b/src/GBNewEnergy.Protocol/NEProperties/NEControlProperty.cs
index 7ebd502..bab00e7 100644
--- a/src/GBNewEnergy.Protocol/NEProperties/NEControlProperty.cs
+++ b/src/GBNewEnergy.Protocol/NEProperties/NEControlProperty.cs
@@ -11,8 +11,8 @@ namespace GBNewEnergy.Protocol.NEProperties
     public class NEControlProperty : INEProperties
     {
         public string VIN { get; set ; }
-        /// <summary>
-        /// 命令ID 只能发送一个
+        /// <summary>
+        /// 命令ID 只能发送一个
         /// </summary>
         public NEControlCmd CmdID { get; set; }
         /// <summary>
diff --git a/src/GBNewEnergy.Protocol/NEProperties/NEUploadProperties/NEUploadDrivenElectricalProperty.cs b/src/GBNewEnergy.Protocol/NEProperties/NEUploadProperties/NEUploadDrivenElectricalProperty.cs
new file mode 100644
index 0000000..1d84b91
--- /dev/null
+++ b/src/GBNewEnergy.Protocol/NEProperties/NEUploadProperties/NEUploadDrivenElectricalProperty.cs
@@ -0,0 +1,63 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using GBNewEnergy.Protocol.Enums;
+
+namespace GBNewEnergy.Protocol.NEProperties.NEUploadProperties
+{
+    /// <summary>
+    /// 驱动电机数据
+    /// </summary>
+    public class NEUploadDrivenElectricalProperty : NEUploadPropertyBase
+    {
+        public override NEInfoType NEInfoType => NEInfoType.驱动电机数据;
+
+        /// <summary>
+        /// 电机个数
+        /// </summary>
+        public byte ElectricalCount;
+        /// <summary>
+        /// 电机信息集合
+        /// </summary>
+        public IEnumerable<ElectricalInfo> ElectricalList { get; set; }
+    }
+
+    /// <summary>
+    /// 电机信息
+    /// </summary>
+    public class ElectricalInfo
+    {
+        /// <summary>
+        /// 电机序号 
+        /// </summary>
+        public byte ElNo { get; set; }
+        /// <summary>
+        /// 电机状态
+        /// </summary>
+        public byte ElStatus { get; set; }
+        /// <summary>
+        /// 电机控制器温度 
+        /// </summary>
+        public int ElControlTemp { get; set; }
+        /// <summary>
+        /// 电机转速
+        /// </summary>
+        public int ElSpeed { get; set; }
+        /// <summary>
+        /// 电机转矩 
+        /// </summary>
+        public double ElTorque { get; set; }
+        /// <summary>
+        /// 电机温度 
+        /// </summary>
+        public int ElTemp { get; set; }
+        /// <summary>
+        /// 电机电压 
+        /// </summary>
+        public double ElVoltage { get; set; }
+        /// <summary>
+        /// 电机母线电流
+        /// </summary>
+        public double ElCurrent { get; set; }
+    }
+}
diff --git a/src/GBNewEnergy.Protocol/NEProperties/NEUploadProperties/NEUploadProperty.cs b/src/GBNewEnergy.Protocol/NEProperties/NEUploadProperties/NEUploadProperty.cs
new file mode 100644
index 0000000..17fdfc9
--- /dev/null
+++ b/src/GBNewEnergy.Protocol/NEProperties/NEUploadProperties/NEUploadProperty.cs
@@ -0,0 +1,17 @@
+using GBNewEnergy.Protocol.Enums;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace GBNewEnergy.Protocol.NEProperties.NEUploadProperties
+{
+    /// <summary>
+    /// 上报信息
+    /// </summary>
+    public class NEUploadProperty : INEProperties
+    {
+        public string VIN { get ; set; }
+
+        
+    }
+}
diff --git a/src/GBNewEnergy.Protocol/NEProperties/NEUploadProperties/NEUploadPropertyBase.cs b/src/GBNewEnergy.Protocol/NEProperties/NEUploadProperties/NEUploadPropertyBase.cs
new file mode 100644
index 0000000..97df227
--- /dev/null
+++ b/src/GBNewEnergy.Protocol/NEProperties/NEUploadProperties/NEUploadPropertyBase.cs
@@ -0,0 +1,12 @@
+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/NEUploadVehicleProperty.cs b/src/GBNewEnergy.Protocol/NEProperties/NEUploadProperties/NEUploadVehicleProperty.cs
new file mode 100644
index 0000000..b01a676
--- /dev/null
+++ b/src/GBNewEnergy.Protocol/NEProperties/NEUploadProperties/NEUploadVehicleProperty.cs
@@ -0,0 +1,72 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using GBNewEnergy.Protocol.Enums;
+
+namespace GBNewEnergy.Protocol.NEProperties.NEUploadProperties
+{ 
+    /// <summary>
+    /// 整车数据
+    /// </summary>
+    public class NEUploadVehicleProperty : NEUploadPropertyBase
+    {
+        public override NEInfoType NEInfoType => NEInfoType.整车数据;
+
+        /// <summary>
+        /// 车辆状态
+        /// </summary>
+        public byte CarStatus { get; set; }
+        /// <summary>
+        /// 充放电状态
+        /// </summary>
+        public byte ChargeStatus { get; set; }
+        /// <summary>
+        /// 运行模式
+        /// </summary>
+        public byte OperationMode { get; set; }
+        /// <summary>
+        /// 车速 
+        /// </summary>
+        public double Speed { get; set; }
+        /// <summary>
+        /// 当前里程
+        /// </summary>
+        public double Dis { get; set; }
+        /// <summary>
+        /// 总里程
+        /// </summary>
+        public double TotalDis { get; set; }
+        /// <summary>
+        /// 总电压 
+        /// </summary>
+        public double TotalVoltage { get; set; }
+        /// <summary>
+        /// 总电流 
+        /// </summary>
+        public double TotalTemp { get; set; }
+        /// <summary>
+        /// SOC 
+        /// </summary>
+        public byte soc { get; set; }
+        /// <summary>
+        /// DC-DC 状态 
+        /// </summary>
+        public byte DCStatus { get; set; }
+        /// <summary>
+        /// 档位 
+        /// </summary>
+        public byte Stall { get; set; }
+        /// <summary>
+        /// 加速踏板行程值
+        /// </summary>
+        public byte Accelerator { get; set; }
+        /// <summary>
+        /// 制动踏板状态
+        /// </summary>
+        public byte Brakes { get; set; }
+        /// <summary>
+        /// 绝缘电阻
+        /// </summary>
+        public int Resistance { get; set; }
+    }
+}