Bladeren bron

实时信息上报(待做)

tags/1.0.0
SmallChi 7 jaren geleden
bovenliggende
commit
5ccbd699bc
4 gewijzigde bestanden met toevoegingen van 86 en 83 verwijderingen
  1. +41
    -41
      src/GBNewEnergy.Protocol/DownStream/NEControlDownStream.cs
  2. +37
    -37
      src/GBNewEnergy.Protocol/NEProperties/NEUploadProperties/NEUploadDrivenElectricalProperty.cs
  3. +3
    -3
      src/GBNewEnergy.Protocol/NEProperties/NEUploadProperties/NEUploadProperty.cs
  4. +5
    -2
      src/GBNewEnergy.Protocol/UpStream/NERealUploadUpStream.cs

+ 41
- 41
src/GBNewEnergy.Protocol/DownStream/NEControlDownStream.cs Bestand weergeven

@@ -1,35 +1,35 @@
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
{
/// <summary>
/// 车载终端控制命令
/// </summary>
public class NEControlDownStream : NEBodies
{
public NEControlDownStream(byte[] buffer, NEGlobalConfigs nEConfigs) : base(buffer, nEConfigs)
{
}
public NEControlDownStream(INEProperties nEProperties, NEGlobalConfigs nEConfigs) : base(nEProperties, nEConfigs)
{
using GBNewEnergy.Protocol.Extensions;
using GBNewEnergy.Protocol.NEProperties;
using System;
using System.Collections.Generic;
using System.Text;
namespace GBNewEnergy.Protocol.DownStream
{
/// <summary>
/// 车载终端控制命令
/// </summary>
public class NEControlDownStream : NEBodies
{
public NEControlDownStream(byte[] buffer, NEGlobalConfigs nEConfigs) : base(buffer, nEConfigs)
{
}
public NEControlDownStream(INEProperties nEProperties, NEGlobalConfigs nEConfigs) : base(nEProperties, nEConfigs)
{
}
/// <summary>
/// 命令ID 只能发送一个
/// <summary>
/// 命令ID 只能发送一个
/// </summary>
public NEControlCmd CmdID { get; set; }
/// <summary>
/// 命令参数 没有内容则内容为空
/// </summary>
public string CmdParameter { get; set; }
protected override void InitializeProperties(INEProperties nEProperties)
public string CmdParameter { get; set; }
protected override void InitializeProperties(INEProperties nEProperties)
{
NEControlProperty nEControlProperty = (NEControlProperty)nEProperties;
NEControlProperty nEControlProperty = (NEControlProperty)nEProperties;
CmdID = nEControlProperty.CmdID;
if (CmdID == NEControlCmd.remoteupdate)
{
@@ -38,13 +38,13 @@ namespace GBNewEnergy.Protocol.DownStream
else if(CmdID == NEControlCmd.warning)
{
CmdParameter = nEControlProperty.AlarmParameter.nEAlarmLevel.ToString();
}
}
protected override void InitializePropertiesFromBuffer()
{
CurrentDateTime = Buffer.ReadDateTimeLittle(0, 6);
CmdID = (NEControlCmd)Buffer[6];
}
}
protected override void InitializePropertiesFromBuffer()
{
CurrentDateTime = Buffer.ReadDateTimeLittle(0, 6);
CmdID = (NEControlCmd)Buffer[6];
switch (CmdID)
{
case NEControlCmd.remoteupdate:
@@ -61,12 +61,12 @@ namespace GBNewEnergy.Protocol.DownStream
case NEControlCmd.OpenMonitoring:
default:
break;
}
}
protected override void ToBuffer()
{
}
}
protected override void ToBuffer()
{
if (CmdID == NEControlCmd.remoteupdate)
{
var contentLength = NEConfigs.NEEncoding.GetBytes(CmdParameter).Length;
@@ -86,7 +86,7 @@ namespace GBNewEnergy.Protocol.DownStream
Buffer = new byte[6 + 1];
Buffer.WriteLittle(CurrentDateTime, 0, 6);
Buffer.WriteLittle(CmdID.ToByteValue(), 6);
}
}
}
}
}
}
}
}

+ 37
- 37
src/GBNewEnergy.Protocol/NEProperties/NEUploadProperties/NEUploadDrivenElectricalProperty.cs Bestand weergeven

@@ -20,44 +20,44 @@ namespace GBNewEnergy.Protocol.NEProperties.NEUploadProperties
/// 电机信息集合
/// </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; }
/// 电机信息
/// </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; }
}
}
}

+ 3
- 3
src/GBNewEnergy.Protocol/NEProperties/NEUploadProperties/NEUploadProperty.cs Bestand weergeven

@@ -13,11 +13,11 @@ namespace GBNewEnergy.Protocol.NEProperties.NEUploadProperties
{
public string VIN { get ; set; }

public NEUploadProperty(params NEUploadPropertyBase[] nEUploadPropertyBases)
public NEUploadProperty(params NEUploadPropertyBase[] NEUploadPropertyBase)
{
if (nEUploadPropertyBases != null)
if (NEUploadPropertyBase != null)
{
NEUploadPropertys = nEUploadPropertyBases.ToList();
NEUploadPropertys = NEUploadPropertyBase.ToList();
}
}



+ 5
- 2
src/GBNewEnergy.Protocol/UpStream/NERealUploadUpStream.cs Bestand weergeven

@@ -1,4 +1,5 @@
using System;
using GBNewEnergy.Protocol.NEProperties.NEUploadProperties;
using System;
using System.Collections.Generic;
using System.Text;

@@ -17,9 +18,11 @@ namespace GBNewEnergy.Protocol.UpStream
{
}

public NEUploadProperty NEUploadProperty { get;private set; }

protected override void InitializeProperties(INEProperties nEProperties)
{
throw new NotImplementedException();
NEUploadProperty = (NEUploadProperty)nEProperties;
}

protected override void InitializePropertiesFromBuffer()


Laden…
Annuleren
Opslaan