From fe8ff166e285b3fdd117a5f75d288bc068bb92d3 Mon Sep 17 00:00:00 2001
From: whychdw <49690745@qq.com>
Date: 星期四, 28 十一月 2019 17:09:43 +0800
Subject: [PATCH] Merge branch 'FBS9600' of http://whychdw@118.89.139.230:10101/r/FBS9600App.git into FBS9600
---
platforms/android/app/src/main/java/com/socket/BattTestDataRecordThread.java | 50 +++++++++++++++++++++++++-------------------------
1 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/platforms/android/app/src/main/java/com/socket/BattTestDataRecordThread.java b/platforms/android/app/src/main/java/com/socket/BattTestDataRecordThread.java
index 55f23c7..2293882 100644
--- a/platforms/android/app/src/main/java/com/socket/BattTestDataRecordThread.java
+++ b/platforms/android/app/src/main/java/com/socket/BattTestDataRecordThread.java
@@ -62,7 +62,7 @@
insertBattTestDatainf(dbHelper,battData);
lastRecordTime = new Date();
- isStartRecord = false;
+
}
int testTimelong = (int)((battData.state.record_time.getTime() - battData.state.testStartTime.getTime())/1000); //娴嬭瘯鏃堕暱
battData.state.testTimelong = testTimelong;
@@ -71,14 +71,14 @@
isRecording = false;
}
int recordInterver = (int)Math.abs(new Date().getTime()-lastRecordTime.getTime())/1000; //璺濈涓婃璁板綍鏁版嵁鐨勬椂闀�
- if(recordInterver >= saveDataIntever || !isStartRecord){
+ if(recordInterver >= saveDataIntever || !isRecording){
lastRecordTime = new Date();
//鏀剧數缁撴潫鎴栬�呰褰曟椂闂村埌
//璁板綍褰撳墠鐨勫厖鏀剧數璁板綍
insertBattTestData(dbHelper,battData);
}
battData.state.record_num++;
-
+ isStartRecord = false;
}else{
//鏆傛棤璁板綍鍏呮斁鐢垫暟鎹�
if(battData.state.battstate == Concentrator_State.WORKSTATE_DISCH && battData.isInstall && battData.loseTimeLong <= 60*60){
@@ -100,7 +100,7 @@
}
}
- sleep(1000);
+ sleep(3000);
} catch (Exception e) {
e.printStackTrace();
}
@@ -126,9 +126,9 @@
} catch (SQLException e) {
e.printStackTrace();
} finally{
- if(db != null){
- db.close();
- }
+// if(db != null){
+// db.close();
+// }
}
return max_test_record_count;
}
@@ -140,13 +140,13 @@
"(BattGroupId,test_record_count,test_type,record_time_interval,record_num,test_starttime,record_time,test_timelong,group_vol,test_curr,test_cap,max_monnum,max_monvol,min_monnum,min_monvol) " +
" VALUES("+battData.battIndex+","+state.test_record_count+","+state.test_type+","+saveDataIntever+","+state.record_num+",'"+Com.getDateTimeFormat(state.testStartTime,Com.DTF_YMDhms)+"','"+Com.getDateTimeFormat(state.record_time,Com.DTF_YMDhms)+"',"+state.testTimelong+","+state.getGroupvol()+","+state.getGroupcurr()+","+0+","+state.max_monnum+","+state.max_monvol+","+state.min_monnum+","+state.min_monvol+") ";
- String batt_id_sql_str="INSERT INTO tb_batttestdata_"+battData.battIndex+"(BattGroupId,test_record_count,test_type,test_starttime,record_time,test_timelong,group_vol,test_curr,test_cap,mon_num,mon_vol,mon_tmp,mon_res) " +
+ String batt_id_sql_str="INSERT INTO tb_batttestdata_"+battData.battIndex+"(BattGroupId,test_record_count,test_type,record_num,test_starttime,record_time,test_timelong,group_vol,test_curr,test_cap,mon_num,mon_vol,mon_tmp,mon_res) " +
"VALUES";
for(int i=0;i<state.monCount;i++){
if(i != 0){
batt_id_sql_str += ",";
}
- batt_id_sql_str += "("+battData.battIndex+","+state.test_record_count+","+state.test_type+",'"+Com.getDateTimeFormat(state.testStartTime,Com.DTF_YMDhms)+"','"+Com.getDateTimeFormat(state.record_time,Com.DTF_YMDhms)+"',"+state.testTimelong+","+state.getGroupvol()+","+state.getGroupcurr()+","+0+","+(i+1)+","+state.mon_vols[i]+","+state.mon_tmps[i]+","+state.mon_ress[i]+")";
+ batt_id_sql_str += "("+battData.battIndex+","+state.test_record_count+","+state.test_type+","+state.record_num+",'"+Com.getDateTimeFormat(state.testStartTime,Com.DTF_YMDhms)+"','"+Com.getDateTimeFormat(state.record_time,Com.DTF_YMDhms)+"',"+state.testTimelong+","+state.getGroupvol()+","+state.getGroupcurr()+","+0+","+(i+1)+","+state.mon_vols[i]+","+state.mon_tmps[i]+","+state.mon_ress[i]+")";
}
SQLiteDatabase db = null;
try {
@@ -159,13 +159,13 @@
} catch (SQLException e) {
e.printStackTrace();
} finally {
- if(db != null){
- try {
- db.close();
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
+// if(db != null){
+// try {
+// db.close();
+// } catch (Exception e) {
+// e.printStackTrace();
+// }
+// }
}
}
@@ -174,13 +174,13 @@
Concentrator_State state = battData.state;
String batt_inf_sql_str = " UPDATE tb_batttestdata_inf SET record_num ="+state.record_num+" ,record_time='"+Com.getDateTimeFormat(state.record_time,Com.DTF_YMDhms)+"',test_timelong="+state.testTimelong+",group_vol="+state.getGroupvol()+",test_curr="+state.getGroupcurr()+",test_cap=0,max_monnum="+state.max_monnum+",max_monvol="+state.max_monvol+",min_monnum="+state.min_monnum+",min_monvol="+state.min_monvol+" WHERE BattGroupId = "+battData.battIndex+" AND test_record_count = "+state.test_record_count;
- String batt_id_sql_str="INSERT INTO tb_batttestdata_"+battData.battIndex+"(BattGroupId,test_record_count,test_type,test_starttime,record_time,test_timelong,group_vol,test_curr,test_cap,mon_num,mon_vol,mon_tmp,mon_res) " +
+ String batt_id_sql_str="INSERT INTO tb_batttestdata_"+battData.battIndex+"(BattGroupId,test_record_count,test_type,record_num,test_starttime,record_time,test_timelong,group_vol,test_curr,test_cap,mon_num,mon_vol,mon_tmp,mon_res) " +
"VALUES";
for(int i=0;i<state.monCount;i++){
if(i != 0){
batt_id_sql_str += ",";
}
- batt_id_sql_str += "("+battData.battIndex+","+state.test_record_count+","+state.test_type+",'"+Com.getDateTimeFormat(state.testStartTime,Com.DTF_YMDhms)+"','"+Com.getDateTimeFormat(state.record_time,Com.DTF_YMDhms)+"',"+state.testTimelong+","+state.getGroupvol()+","+state.getGroupcurr()+","+0+","+(i+1)+","+state.mon_vols[i]+","+state.mon_tmps[i]+","+state.mon_ress[i]+")";
+ batt_id_sql_str += "("+battData.battIndex+","+state.test_record_count+","+state.test_type+","+state.record_num+",'"+Com.getDateTimeFormat(state.testStartTime,Com.DTF_YMDhms)+"','"+Com.getDateTimeFormat(state.record_time,Com.DTF_YMDhms)+"',"+state.testTimelong+","+state.getGroupvol()+","+state.getGroupcurr()+","+0+","+(i+1)+","+state.mon_vols[i]+","+state.mon_tmps[i]+","+state.mon_ress[i]+")";
}
SQLiteDatabase db = null;
try {
@@ -193,13 +193,13 @@
} catch (SQLException e) {
e.printStackTrace();
} finally {
- if(db != null){
- try {
- db.close();
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
+// if(db != null){
+// try {
+// db.close();
+// } catch (Exception e) {
+// e.printStackTrace();
+// }
+// }
}
}
}
--
Gitblit v1.9.1