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/alarms/BattAlarmCheckThread.java | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/platforms/android/app/src/main/java/com/alarms/BattAlarmCheckThread.java b/platforms/android/app/src/main/java/com/alarms/BattAlarmCheckThread.java
index 4930560..17544ab 100644
--- a/platforms/android/app/src/main/java/com/alarms/BattAlarmCheckThread.java
+++ b/platforms/android/app/src/main/java/com/alarms/BattAlarmCheckThread.java
@@ -54,16 +54,17 @@
for(int i=0;i<allBattDatt.size();i++){
BattDataThread battDataThread = allBattDatt.get(i);
if(battDataThread.isInstall){
- List<BattAlarmData> alarmDatas = battDataThread.state.makeAlarmData(battDataThread,alarmParam);
- if(alarmDatas.size() > 0){
- //Log.e(TAG, "run: 鏇存柊鍛婅鏉℃暟"+ alarmDatas.size());
+ List<BattAlarmData> alarmDatas = battDataThread.state.makeAlarmData(battDataThread,alarmParam);
+ if(alarmDatas.size() > 0){
+ //Log.e(TAG, "run: 鏇存柊鍛婅鏉℃暟"+ alarmDatas.size());
//鏇存柊褰撳墠鍛婅璁板綍
- for(int k = 0;k<alarmDatas.size();k++){
- //Log.e(TAG, "run: "+alarmDatas.get(k) );
- insertOrUpdateBattAlarmData(dbHelper,alarmDatas.get(k)); //鎻掑叆鎴栨洿鏂板綋鍓嶇殑鍛婅璁板綍
- }
- }
+ for(int k = 0;k<alarmDatas.size();k++){
+ //Log.e(TAG, "run: "+alarmDatas.get(k) );
+ insertOrUpdateBattAlarmData(dbHelper,alarmDatas.get(k)); //鎻掑叆鎴栨洿鏂板綋鍓嶇殑鍛婅璁板綍
+ }
+ }
+ alarmDatas.clear();
}else{
//娓呴櫎鏈畨瑁呯數姹犵粍鐨勫憡璀﹁褰�
if(battDataThread.isAlarmClear){
@@ -81,7 +82,7 @@
}
}
}
- sleep(1000);
+ sleep(2000);
} catch (Exception e) {
e.printStackTrace();
}
@@ -96,7 +97,7 @@
*/
public void initBattAlarmParam(DBHelper dbHelper,AlarmParam alarmParam){
String str_sql = " SELECT num,alm_id,alm_name,alm_high_coe,alm_low_coe,alm_high_en,alm_low_en " +
- " FROM tb_alarm_param ";
+ " FROM tb_alarm_param ";
boolean flag = false;
SQLiteDatabase db = null;
try {
--
Gitblit v1.9.1