From 0754bd87619ffbf6bfd2d86f549e43b5d0182c88 Mon Sep 17 00:00:00 2001
From: whyclj <1525436766@qq.com>
Date: 星期一, 21 十月 2019 15:02:42 +0800
Subject: [PATCH] 添加单体电压字段
---
platforms/android/app/src/main/java/com/mode/BattTestParam.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/platforms/android/app/src/main/java/com/mode/BattTestParam.java b/platforms/android/app/src/main/java/com/mode/BattTestParam.java
index 8c28f08..d5042d1 100644
--- a/platforms/android/app/src/main/java/com/mode/BattTestParam.java
+++ b/platforms/android/app/src/main/java/com/mode/BattTestParam.java
@@ -30,7 +30,8 @@
public int groupCount; //鐢垫睜缁勭粍鏁�(1~4)
public int monVolLowCount; //鍗曚綋涓嬮檺鏁伴噺(0~240)
//public int saveInterval; //鏁版嵁淇濆瓨闂撮殧min
- public double dcVolHighLimit; //鍗囧帇涓婇檺锛�0.1V锛�
+ //public double dcVolHighLimit; //鍗囧帇涓婇檺锛�0.1V锛�
+ public double mon_vol; //鍗曚綋鐢靛帇
//public double chargeCurr; //鍏呯數鐢靛帇锛堝湪绾块槇鍊硷級A
public int testType; //娴嬭瘯绫诲瀷锛�0:鎭掔數娴� 1:鎭掑姛鐜� 2:鎭掔數闃伙級
public double dischargePower; //棰勬斁鍔熺巼锛�0.1kw锛�
@@ -71,7 +72,8 @@
monCount = FBS_ComBase.changeShortToInt(bf.getShort()); //姣忕粍鍗曚綋鏁伴噺
groupCount = FBS_ComBase.changeShortToInt(bf.getShort()); //鐢垫睜缁勭粍鏁�
monVolLowCount = FBS_ComBase.changeShortToInt(bf.getShort()); //鍗曚綋涓嬮檺鏁伴噺
- dcVolHighLimit = FBS_ComBase.changeShortToDouble(bf.getShort())/10; //鍗囧帇涓婇檺
+ //dcVolHighLimit = FBS_ComBase.changeShortToDouble(bf.getShort())/10; //鍗囧帇涓婇檺
+ mon_vol = FBS_ComBase.changeShortToDouble(bf.getShort()); //鍗曚綋鐢靛帇
testType = FBS_ComBase.changeShortToInt(bf.getShort()); //娴嬭瘯绫诲瀷
dischargePower = FBS_ComBase.changeShortToDouble(bf.getShort())/10; //棰勬斁鍔熺巼
@@ -132,7 +134,8 @@
tmpbuf.putShort(FBS_ComBase.changeIntToShort(monCount)); //姣忕粍鍗曚綋鏁伴噺
tmpbuf.putShort(FBS_ComBase.changeIntToShort(groupCount)); //鐢垫睜缁勭粍鏁�
tmpbuf.putShort(FBS_ComBase.changeIntToShort(monVolLowCount)); //鍗曚綋涓嬮檺鏁伴噺
- tmpbuf.putShort(FBS_ComBase.changeDoubleToShort(dcVolHighLimit*10)); //鍗囧帇涓婇檺
+ //tmpbuf.putShort(FBS_ComBase.changeDoubleToShort(dcVolHighLimit*10)); //鍗囧帇涓婇檺
+ tmpbuf.putShort(FBS_ComBase.changeDoubleToShort(mon_vol)); //鍗曚綋鐢靛帇
tmpbuf.putShort(FBS_ComBase.changeIntToShort(testType)); //娴嬭瘯绫诲瀷
tmpbuf.putShort(FBS_ComBase.changeDoubleToShort(dischargePower*10)); //棰勬斁鍔熺巼
@@ -161,7 +164,7 @@
+ param_index + ", battStdCap=" + battStdCap + ", hourState=" + hourState + ", disChargeCurr="
+ disChargeCurr + ", disChargeCap=" + disChargeCap + ", disTime=" + disTime + ", monVolLow=" + monVolLow
+ ", groupVolLow=" + groupVolLow + ", monCount=" + monCount + ", groupCount=" + groupCount
- + ", monVolLowCount=" + monVolLowCount + ", dcVolHighLimit=" + dcVolHighLimit + ", testType=" + testType
+ + ", monVolLowCount=" + monVolLowCount + ", mon_vol=" + mon_vol + ", testType=" + testType
+ ", dischargePower=" + dischargePower + ", chargeCurr=" + chargeCurr + ", chargeVol=" + chargeVol
+ ", floatVol=" + floatVol + ", chargeTime=" + chargeTime + ", floatTime=" + floatTime
+ ", chargeStopCurr=" + chargeStopCurr + ", groupHighVol=" + groupHighVol + ", monHighVol=" + monHighVol
--
Gitblit v1.9.1