whyclj
2019-10-23 ed1a24a5bf58e4bc5166e768177946b1cf62ba8b
platforms/android/app/src/main/java/com/socket/MySocketClientThread.java
@@ -51,12 +51,21 @@
    ServiceModel returnmodel = new ServiceModel();
    public MySocketClientThread(String server_ip){
    private static MySocketClientThread thread ;
    private MySocketClientThread(String server_ip){
        this.server_ip = server_ip;
        battData = new BattRTData();
        testParam = new BattTestParam();
        testRtData = new BattTestRtData();
    }
    public static MySocketClientThread createThread(String server_ip){
        if(thread == null){
           thread = new MySocketClientThread(server_ip);
        }
        return thread;
    }
    /*********************************************************************************************/
@@ -273,6 +282,12 @@
            Gson gson = new Gson();
            BattTestParam param = gson.fromJson(model.msg,BattTestParam.class);
            buffer = param.getByteBuffer();
        }else if(FBS_ComBase.CMD_RETURNMAIN == model.cmd){
            buffer = ByteBuffer.allocate(1);
            buffer.order(ByteOrder.LITTLE_ENDIAN);
            buffer.position(0);
            buffer.put(FBS_ComBase.changeIntToByte(Integer.parseInt(model.msg)));
            buffer.flip();
        }
        return buffer;
    }
@@ -328,6 +343,7 @@
        if(true == m_FBS_Cmd.putByteBuffer(bf))
        {
            model.errcode = m_FBS_Cmd.RecState;
            lastConTime = new Date();
            //---------------------  心跳包测试    ----------------------------------
@@ -359,7 +375,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: 切换电池组成功");
                }
            }
@@ -473,6 +490,23 @@
                    System.out.println("进入Android模式成功");
                }
            }
            //---------------------  进入界面同步切换   ----------------------------------
            else if(FBS_ComBase.CMD_RETURNMAIN == m_FBS_Cmd.CMD) {
                if(FBS_ComBase.RETURN_SUCCESS == m_FBS_Cmd.RecState) {
                    isSuccess = true;
                    System.out.println("切换界面成功");
                }
            }
            //---------------------  退出上位机控制   ----------------------------------
            else if(FBS_ComBase.CMD_EXITMACHINECONTROL == m_FBS_Cmd.CMD) {
                if(FBS_ComBase.RETURN_SUCCESS == m_FBS_Cmd.RecState) {
                    isSuccess = true;
                    System.out.println("退出上位机控制");
                }
            }
        }
        return isSuccess;
    }
@@ -491,6 +525,17 @@
        return false;
    }
    //关闭socket连接
    public void closeConn(){
        if(this.socket != null){
            try {
                this.socket.close();
            } catch (IOException e) {
                e.printStackTrace();
            }
        }
    }
    //测试当前ip是否可以连接
    public boolean testSockConn(String server_ip){
        boolean flag = false;