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

whyclj

2019-10-22 9e45b70bcb3dd1c3a54b4feb362bd2182a6d11d6

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

@@ -3,11 +3,15 @@
import android.os.Handler;
import android.os.Looper;
import android.os.Message;
import android.util.Log;

import com.google.gson.Gson;
import com.mode.BattRTData;
import com.mode.BattTestParam;
import com.mode.BattTestRtData;
import com.mode.DeviceState;
import com.mode.ServiceModel;
import com.util.Com;
import com.util.ComFn;
import com.util.Ecb_Aes;
import com.util.FBS_Cmd;
@@ -18,12 +22,16 @@
import java.io.InputStream;
import java.io.OutputStream;
import java.io.UnsupportedEncodingException;
import java.net.InetSocketAddress;
import java.net.Socket;
import java.net.SocketAddress;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.util.Date;

public class MySocketClientThread extends Thread{
    public static final String TAG = "MySocketClientThread";

    private String server_ip;                       //服务器ip地址
    private int server_port = 6666;                 //设备屏监听端口

@@ -31,14 +39,15 @@
    private BattTestParam testParam;                //电池测试参数
    private BattTestRtData testRtData;              //电池测试数据

    private FBS_Cmd m_FBS_Cmd;
    private FBS_Cmd m_FBS_Cmd = new FBS_Cmd();


    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();

@@ -47,11 +56,7 @@
        battData = new BattRTData();
        testParam = new BattTestParam();
        testRtData = new BattTestRtData();
        try {
            socket = new Socket(this.server_ip, server_port);
        } catch (IOException e) {
            //e.printStackTrace();
        }

    }

    /*********************************************************************************************/
@@ -60,7 +65,7 @@

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

        isRuning = true;
        mHandler = new Handler()
        {
            public void handleMessage(Message msg)
@@ -75,6 +80,7 @@
                        remodel.cmd = model.cmd;
                        if(true == SocketComm(createByteBuffer(model), remodel))
                        {
                            remodel.code = 1;
                            remodel.cmd = m_FBS_Cmd.CMD;
                            //--------------- 新建消息与句柄 -----------------
                            Handler handler = model.handler;
@@ -84,7 +90,7 @@
                            //-----------------------------------------------
                            sleep(100);
                        }else{
                            remodel.cmd = model.cmd;
                            remodel.code = 0;
                            //--------------- 新建消息与句柄 -----------------
                            Handler handler = model.handler;
                            Message toMain = handler.obtainMessage();
@@ -99,8 +105,18 @@
                }
            }
        };
        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();
            }
        }
    }

    /**
@@ -115,7 +131,13 @@
        OutputStream out = null;
        try
        {
            socket.setSoTimeout(2000);
//            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();
@@ -219,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;
@@ -226,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();
            }
@@ -253,15 +262,18 @@
     */
    public ByteBuffer createByteBuffer(ServiceModel model){
        ByteBuffer buffer = ByteBuffer.allocate(0);
        if( FBS_ComBase.CMD_HEARTBEAT == model.cmd
        if(FBS_ComBase.CMD_CREATENEWBATT == model.cmd
            || FBS_ComBase.CMD_CHANGEBATT == model.cmd
            || FBS_ComBase.CMD_DELETENOWBATT == model.cmd
        ){

        }else if(FBS_ComBase.CMD_CREATENEWBATT == model.cmd){
            //新建电池组
            //新建电池组/切换电池组/删除电池组
            testParam.battName = model.msg;
            buffer = testParam.getNewBattByteBuffer();
        }else if(FBS_ComBase.CMD_SETDISCHARGEPARAM == model.cmd){
            Gson gson = new Gson();
            BattTestParam param = gson.fromJson(model.msg,BattTestParam.class);
            buffer = param.getByteBuffer();
        }

        return buffer;
    }

@@ -278,7 +290,8 @@
    /**
     *   重新连接设备
     */
    public void reConnectDevice(){
    public boolean reConnectDevice(){
        boolean flag = false;
        if(socket != null){
            try {
                socket.close();
@@ -287,10 +300,18 @@
            }
        }
        try {
            socket = new Socket(server_ip, server_port);
            socket = new Socket();
            SocketAddress socAddress = new InetSocketAddress(server_ip, this.server_port);
            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();
        }
        return flag;
    }

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

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

            //---------------------  心跳包测试    ----------------------------------
@@ -315,19 +337,22 @@
                    byte[] b = new byte[bf.limit()];
                    bf.get(b);
                    try {
                        DeviceState deviceState = new DeviceState(m_FBS_Cmd.WorkState,new String(b,"utf-8"));

                        model.setData(deviceState);
                        System.out.println("当前电池组是："+new String(b,"utf-8"));
                    } catch (UnsupportedEncodingException e) {
                        e.printStackTrace();
                    }
                    isSuccess = true;
                    System.out.println("获取心跳包成功");
                    //System.out.println("获取心跳包成功");
                }
            }
            //---------------------  新建电池组    ----------------------------------
            else if(FBS_ComBase.CMD_CREATENEWBATT == m_FBS_Cmd.CMD) {
                if(FBS_ComBase.RETURN_SUCCESS == m_FBS_Cmd.RecState) {
                    isSuccess = true;
                    System.out.println("新建电池组成功");
                    //System.out.println("新建电池组成功");
                }
            }

