From 45625d6aaced524da3abebb5548d8495b77b8aa1 Mon Sep 17 00:00:00 2001
From: whyczh <hzjl@qq.com>
Date: 星期一, 21 三月 2022 14:11:39 +0800
Subject: [PATCH] Merge branch 'master' of http://118.89.139.230:10101/r/~whychw/testElectron
---
src/main/java/testElectronJ/FboDataHeadStart.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/main/java/testElectronJ/FboDataHeadStart.java b/src/main/java/testElectronJ/FboDataHeadStart.java
index d3847a5..1f7c55f 100644
--- a/src/main/java/testElectronJ/FboDataHeadStart.java
+++ b/src/main/java/testElectronJ/FboDataHeadStart.java
@@ -33,6 +33,7 @@
public int batt_mon_num; //鍗曚綋鏁伴噺 1
public float batt_mon_vol; //鍗曚綋鐢靛帇 0.1 2 =100
public DateTime TestStartTime; //鏀剧數寮�濮嬬殑鏃堕棿 6
+ public Date testStartTime;
public int Device; //浠〃绫诲瀷 鏈娇鐢� 1
public int DataVersion; //鏁版嵁鐗堟湰 1
public int DataType; //鏁版嵁绫诲瀷;0xFD琛ㄧず鏀剧數,0xFC琛ㄧず鍏呯數 1
@@ -59,6 +60,7 @@
public FboDataHeadStart(){
TestStartTime = new DateTime();
+ testStartTime = new Date();
}
public class DateTime{
@@ -76,7 +78,7 @@
return;
}
this.year = ComBase.changeByteToInt(bf.get());
- this.month = ComBase.changeByteToInt(bf.get());
+ this.month = ComBase.changeByteToInt(bf.get())-1;
this.day = ComBase.changeByteToInt(bf.get());
this.hour = ComBase.changeByteToInt(bf.get());
this.minute = ComBase.changeByteToInt(bf.get());
@@ -87,6 +89,7 @@
public Date getFBODateTime() {
Calendar c = Calendar.getInstance();
c.set(2000+year, month, day, hour, minute, second);
+ //System.out.println("娴嬭瘯寮�濮嬫椂闂�"+Com.getDateTimeFormat(c.getTime(),Com.DTF_YMDhms));
return c.getTime();
//return Com.get_DT_FromStr(year+"-"+month+"-"+day+" "+hour+":"+minute+":"+second, Com.DTF_YMDhms);
}
@@ -117,8 +120,9 @@
batt_mon_num = ComBase.changeShortToInt(bf.getShort()); //鍗曚綋鏁伴噺 1
batt_mon_vol = ComBase.changeShortToInt(bf.getShort())/10; //鍗曚綋鐢靛帇 0.1 2 =100
TestStartTime.setDateTime(bf);; //鏀剧數寮�濮嬬殑鏃堕棿 6
+ testStartTime = TestStartTime.getFBODateTime();
Device = ComBase.changeShortToInt(bf.getShort()); //浠〃绫诲瀷 鏈娇鐢� 1
- System.out.println("浠〃绫诲瀷锛�"+getDeviceType(Device));
+ //System.out.println("浠〃绫诲瀷锛�"+getDeviceType(Device));
DataVersion = ComBase.changeShortToInt(bf.getShort()); //鏁版嵁鐗堟湰 1
DataType = ComBase.changeByteToInt(bf.get()); //鏁版嵁绫诲瀷;0xFD琛ㄧず鏀剧數,0xFC琛ㄧず鍏呯數 1
HourRate = ComBase.changeByteToInt(bf.get()); //灏忔椂鐜� 鏈娇鐢� 1
@@ -128,7 +132,7 @@
MVLLimitCount = ComBase.changeShortToInt(bf.getShort()); //鍗曚綋涓嬮檺涓暟 鏈娇鐢� 2
for(int i=0;i<module_mon_num.length;i++) {
module_mon_num[i] = ComBase.changeShortToInt(bf.getShort()); //姣忎釜缁勫帇妯″潡鍗曚綋鑺傛暟 鐩墠鍙敤5涓� 20
- System.out.println((i+1)+":鍗曚綋鏁扮洰锛�"+module_mon_num[i]);
+ //System.out.println((i+1)+":鍗曚綋鏁扮洰锛�"+module_mon_num[i]);
}
GrpVol_H_Limit = ComBase.changeShortToFloat(bf.getShort())/10; //缁勭鐢靛帇涓婇檺 2
GrpVol_L_Limit = ComBase.changeShortToFloat(bf.getShort())/10; //缁勭鐢靛帇涓嬮檺 2
@@ -145,7 +149,7 @@
for(int i =0;i<StandBy.length;i++) {
StandBy[i] = ComBase.changeShortToInt(bf.getShort()); //淇濈暀澶囩敤 20 179
}
- System.out.println(this);
+ //System.out.println(this);
fboHeadStop.setFboStopData(bf);
//System.out.println("avg_curr:"+avg_curr);
--
Gitblit v1.9.1