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

whyclj

2019-10-22 9e45b70bcb3dd1c3a54b4feb362bd2182a6d11d6

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

@@ -44,9 +44,10 @@

    private ByteBuffer bytebuffer_for_socket_RX = ByteBuffer.allocate(1500);
    public Handler mHandler = null;
    public static Socket socket;
    public static Socket socket = null;
    private Date lastConTime;                       //上一次通讯成功的时间
    private boolean thread_run_flag = true;
    public boolean isRuning = false;

    ServiceModel returnmodel = new ServiceModel();

@@ -64,7 +65,7 @@

        //初始化消息循环队列，需要在Handler创建之前
        Looper.prepare();

        isRuning = true;
        mHandler = new Handler()
        {
            public void handleMessage(Message msg)
@@ -107,7 +108,15 @@
        Log.e(TAG, "Loop start at "+ Com.getDateTimeFormat(new Date(),Com.DTF_YMDhms) );
        //启动子线程消息循环队列
        Looper.loop();
        isRuning = false;
        Log.e(TAG, "Loop stop at "+ Com.getDateTimeFormat(new Date(),Com.DTF_YMDhms) );
        if(socket != null){
            try {
                socket.close();
            } catch (IOException e) {
                e.printStackTrace();
            }
        }
    }

    /**
@@ -122,10 +131,13 @@
        OutputStream out = null;
        try
        {
            socket = new Socket();
            SocketAddress socAddress = new InetSocketAddress(server_ip, server_port);
            socket.connect(socAddress, 3000);
            socket.setSoTimeout(3000);
//            socket = new Socket();
//            SocketAddress socAddress = new InetSocketAddress(server_ip, server_port);
//            socket.connect(socAddress, 2000);
            if(socket == null || socket.isClosed()){
                Log.e(TAG, "SocketComm:!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! " );
                reConnectDevice();
            }
            if(this.socket != null)
            {
                in = this.socket.getInputStream();
@@ -229,6 +241,7 @@
                    res_t = false;
                    model.code = 0;
                }
                thread_run_flag = true;
            } else {
                //System.out.println(this.getName() + "-------socket  异常关闭-------" + Com.getNowTimeWithAt());
                thread_run_flag = false;
@@ -236,20 +249,6 @@
        } catch (IOException | InterruptedException e) {
            thread_run_flag = false;
        } finally {
            if(in != null) {
                try {
                    in.close();
                } catch (IOException e) {
                    e.printStackTrace();
                }
            }
            if(out != null) {
                try {
                    out.close();
                } catch (IOException e) {
                    e.printStackTrace();
                }
            }
            if(!thread_run_flag){
                reConnectDevice();
            }
@@ -303,8 +302,11 @@
        try {
            socket = new Socket();
            SocketAddress socAddress = new InetSocketAddress(server_ip, this.server_port);
            socket.connect(socAddress, 3000);
            socket.connect(socAddress, 2000);

            ServiceModel temp = new ServiceModel();
            temp.cmd = FBS_ComBase.CMD_ENTERMACHINECONTROL;
            SocketComm(ByteBuffer.allocate(0),temp);                //进入上位机控制
            flag = true;
        } catch (IOException e) {
            e.printStackTrace();
@@ -326,6 +328,7 @@
        if(true == m_FBS_Cmd.putByteBuffer(bf))
        {

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

            //---------------------  心跳包测试    ----------------------------------
@@ -357,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: 切换电池组成功");

                }
            }

@@ -380,8 +384,9 @@
            }
            //---------------------  获取放电参数    ----------------------------------------------
            else if(FBS_ComBase.CMD_GETDISCHARGEPARAM == m_FBS_Cmd.CMD) {
                Log.e(TAG, "getDataFromCommBuf: 获取放电参数" );
                if(testParam.putByteBuffer(bf)) {
                    //System.out.println("获取放电参数成功");
                    System.out.println("获取放电参数成功");
                    //System.out.println(testParam);
                    isSuccess = true;
                    model.setData(testParam);
@@ -456,16 +461,33 @@
                }

            }

            //---------------------  清除告警    ----------------------------------
            else if(FBS_ComBase.CMD_CLEARALARM == m_FBS_Cmd.CMD) {
                if(FBS_ComBase.RETURN_SUCCESS == m_FBS_Cmd.RecState) {
                    isSuccess = true;
                    System.out.println("清除告警成功");
                }
            }
            //---------------------  进入 Android控制   ----------------------------------
            else if(FBS_ComBase.CMD_ENTERMACHINECONTROL == m_FBS_Cmd.CMD) {
                if(FBS_ComBase.RETURN_SUCCESS == m_FBS_Cmd.RecState) {
                    isSuccess = true;
                    System.out.println("进入Android模式成功");
                }
            }
        }
        return isSuccess;
    }

    public boolean setUpDeviceIp(String server_ip){
        boolean flag  = false;
        synchronized (socket){
            if (server_ip != null && server_ip.length() > 0){
                flag = reConnectDevice();
        if(this.socket == null){
            flag = reConnectDevice();
        }else{
            synchronized (socket){
                if (this.server_ip != null && server_ip.length() > 0){
                    flag = reConnectDevice();
                }
            }
        }
        return false;
@@ -474,14 +496,23 @@
    //测试当前ip是否可以连接
    public boolean testSockConn(String server_ip){
        boolean flag = false;
        Socket socket1 = null;
        try {
            Socket socket1 = new Socket();
            socket1 = new Socket();
            Log.e(TAG, "testSockConn: "+server_ip );
            SocketAddress socAddress = new InetSocketAddress(server_ip, this.server_port);
            socket1.connect(socAddress, 3000);
            flag = true;
        } catch (IOException e) {
            e.printStackTrace();
        } finally{
           if(socket1 != null){
               try {
                   socket1.close();
               } catch (IOException e) {
                   e.printStackTrace();
               }
           }
        }
        return flag;
    }