@@ -335,65 +360,72 @@
            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: 切换电池组成功");

                }
            }

            

            //---------------------  删除电池组    ----------------------------------
            else if(FBS_ComBase.CMD_DELETENOWBATT == m_FBS_Cmd.CMD) {
                if(FBS_ComBase.RETURN_SUCCESS == m_FBS_Cmd.RecState) {
                    isSuccess = true;
                    System.out.println("删除电池组成功");
                    //System.out.println("删除电池组成功");
                }
            }
            //---------------------  获取单体数据    ----------------------------------------------
            else if(FBS_ComBase.CMD_GETBATTDATA == m_FBS_Cmd.CMD) {
                System.err.println("获取单体数据");
                if(battData.putByteBuffer(bf, m_FBS_Cmd.ByteLen-m_FBS_Cmd.BYTE_LEN)) {
                    System.out.println("获取单体数据成功");
                    //System.out.println("获取单体数据成功");
                    isSuccess = true;
                    model.setData(battData);
                }
            }
            //---------------------  获取放电参数    ----------------------------------------------
            else if(FBS_ComBase.CMD_GETDISCHARGEPARAM == m_FBS_Cmd.CMD) {
                Log.e(TAG, "getDataFromCommBuf: 获取放电参数" );
                if(testParam.putByteBuffer(bf)) {
                    System.out.println("获取放电参数成功");
                    System.out.println(testParam);
                    //System.out.println(testParam);
                    isSuccess = true;
                    model.setData(testParam);
                }
            }
            //---------------------- 设置放电参数 --------------------------------------------------
            else if(FBS_ComBase.CMD_SETDISCHARGEPARAM == m_FBS_Cmd.CMD) {
                if(FBS_ComBase.RETURN_SUCCESS == m_FBS_Cmd.RecState) {
                    isSuccess = true;
                    System.out.println("设置参数成功");
                    //System.out.println("设置参数成功");
                }
            }
            //---------------------  启动放电    ----------------------------------
            else if(FBS_ComBase.CMD_STARTDISCHARGE == m_FBS_Cmd.CMD) {
                if(FBS_ComBase.RETURN_SUCCESS == m_FBS_Cmd.RecState) {
                    isSuccess = true;
                    System.out.println("启动放电成功");
                    //System.out.println("启动放电成功");
                }
            }
            //---------------------  放电暂停    ----------------------------------
            else if(FBS_ComBase.CMD_PAUSEDISCHARGE == m_FBS_Cmd.CMD) {
                if(FBS_ComBase.RETURN_SUCCESS == m_FBS_Cmd.RecState) {
                    isSuccess = true;
                    System.out.println("暂停放电成功");
                    //System.out.println("暂停放电成功");
                }
            }
            //---------------------  停止放电    ----------------------------------
            else if(FBS_ComBase.CMD_STOPDISCHARGE == m_FBS_Cmd.CMD) {
                if(FBS_ComBase.RETURN_SUCCESS == m_FBS_Cmd.RecState) {
                    isSuccess = true;
                    System.out.println("停止放电成功");
                    //System.out.println("停止放电成功");
                }
            }
            //---------------------  获取放电数据    ----------------------------------
            else if(FBS_ComBase.CMD_GETDISCHARGEDATA == m_FBS_Cmd.CMD) {
                if(testRtData.putByteBuffer(bf)) {
                    isSuccess = true;
                    System.out.println("获取放电数据成功"+testRtData);
                    model.setData(testRtData);
                    //System.out.println("获取放电数据成功"+testRtData);
                }

            }
@@ -402,21 +434,21 @@
            else if(FBS_ComBase.CMD_STARTCHARGE== m_FBS_Cmd.CMD) {
                if(FBS_ComBase.RETURN_SUCCESS == m_FBS_Cmd.RecState) {
                    isSuccess = true;
                    System.out.println("启动充电成功");
                    //System.out.println("启动充电成功");
                }
            }
            //---------------------  暂停充电    ----------------------------------
            else if(FBS_ComBase.CMD_PAUSECHARGE== m_FBS_Cmd.CMD) {
                if(FBS_ComBase.RETURN_SUCCESS == m_FBS_Cmd.RecState) {
                    isSuccess = true;
                    System.out.println("暂停充电成功");
                   // System.out.println("暂停充电成功");
                }
            }
            //---------------------  停止充电    ----------------------------------
            else if(FBS_ComBase.CMD_STOPCHARGE== m_FBS_Cmd.CMD) {
                if(FBS_ComBase.RETURN_SUCCESS == m_FBS_Cmd.RecState) {
                    isSuccess = true;
                    System.out.println("停止充电成功");
                    //System.out.println("停止充电成功");
                }
            }

@@ -424,15 +456,65 @@
            else if(FBS_ComBase.CMD_GETCHARGEDATA == m_FBS_Cmd.CMD) {
                if(testRtData.putByteBuffer(bf)) {
                    isSuccess = true;
                    System.out.println("获取充电数据成功"+testRtData);
                    model.setData(testRtData);
                    //System.out.println("获取充电数据成功"+testRtData);
                }

            }
            //---------------------  新建电池组组名    ----------------------------------------------

            //---------------------  清除告警    ----------------------------------
            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;
        if(this.socket == null){
            flag = reConnectDevice();
        }else{
            synchronized (socket){
                if (this.server_ip != null && server_ip.length() > 0){
                    flag = reConnectDevice();
                }
            }
        }
        return false;
    }

    //测试当前ip是否可以连接
    public boolean testSockConn(String server_ip){
        boolean flag = false;
        Socket socket1 = null;
        try {
            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;
    }

}