From 0a707989b1e298d6c22575ef573b6a4f65d0e036 Mon Sep 17 00:00:00 2001
From: whychdw <49690745@qq.com>
Date: 星期五, 20 十二月 2019 14:44:19 +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/BattResDataRecordThread.java | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/platforms/android/app/src/main/java/com/socket/BattResDataRecordThread.java b/platforms/android/app/src/main/java/com/socket/BattResDataRecordThread.java
index 96765c2..5049288 100644
--- a/platforms/android/app/src/main/java/com/socket/BattResDataRecordThread.java
+++ b/platforms/android/app/src/main/java/com/socket/BattResDataRecordThread.java
@@ -31,6 +31,8 @@
@Override
public void run() {
Log.d(TAG, "run: BattResDataRecordThread start at" + Com.getDateTimeFormat(new Date(),Com.DTF_YMDhms));
+
+
while(true){
try {
//Log.e(TAG, "run: "+ battData.isOutTime+"\tlastResTestCount:"+lastResTestCount+"\t count:"+battData.state.getRestestcount());
@@ -39,7 +41,7 @@
if(battData.state.monCount >0 && battData.state.mon_ress[battData.state.monCount-1] > 0){
//寮�濮嬭褰曞唴闃诲巻鍙叉暟鎹�
int max_test_record_count = queryMaxTestRecordCount(battData.battIndex,dbHelper); //鏌ヨ褰撳墠鐢垫睜缁勬渶澶х殑璁板綍绗旀暟
- //Log.e(TAG, "run: MAXCOUNT:"+max_test_record_count );
+ Log.e(TAG, "run: MAXCOUNT:"+max_test_record_count );
//鎻掑叆 tb_battresdata_inf 琛ㄤ腑
insertBattResDataInf(battData.battIndex, battData.state,dbHelper,max_test_record_count);
@@ -49,7 +51,6 @@
lastResTestCount = battData.state.getRestestcount();
}
}
-
}
sleep(3000);
} catch (Exception e) {
@@ -68,6 +69,7 @@
sql_str_base += "("+battgroupid+","+test_record_count+","+BattDataThread.TESTTYPE_RESTEST+",'"+Com.getDateTimeFormat(new Date(),Com.DTF_YMDhms)+"',"+state.getGroupvol()+","+state.getGroupcurr()+","+(i+1)+","+state.mon_vols[i]+","+state.mon_tmps[i]+","+state.mon_ress[i]+")";
}
SQLiteDatabase db = dbHelper.getWritableDatabase();
+ //Log.e(TAG, "insertBattResDataID: "+sql_str_start+sql_str_base );
try {
db.execSQL(sql_str_start+sql_str_base);
} catch (SQLException e) {
@@ -90,17 +92,17 @@
String sql_str = "INSERT INTO tb_battresdata_inf " +
"(BattGroupId,test_record_count,test_type,test_starttime,record_time,group_vol,test_curr) " +
"VALUES("
- + battgroupid+","
- + test_record_count+","
- + BattDataThread.TESTTYPE_RESTEST+",'"
- + Com.getDateTimeFormat(new Date(),Com.DTF_YMDhms)+"','"
- + Com.getDateTimeFormat(new Date(),Com.DTF_YMDhms)+"',"
- + state.getGroupvol()+ ","
- + state.getGroupcurr()+"" +
+ + battgroupid+","
+ + test_record_count+","
+ + BattDataThread.TESTTYPE_RESTEST+",'"
+ + Com.getDateTimeFormat(new Date(),Com.DTF_YMDhms)+"','"
+ + Com.getDateTimeFormat(new Date(),Com.DTF_YMDhms)+"',"
+ + state.getGroupvol()+ ","
+ + state.getGroupcurr()+"" +
");";
SQLiteDatabase db = dbHelper.getWritableDatabase();
try {
- Log.d(TAG, "insertBattResDataInf: "+sql_str);
+ //Log.d(TAG, "insertBattResDataInf: "+sql_str);
db.execSQL(sql_str);
} catch (Exception e) {
--
Gitblit v1.9.1