修改取值范围以及推送当前设备状态

whyclj

2019-10-22 9e45b70bcb3dd1c3a54b4feb362bd2182a6d11d6

修改取值范围以及推送当前设备状态

 platforms/android/app/src/main/java/com/mode/BattTestParam.java

@@ -73,7 +73,7 @@
        groupCount = FBS_ComBase.changeShortToInt(bf.getShort());                //电池组组数
        monVolLowCount = FBS_ComBase.changeShortToInt(bf.getShort());            //单体下限数量
        //dcVolHighLimit = FBS_ComBase.changeShortToDouble(bf.getShort())/10;        //升压上限
        mon_vol = FBS_ComBase.changeShortToDouble(bf.getShort());               //单体电压
        mon_vol = FBS_ComBase.changeShortToDouble(bf.getShort())/10;               //单体电压
        testType = FBS_ComBase.changeShortToInt(bf.getShort());                    //测试类型
        dischargePower = FBS_ComBase.changeShortToDouble(bf.getShort())/10;        //预放功率

@@ -135,7 +135,7 @@
        tmpbuf.putShort(FBS_ComBase.changeIntToShort(groupCount));                //电池组组数
        tmpbuf.putShort(FBS_ComBase.changeIntToShort(monVolLowCount));            //单体下限数量
        //tmpbuf.putShort(FBS_ComBase.changeDoubleToShort(dcVolHighLimit*10));    //升压上限
        tmpbuf.putShort(FBS_ComBase.changeDoubleToShort(mon_vol));                //单体电压
        tmpbuf.putShort(FBS_ComBase.changeDoubleToShort(mon_vol*10));                //单体电压
        tmpbuf.putShort(FBS_ComBase.changeIntToShort(testType));                //测试类型
        tmpbuf.putShort(FBS_ComBase.changeDoubleToShort(dischargePower*10));    //预放功率


 platforms/android/app/src/main/java/com/mode/ServiceModel.java

@@ -9,18 +9,19 @@

public class ServiceModel
{
    public int code;
    public int cmd;
    public String msg;
    public Object data;
    public int code;                    //返回状态    0：执行成功    1：执行失败
    public int cmd;                     //发送命令地址
    public String msg;                  //返回消息
    public Object data;                 //返回数据
    public Handler handler;
    public int errcode;                 //错误码

    public ServiceModel()
    {
        String msg = "";
        int code = 0;
        int cmd = 0;
        Object data = null;
        code = 0;
        cmd = 0;
        data = null;
        handler = null;
    }

@@ -75,6 +76,10 @@
        this.handler = handler;
    }

    public void setErrcode(int errcode){
        this.errcode = errcode;
    }

    @Override
    public String toString() {
        return "ServiceModel{" +

 platforms/android/app/src/main/java/com/service/MyInteractionService.java

@@ -52,7 +52,7 @@
                }else if(FBS_ComBase.CMD_HEARTBEAT == model.cmd){
                    //心跳包返
                    deviceState = (DeviceState)model.data;
                    //jsInterface.SendCallDataToJS("getNowWorkBatt",model);
                    jsInterface.SendCallDataToJS("getNowWorkBattState",model);
                }else if(FBS_ComBase.CMD_CREATENEWBATT == model.cmd){
                    //新建电池组
                    //model.data = deviceState;
@@ -221,7 +221,7 @@
    }

    //获取当前选中的电池组以及其状态
    public boolean getNowWorkBatt(){
    public boolean getNowWorkBattState(){
        return sendMessageToSocketClient(mSocketHandle, FBS_ComBase.CMD_HEARTBEAT, "");
    }


 platforms/android/app/src/main/java/com/socket/MySocketClientThread.java

@@ -328,6 +328,7 @@
        if(true == m_FBS_Cmd.putByteBuffer(bf))
        {

            model.errcode = m_FBS_Cmd.RecState;
            lastConTime = new Date();

            //---------------------  心跳包测试    ----------------------------------
@@ -359,7 +360,8 @@
            else if(FBS_ComBase.CMD_CHANGEBATT == m_FBS_Cmd.CMD) {
                if(FBS_ComBase.RETURN_SUCCESS == m_FBS_Cmd.RecState) {
                    isSuccess = true;
                    //System.out.println("切换电池组成功");
                    Log.e(TAG, "getDataFromCommBuf: 切换电池组成功");

                }
            }


 platforms/android/app/src/main/java/io/hybird/jsbridge/JsInterface.java

@@ -200,8 +200,8 @@

    //获取当前选中的电池组以及当前的状态
    @JavascriptInterface
    public boolean getNowWorkBatt(){
        return service.getNowWorkBatt();
    public boolean getNowWorkBattState(){
        return service.getNowWorkBattState();
    }

    //清除所有的告警