diff --git a/BatCharging.Model/客户端发送/CMD1103.cs b/BatCharging.Model/客户端发送/CMD1103.cs index 04489af..eb9005a 100644 --- a/BatCharging.Model/客户端发送/CMD1103.cs +++ b/BatCharging.Model/客户端发送/CMD1103.cs @@ -29,7 +29,7 @@ namespace BatCharging.Model /// 费率1 /// 该时段内每度电的电费,用整型值表示,要乘 0.01才能得到真实的值 /// - public int rate1 { get; set; } + public uint rate1 { get; set; } #endregion 1 #region 2 @@ -53,7 +53,7 @@ namespace BatCharging.Model /// 费率2 /// 该时段内每度电的电费,用整型值表示,要乘 0.01才能得到真实的值 /// - public int rate2 { get; set; } + public uint rate2 { get; set; } #endregion 2 #region 3 @@ -77,7 +77,7 @@ namespace BatCharging.Model /// 费率3 /// 该时段内每度电的电费,用整型值表示,要乘 0.01才能得到真实的值 /// - public int rate3 { get; set; } + public uint rate3 { get; set; } #endregion 3 #region 4 @@ -101,7 +101,7 @@ namespace BatCharging.Model /// 费率4 /// 该时段内每度电的电费,用整型值表示,要乘 0.01才能得到真实的值 /// - public int rate4 { get; set; } + public uint rate4 { get; set; } #endregion 4 #region 5 @@ -125,7 +125,7 @@ namespace BatCharging.Model /// 费率5 /// 该时段内每度电的电费,用整型值表示,要乘 0.01才能得到真实的值 /// - public int rate5 { get; set; } + public uint rate5 { get; set; } #endregion 5 #region 6 @@ -149,7 +149,7 @@ namespace BatCharging.Model /// 费率6 /// 该时段内每度电的电费,用整型值表示,要乘 0.01才能得到真实的值 /// - public int rate6 { get; set; } + public uint rate6 { get; set; } #endregion 6 #region 7 @@ -173,7 +173,7 @@ namespace BatCharging.Model /// 费率7 /// 该时段内每度电的电费,用整型值表示,要乘 0.01才能得到真实的值 /// - public int rate7 { get; set; } + public uint rate7 { get; set; } #endregion 7 #region 8 @@ -197,7 +197,7 @@ namespace BatCharging.Model /// 费率8 /// 该时段内每度电的电费,用整型值表示,要乘 0.01才能得到真实的值 /// - public int rate8 { get; set; } + public uint rate8 { get; set; } #endregion 8 #region 9 @@ -221,7 +221,7 @@ namespace BatCharging.Model /// 费率9 /// 该时段内每度电的电费,用整型值表示,要乘 0.01才能得到真实的值 /// - public int rate9 { get; set; } + public uint rate9 { get; set; } #endregion 9 #region 10 @@ -245,7 +245,7 @@ namespace BatCharging.Model /// 费率10 /// 该时段内每度电的电费,用整型值表示,要乘 0.01才能得到真实的值 /// - public int rate10 { get; set; } + public uint rate10 { get; set; } #endregion 10 #region 11 @@ -269,7 +269,7 @@ namespace BatCharging.Model /// 费率11 /// 该时段内每度电的电费,用整型值表示,要乘 0.01才能得到真实的值 /// - public int rate11 { get; set; } + public uint rate11 { get; set; } #endregion 11 #region 12 @@ -293,7 +293,7 @@ namespace BatCharging.Model /// 费率12 /// 该时段内每度电的电费,用整型值表示,要乘 0.01才能得到真实的值 /// - public int rate12 { get; set; } + public uint rate12 { get; set; } #endregion 12 } } diff --git a/BatCharging.Service/发送方法/ChargerSendCMD.cs b/BatCharging.Service/发送方法/ChargerSendCMD.cs index a992436..d7d50f1 100644 --- a/BatCharging.Service/发送方法/ChargerSendCMD.cs +++ b/BatCharging.Service/发送方法/ChargerSendCMD.cs @@ -1450,7 +1450,7 @@ namespace BatCharging.Service public byte[] SendRCMD1103(out APDUModel APDUModel, CMD1103 CMD) { - byte[] result = null; + byte[] result; APDUModel model = new APDUModel(); model.OriginDomain1 = 0xAA; @@ -1483,76 +1483,76 @@ namespace BatCharging.Service { List lstContent = new List(); - lstContent.AddRange(BitConverter.GetBytes(CMD.startHour1)); - lstContent.AddRange(BitConverter.GetBytes(CMD.startMinute1)); - lstContent.AddRange(BitConverter.GetBytes(CMD.endHour1)); - lstContent.AddRange(BitConverter.GetBytes(CMD.endMinute1)); + lstContent.Add(CMD.startHour1); + lstContent.Add(CMD.startMinute1); + lstContent.Add(CMD.endHour1); + lstContent.Add(CMD.endMinute1); lstContent.AddRange(BitConverter.GetBytes(CMD.rate1)); - lstContent.AddRange(BitConverter.GetBytes(CMD.startHour2)); - lstContent.AddRange(BitConverter.GetBytes(CMD.startMinute2)); - lstContent.AddRange(BitConverter.GetBytes(CMD.endHour2)); - lstContent.AddRange(BitConverter.GetBytes(CMD.endMinute2)); + lstContent.Add(CMD.startHour2); + lstContent.Add(CMD.startMinute2); + lstContent.Add(CMD.endHour2); + lstContent.Add(CMD.endMinute2); lstContent.AddRange(BitConverter.GetBytes(CMD.rate2)); - lstContent.AddRange(BitConverter.GetBytes(CMD.startHour3)); - lstContent.AddRange(BitConverter.GetBytes(CMD.startMinute3)); - lstContent.AddRange(BitConverter.GetBytes(CMD.endHour3)); - lstContent.AddRange(BitConverter.GetBytes(CMD.endMinute3)); + lstContent.Add(CMD.startHour3); + lstContent.Add(CMD.startMinute3); + lstContent.Add(CMD.endHour3); + lstContent.Add(CMD.endMinute3); lstContent.AddRange(BitConverter.GetBytes(CMD.rate3)); - lstContent.AddRange(BitConverter.GetBytes(CMD.startHour4)); - lstContent.AddRange(BitConverter.GetBytes(CMD.startMinute4)); - lstContent.AddRange(BitConverter.GetBytes(CMD.endHour4)); - lstContent.AddRange(BitConverter.GetBytes(CMD.endMinute4)); + lstContent.Add(CMD.startHour4); + lstContent.Add(CMD.startMinute4); + lstContent.Add(CMD.endHour4); + lstContent.Add(CMD.endMinute4); lstContent.AddRange(BitConverter.GetBytes(CMD.rate4)); - lstContent.AddRange(BitConverter.GetBytes(CMD.startHour5)); - lstContent.AddRange(BitConverter.GetBytes(CMD.startMinute5)); - lstContent.AddRange(BitConverter.GetBytes(CMD.endHour5)); - lstContent.AddRange(BitConverter.GetBytes(CMD.endMinute5)); + lstContent.Add(CMD.startHour5); + lstContent.Add(CMD.startMinute5); + lstContent.Add(CMD.endHour5); + lstContent.Add(CMD.endMinute5); lstContent.AddRange(BitConverter.GetBytes(CMD.rate5)); - lstContent.AddRange(BitConverter.GetBytes(CMD.startHour6)); - lstContent.AddRange(BitConverter.GetBytes(CMD.startMinute6)); - lstContent.AddRange(BitConverter.GetBytes(CMD.endHour6)); - lstContent.AddRange(BitConverter.GetBytes(CMD.endMinute6)); + lstContent.Add(CMD.startHour6); + lstContent.Add(CMD.startMinute6); + lstContent.Add(CMD.endHour6); + lstContent.Add(CMD.endMinute6); lstContent.AddRange(BitConverter.GetBytes(CMD.rate6)); - lstContent.AddRange(BitConverter.GetBytes(CMD.startHour7)); - lstContent.AddRange(BitConverter.GetBytes(CMD.startMinute7)); - lstContent.AddRange(BitConverter.GetBytes(CMD.endHour7)); - lstContent.AddRange(BitConverter.GetBytes(CMD.endMinute7)); + lstContent.Add(CMD.startHour7); + lstContent.Add(CMD.startMinute7); + lstContent.Add(CMD.endHour7); + lstContent.Add(CMD.endMinute7); lstContent.AddRange(BitConverter.GetBytes(CMD.rate7)); - lstContent.AddRange(BitConverter.GetBytes(CMD.startHour8)); - lstContent.AddRange(BitConverter.GetBytes(CMD.startMinute8)); - lstContent.AddRange(BitConverter.GetBytes(CMD.endHour8)); - lstContent.AddRange(BitConverter.GetBytes(CMD.endMinute8)); + lstContent.Add(CMD.startHour8); + lstContent.Add(CMD.startMinute8); + lstContent.Add(CMD.endHour8); + lstContent.Add(CMD.endMinute8); lstContent.AddRange(BitConverter.GetBytes(CMD.rate8)); - lstContent.AddRange(BitConverter.GetBytes(CMD.startHour9)); - lstContent.AddRange(BitConverter.GetBytes(CMD.startMinute9)); - lstContent.AddRange(BitConverter.GetBytes(CMD.endHour9)); - lstContent.AddRange(BitConverter.GetBytes(CMD.endMinute9)); + lstContent.Add(CMD.startHour9); + lstContent.Add(CMD.startMinute9); + lstContent.Add(CMD.endHour9); + lstContent.Add(CMD.endMinute9); lstContent.AddRange(BitConverter.GetBytes(CMD.rate9)); - lstContent.AddRange(BitConverter.GetBytes(CMD.startHour10)); - lstContent.AddRange(BitConverter.GetBytes(CMD.startMinute10)); - lstContent.AddRange(BitConverter.GetBytes(CMD.endHour10)); - lstContent.AddRange(BitConverter.GetBytes(CMD.endMinute10)); + lstContent.Add(CMD.startHour10); + lstContent.Add(CMD.startMinute10); + lstContent.Add(CMD.endHour10); + lstContent.Add(CMD.endMinute10); lstContent.AddRange(BitConverter.GetBytes(CMD.rate10)); - lstContent.AddRange(BitConverter.GetBytes(CMD.startHour11)); - lstContent.AddRange(BitConverter.GetBytes(CMD.startMinute11)); - lstContent.AddRange(BitConverter.GetBytes(CMD.endHour11)); - lstContent.AddRange(BitConverter.GetBytes(CMD.endMinute11)); + lstContent.Add(CMD.startHour11); + lstContent.Add(CMD.startMinute11); + lstContent.Add(CMD.endHour11); + lstContent.Add(CMD.endMinute11); lstContent.AddRange(BitConverter.GetBytes(CMD.rate11)); - lstContent.AddRange(BitConverter.GetBytes(CMD.startHour12)); - lstContent.AddRange(BitConverter.GetBytes(CMD.startMinute12)); - lstContent.AddRange(BitConverter.GetBytes(CMD.endHour12)); - lstContent.AddRange(BitConverter.GetBytes(CMD.endMinute12)); + lstContent.Add(CMD.startHour12); + lstContent.Add(CMD.startMinute12); + lstContent.Add(CMD.endHour12); + lstContent.Add(CMD.endMinute12); lstContent.AddRange(BitConverter.GetBytes(CMD.rate12)); results = lstContent.ToArray(); diff --git a/Monitor.ChargeTest/FrmChargeResult.cs b/Monitor.ChargeTest/FrmChargeResult.cs index c0bd048..3cbbfa3 100644 --- a/Monitor.ChargeTest/FrmChargeResult.cs +++ b/Monitor.ChargeTest/FrmChargeResult.cs @@ -433,9 +433,6 @@ namespace Monitor.ChargeTest /// private void button1_Click(object sender, EventArgs e) { - - - CmnChargerParam._CHR00TCPCLIENT.Send1101(); } /// @@ -446,8 +443,23 @@ namespace Monitor.ChargeTest private void button2_Click(object sender, EventArgs e) { CMD1103 cMD1103 = new CMD1103(); - - + cMD1103.startHour1 = 00; + cMD1103.startMinute1 = 00; + cMD1103.startHour1 = 10; + cMD1103.endHour1 = 30; + cMD1103.rate1 = 120; + + cMD1103.startHour2 = 10; + cMD1103.startMinute2 = 30; + cMD1103.startHour2 = 20; + cMD1103.endHour2 = 00; + cMD1103.rate2 = 100; + + cMD1103.startHour3 = 20; + cMD1103.startMinute3 = 00; + cMD1103.startHour3 = 24; + cMD1103.endHour3 = 00; + cMD1103.rate3 = 160; CmnChargerParam._CHR00TCPCLIENT.Send1103(cMD1103); }