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/BattTestDataRecordThread.java | 29 +++++++++++++++++++++++++++++
1 files changed, 29 insertions(+), 0 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 2293882..abe2170 100644
--- a/platforms/android/app/src/main/java/com/socket/BattTestDataRecordThread.java
+++ b/platforms/android/app/src/main/java/com/socket/BattTestDataRecordThread.java
@@ -77,6 +77,10 @@
//璁板綍褰撳墠鐨勫厖鏀剧數璁板綍
insertBattTestData(dbHelper,battData);
}
+ if(!isRecording && testTimelong < minTestTimeLong){
+ //娴嬭瘯鏃堕暱灏忎簬1鍒嗛挓鐨勫厖鏀剧數璁板綍鍒犻櫎
+ deleteInvalidTestData(dbHelper,battData);
+ }
battData.state.record_num++;
isStartRecord = false;
}else{
@@ -202,4 +206,29 @@
// }
}
}
+
+ /**
+ * 鍒犻櫎鍘嗗彶鎸囧畾鐢垫睜缁勭殑鎸囧畾鍏呮斁鐢佃褰�
+ * @param dbHelper
+ * @param battData
+ */
+ public static void deleteInvalidTestData(DBHelper dbHelper,BattDataThread battData){
+ Concentrator_State state = battData.state;
+ //鍒犻櫎tb_batttestdata_inf琛ㄤ腑鐨勮褰�
+ String sql_delbatttDataInf_str = "DELETE FROM tb_batttestdata_inf WHERE BattGroupId = "+battData.battIndex+" AND test_record_count = "+state.test_record_count;
+ //鍒犻櫎tb_batttestdata_id琛ㄤ腑鐨勮褰�
+ String sql_delbatttDataId_str = "DELETE FROM tb_batttestdata_"+battData.battIndex+" WHERE test_record_count= "+state.test_record_count;
+ SQLiteDatabase db = null;
+ try {
+ db = dbHelper.getWritableDatabase();
+ db.beginTransaction();
+ db.execSQL(sql_delbatttDataInf_str);
+ db.execSQL(sql_delbatttDataId_str);
+ db.setTransactionSuccessful();
+ db.endTransaction();
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
+ Log.e(TAG, "deleteInvalidTestData:鍒犻櫎娴嬭瘯鏃堕暱灏忎簬1鍒嗛挓鐨勬斁鐢佃褰� ");
+ }
}
--
Gitblit v1.9.1