From fc82d219f87c06888e9fb42d9f5e69b946e026da Mon Sep 17 00:00:00 2001
From: whyclj <1525436766@qq.com>
Date: 星期五, 06 十二月 2019 10:11:59 +0800
Subject: [PATCH] 修改后台添加开机自启功能
---
platforms/android/app/src/main/java/com/socket/FBS9600S_DeviceService.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/platforms/android/app/src/main/java/com/socket/FBS9600S_DeviceService.java b/platforms/android/app/src/main/java/com/socket/FBS9600S_DeviceService.java
index 2b880d8..8107575 100644
--- a/platforms/android/app/src/main/java/com/socket/FBS9600S_DeviceService.java
+++ b/platforms/android/app/src/main/java/com/socket/FBS9600S_DeviceService.java
@@ -146,15 +146,19 @@
//璇诲彇鐢垫睜缁勫厖鐢电數姹犱俊鎭�
@JavascriptInterface
public void readBattCharInfo(){
- List list = new ArrayList();
+ List<HashMap> list = new ArrayList();
for(int i=0;i<allBattDatt.size();i++){
- if(allBattDatt.get(i).state.battstate == Concentrator_State.WORKSTATE_CHARG){
- list.add(allBattDatt.get(i));
+ if(allBattDatt.get(i).state.battstate == Concentrator_State.WORKSTATE_CHARG && allBattDatt.get(i).isInstall){
+ HashMap map = new HashMap();
+ map.put("state",allBattDatt.get(i).state);
+ map.put("battinf",allBattDatt.get(i).battinf);
+ list.add(map);
}
}
ServiceModel model = new ServiceModel();
model.code = 1;
model.data = list;
+ //Log.e(TAG, "readBattCharInfo: "+model );
ActionUtil.SendCallDataToJS(JS_INTERFACE_NAME,"readBattCharInfo",model,webView, ActionUtil.getGson());
}
@@ -179,7 +183,7 @@
//Log.e(TAG, "readBattDiscInfo: ##############################"+allBattDatt.size());
List<HashMap> list = new ArrayList();
for(int i=0;i<allBattDatt.size();i++){
- if(allBattDatt.get(i).state.battstate == Concentrator_State.WORKSTATE_DISCH){
+ if(allBattDatt.get(i).state.battstate == Concentrator_State.WORKSTATE_DISCH && allBattDatt.get(i).isInstall){
HashMap map = new HashMap();
map.put("state",allBattDatt.get(i).state);
map.put("battinf",allBattDatt.get(i).battinf);
--
Gitblit v1.9.1