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/alarms/BattAlarmCheckThread.java |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 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 4222e1d..4930560 100644
--- a/platforms/android/app/src/main/java/com/alarms/BattAlarmCheckThread.java
+++ b/platforms/android/app/src/main/java/com/alarms/BattAlarmCheckThread.java
@@ -56,11 +56,11 @@
                     if(battDataThread.isInstall){
                        List<BattAlarmData> alarmDatas = battDataThread.state.makeAlarmData(battDataThread,alarmParam);
                        if(alarmDatas.size() > 0){
-                           Log.e(TAG, "run: 鏇存柊鍛婅鏉℃暟"+ alarmDatas.size());
+                           //Log.e(TAG, "run: 鏇存柊鍛婅鏉℃暟"+ alarmDatas.size());
 
                             //鏇存柊褰撳墠鍛婅璁板綍
                            for(int k = 0;k<alarmDatas.size();k++){
-                               Log.e(TAG, "run: "+alarmDatas.get(k) );
+                               //Log.e(TAG, "run: "+alarmDatas.get(k) );
                                insertOrUpdateBattAlarmData(dbHelper,alarmDatas.get(k));                                         //鎻掑叆鎴栨洿鏂板綋鍓嶇殑鍛婅璁板綍
                            }
                        }
@@ -138,7 +138,9 @@
         } catch (Exception e) {
             e.printStackTrace();
         } finally {
-            db.close();
+//            if(db != null){
+//                db.close();
+//            }
         }
     }
 
@@ -157,7 +159,9 @@
         } catch (SQLException e) {
             e.printStackTrace();
         } finally{
-            db.close();
+//            if(db != null){
+//                db.close();
+//            }
         }
     }
 
@@ -203,9 +207,9 @@
         } catch (SQLException e) {
             e.printStackTrace();
         } finally{
-            if(db != null){
-                db.close();
-            }
+//            if(db != null){
+//                db.close();
+//            }
         }
     }
 

--
Gitblit v1.9.1