|
|
@ -47,21 +47,16 @@ namespace BatCharging.Service
|
|
|
|
{
|
|
|
|
{
|
|
|
|
List<byte> lstContent = new List<byte>();
|
|
|
|
List<byte> lstContent = new List<byte>();
|
|
|
|
|
|
|
|
|
|
|
|
lstContent.AddRange(ByteUtils.Int16ToByteArray((short)CMD1.value1));
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD1.value1));
|
|
|
|
lstContent.AddRange(ByteUtils.Int16ToByteArray((short)CMD1.value2));
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD1.value2));
|
|
|
|
lstContent.Add(CMD1.value3);
|
|
|
|
lstContent.Add(CMD1.value3);
|
|
|
|
lstContent.AddRange(ByteUtils.Int32ToByteArray((int)CMD1.value4));
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD1.value4));
|
|
|
|
|
|
|
|
lstContent.Add(CMD1.value5);
|
|
|
|
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD1.value6));
|
|
|
|
if (CMD1.value3 == 1)
|
|
|
|
if (CMD1.value3 == 1)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
lstContent.Add(CMD1.value5);
|
|
|
|
|
|
|
|
lstContent.AddRange(ByteUtils.Int16ToByteArray((short)CMD1.value6));
|
|
|
|
|
|
|
|
lstContent.AddRange(CMD1.value7);
|
|
|
|
lstContent.AddRange(CMD1.value7);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
results = lstContent.ToArray();
|
|
|
|
results = lstContent.ToArray();
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -104,18 +99,14 @@ namespace BatCharging.Service
|
|
|
|
{
|
|
|
|
{
|
|
|
|
List<byte> lstContent = new List<byte>();
|
|
|
|
List<byte> lstContent = new List<byte>();
|
|
|
|
|
|
|
|
|
|
|
|
lstContent.AddRange(ByteUtils.Int16ToByteArray((short)CMD.value1));
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.value1));
|
|
|
|
lstContent.AddRange(ByteUtils.Int16ToByteArray((short)CMD.value2));
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.value2));
|
|
|
|
lstContent.Add(CMD.value3);
|
|
|
|
lstContent.Add(CMD.value3);
|
|
|
|
lstContent.AddRange(ByteUtils.Int32ToByteArray((int)CMD.value4));
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.value4));
|
|
|
|
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.value5));
|
|
|
|
if (CMD.value3 == 1)
|
|
|
|
if (CMD.value3 == 1)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
lstContent.AddRange(ByteUtils.Int16ToByteArray((short)CMD.value5));
|
|
|
|
|
|
|
|
lstContent.AddRange(CMD.value6);
|
|
|
|
lstContent.AddRange(CMD.value6);
|
|
|
|
}
|
|
|
|
|
|
|
|
else
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
results = lstContent.ToArray();
|
|
|
|
results = lstContent.ToArray();
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -133,8 +124,6 @@ namespace BatCharging.Service
|
|
|
|
model.CMD = 5;
|
|
|
|
model.CMD = 5;
|
|
|
|
model.checksumDomain = 0x01;
|
|
|
|
model.checksumDomain = 0x01;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
model.dataDomain = GetRCMD5DataInfo(cMD5); //数据域
|
|
|
|
model.dataDomain = GetRCMD5DataInfo(cMD5); //数据域
|
|
|
|
model.LengthDomain = Convert.ToUInt16(9 + model.dataDomain.Length); //报文长度
|
|
|
|
model.LengthDomain = Convert.ToUInt16(9 + model.dataDomain.Length); //报文长度
|
|
|
|
|
|
|
|
|
|
|
@ -163,11 +152,8 @@ namespace BatCharging.Service
|
|
|
|
lstContent.Add(CMD.value3);
|
|
|
|
lstContent.Add(CMD.value3);
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.value4));
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.value4));
|
|
|
|
lstContent.Add(CMD.value5);
|
|
|
|
lstContent.Add(CMD.value5);
|
|
|
|
if (CMD.value3 == 1)
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.value6));
|
|
|
|
{
|
|
|
|
lstContent.AddRange(CMD.value7);
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.value4));
|
|
|
|
|
|
|
|
lstContent.AddRange(CMD.value7);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
results = lstContent.ToArray();
|
|
|
|
results = lstContent.ToArray();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return results;
|
|
|
|
return results;
|
|
|
@ -668,7 +654,7 @@ namespace BatCharging.Service
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.value01));
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.value01));
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.value02));
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.value02));
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.value03));
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.value03));
|
|
|
|
lstContent.AddRange(ByteUtils.ToByteByHexStr32(CMD.value04,32));
|
|
|
|
lstContent.AddRange(ByteUtils.ToByteByHexStr32(CMD.value04, 32));
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.value05));
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.value05));
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.value06));
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.value06));
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.value07));
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.value07));
|
|
|
@ -1483,76 +1469,76 @@ namespace BatCharging.Service
|
|
|
|
{
|
|
|
|
{
|
|
|
|
List<byte> lstContent = new List<byte>();
|
|
|
|
List<byte> lstContent = new List<byte>();
|
|
|
|
|
|
|
|
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.startHour1));
|
|
|
|
lstContent.Add(CMD.startHour1);
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.startMinute1));
|
|
|
|
lstContent.Add(CMD.startMinute1);
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.endHour1));
|
|
|
|
lstContent.Add(CMD.endHour1);
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.endMinute1));
|
|
|
|
lstContent.Add(CMD.endMinute1);
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.rate1));
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.rate1));
|
|
|
|
|
|
|
|
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.startHour2));
|
|
|
|
lstContent.Add(CMD.startHour2);
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.startMinute2));
|
|
|
|
lstContent.Add(CMD.startMinute2);
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.endHour2));
|
|
|
|
lstContent.Add(CMD.endHour2);
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.endMinute2));
|
|
|
|
lstContent.Add(CMD.endMinute2);
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.rate2));
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.rate2));
|
|
|
|
|
|
|
|
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.startHour3));
|
|
|
|
lstContent.Add(CMD.startHour3);
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.startMinute3));
|
|
|
|
lstContent.Add(CMD.startMinute3);
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.endHour3));
|
|
|
|
lstContent.Add(CMD.endHour3);
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.endMinute3));
|
|
|
|
lstContent.Add(CMD.endMinute3);
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.rate3));
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.rate3));
|
|
|
|
|
|
|
|
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.startHour4));
|
|
|
|
lstContent.Add(CMD.startHour4);
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.startMinute4));
|
|
|
|
lstContent.Add(CMD.startMinute4);
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.endHour4));
|
|
|
|
lstContent.Add(CMD.endHour4);
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.endMinute4));
|
|
|
|
lstContent.Add(CMD.endMinute4);
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.rate4));
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.rate4));
|
|
|
|
|
|
|
|
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.startHour5));
|
|
|
|
lstContent.Add(CMD.startHour5);
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.startMinute5));
|
|
|
|
lstContent.Add(CMD.startMinute5);
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.endHour5));
|
|
|
|
lstContent.Add(CMD.endHour5);
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.endMinute5));
|
|
|
|
lstContent.Add(CMD.endMinute5);
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.rate5));
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.rate5));
|
|
|
|
|
|
|
|
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.startHour6));
|
|
|
|
lstContent.Add(CMD.startHour6);
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.startMinute6));
|
|
|
|
lstContent.Add(CMD.startMinute6);
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.endHour6));
|
|
|
|
lstContent.Add(CMD.endHour6);
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.endMinute6));
|
|
|
|
lstContent.Add(CMD.endMinute6);
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.rate6));
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.rate6));
|
|
|
|
|
|
|
|
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.startHour7));
|
|
|
|
lstContent.Add(CMD.startHour7);
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.startMinute7));
|
|
|
|
lstContent.Add(CMD.startMinute7);
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.endHour7));
|
|
|
|
lstContent.Add(CMD.endHour7);
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.endMinute7));
|
|
|
|
lstContent.Add(CMD.endMinute7);
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.rate7));
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.rate7));
|
|
|
|
|
|
|
|
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.startHour8));
|
|
|
|
lstContent.Add(CMD.startHour8);
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.startMinute8));
|
|
|
|
lstContent.Add(CMD.startMinute8);
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.endHour8));
|
|
|
|
lstContent.Add(CMD.endHour8);
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.endMinute8));
|
|
|
|
lstContent.Add(CMD.endMinute8);
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.rate8));
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.rate8));
|
|
|
|
|
|
|
|
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.startHour9));
|
|
|
|
lstContent.Add(CMD.startHour9);
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.startMinute9));
|
|
|
|
lstContent.Add(CMD.startMinute9);
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.endHour9));
|
|
|
|
lstContent.Add(CMD.endHour9);
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.endMinute9));
|
|
|
|
lstContent.Add(CMD.endMinute9);
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.rate9));
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.rate9));
|
|
|
|
|
|
|
|
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.startHour10));
|
|
|
|
lstContent.Add(CMD.startHour10);
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.startMinute10));
|
|
|
|
lstContent.Add(CMD.startMinute10);
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.endHour10));
|
|
|
|
lstContent.Add(CMD.endHour10);
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.endMinute10));
|
|
|
|
lstContent.Add(CMD.endMinute10);
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.rate10));
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.rate10));
|
|
|
|
|
|
|
|
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.startHour11));
|
|
|
|
lstContent.Add(CMD.startHour11);
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.startMinute11));
|
|
|
|
lstContent.Add(CMD.startMinute11);
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.endHour11));
|
|
|
|
lstContent.Add(CMD.endHour11);
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.endMinute11));
|
|
|
|
lstContent.Add(CMD.endMinute11);
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.rate11));
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.rate11));
|
|
|
|
|
|
|
|
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.startHour12));
|
|
|
|
lstContent.Add(CMD.startHour12);
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.startMinute12));
|
|
|
|
lstContent.Add(CMD.startMinute12);
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.endHour12));
|
|
|
|
lstContent.Add(CMD.endHour12);
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.endMinute12));
|
|
|
|
lstContent.Add(CMD.endMinute12);
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.rate12));
|
|
|
|
lstContent.AddRange(BitConverter.GetBytes(CMD.rate12));
|
|
|
|
|
|
|
|
|
|
|
|
results = lstContent.ToArray();
|
|
|
|
results = lstContent.ToArray();
|
|
|
|