whyclj
2019-12-06 fc82d219f87c06888e9fb42d9f5e69b946e026da
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);