修复bug

whyclj

2019-10-21 aecc5aa11fd2cbdea193db53adfc7c7920f43b26

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

@@ -29,11 +29,12 @@
    private DeviceState deviceState = null;
    private FTPFileUtil ftpFileUtil = null;

    private boolean isRunning = false;

    public MyInteractionService(String serverip, JsInterface jsInterface){
        sockethread = new MySocketClientThread(serverip);
        ftpFileUtil = new FTPFileUtil();
        sockethread.start();

        this.serverip = serverip;

        this.mSocketHandle = new Handler(){
@@ -44,9 +45,9 @@
                    //获取测试参数
                    jsInterface.SendCallDataToJS("getTestParam",model);
                }else if(FBS_ComBase.CMD_HEARTBEAT == model.cmd){
                    //心跳包返回
                    //心跳包返
                    deviceState = (DeviceState)model.data;
                    jsInterface.SendCallDataToJS("getNowWorkBatt",model);
                    //jsInterface.SendCallDataToJS("getNowWorkBatt",model);
                }else if(FBS_ComBase.CMD_CREATENEWBATT == model.cmd){
                    //新建电池组
                    //model.data = deviceState;
@@ -98,24 +99,26 @@
            }
        };

        new Thread(new Runnable() {
            @Override
            public void run() {
                while (true){
                    try {
                        if(isRunning){
                            //发送心跳包给设备
                            sendMessageToSocketClient(mSocketHandle, FBS_ComBase.CMD_HEARTBEAT, "");
                            Log.e(TAG, "run: ######################################" );
                        }
                        //handler.removeCallbacks(runnable);
                        Thread.sleep(4000);
                    } catch (InterruptedException e) {
                        e.printStackTrace();
                    }
                }
            }
        }).start();

//        new Thread(new Runnable() {
//            @Override
//            public void run() {
//                while (true){
//                    try {
//                        //发送心跳包给设备
//                        sendMessageToSocketClient(mSocketHandle, FBS_ComBase.CMD_HEARTBEAT, "");
//                        Log.e(TAG, "run: ######################################" );
//                        //handler.removeCallbacks(runnable);
//                        Thread.sleep(1000);
//                    } catch (InterruptedException e) {
//                        e.printStackTrace();
//                    }
//                }
//            }
//        }).start();

        this.sockethread.start();
    }

    //设置设备ip
@@ -123,7 +126,9 @@
        boolean flag = true;
        this.serverip = serverip;
        this.ftpFileUtil.server_ip = serverip;

        flag = sockethread.setUpDeviceIp(serverip);
        isRunning = true;
        return flag;
    }