Merge branch 'FBS9600' of http://whychdw@118.89.139.230:10101/r/FBS9600App....

whychdw

2019-12-20 0a707989b1e298d6c22575ef573b6a4f65d0e036

 platforms/android/app/src/main/java/com/alarms/BattAlarmCheckThread.java

@@ -64,6 +64,7 @@
                               insertOrUpdateBattAlarmData(dbHelper,alarmDatas.get(k));                                         //插入或更新当前的告警记录

                           }

                       }

                        alarmDatas.clear();

                    }else{

                        //清除未安装电池组的告警记录

                        if(battDataThread.isAlarmClear){

@@ -81,7 +82,7 @@
                        }

                    }

                }

                sleep(1000);

                sleep(2000);

            } catch (Exception e) {

                e.printStackTrace();

            }