修复游客登陆时也能设置参数bug

whyclj

2019-10-24 c251059cae817966089ffed0226123e39d0113c6

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

@@ -3,12 +3,16 @@
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.service.MyInteractionService;
import com.util.Com;
import com.util.ComFn;
import com.util.Ecb_Aes;
import com.util.FBS_Cmd;
@@ -27,6 +31,8 @@
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;                 //设备屏监听端口

@@ -34,34 +40,40 @@
    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();

    public MySocketClientThread(String server_ip){
    private static MySocketClientThread thread ;
    public static MyInteractionService service = null;

    private MySocketClientThread(String server_ip){
        this.server_ip = server_ip;
        battData = new BattRTData();
        testParam = new BattTestParam();
        testRtData = new BattTestRtData();

    }

        new Thread(new Runnable(){
            @Override
            public void run() {
                try {
                    socket = new Socket(server_ip, server_port);
                } catch (IOException e) {
                    //e.printStackTrace();
                }
            }
        }).start();
    public static MySocketClientThread createThread(String server_ip, MyInteractionService service){
        MySocketClientThread.service = service;
        if(thread == null){
           thread = new MySocketClientThread(server_ip);
        }
        return thread;
    }

    //获取当前正在运行的线程
    public static MySocketClientThread getNowThread(){
        return thread;
    }

    /*********************************************************************************************/
@@ -70,7 +82,7 @@

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

        isRuning = true;
        mHandler = new Handler()
        {
            public void handleMessage(Message msg)
@@ -110,8 +122,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();
            }
        }
    }

    /**
@@ -126,7 +148,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();
@@ -188,11 +216,11 @@
                        //bytebuffer_for_socket_RX.put((byte)in.read());
                    } else {
                        rx_read_time_out++;
                        if((bytebuffer_for_socket_RX.position() >= 8) && (rx_read_time_out>10)){
                        if((bytebuffer_for_socket_RX.position() >= 18) && (rx_read_time_out>10)){
                            //   res = true;
                            break;
                        }
                        if(rx_read_time_out > 220) {
                        if(rx_read_time_out > 300) {
                            break;
                        }
                    }
@@ -230,27 +258,15 @@
                    res_t = false;
                    model.code = 0;
                }
                thread_run_flag = true;
            } else {
                //System.out.println(this.getName() + "-------socket  异常关闭-------" + Com.getNowTimeWithAt());
                thread_run_flag = false;
            }
        } catch (IOException | InterruptedException e) {
            model.code = 0;
            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();
            }
@@ -275,6 +291,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;
    }
@@ -304,8 +326,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();
@@ -327,6 +352,7 @@
        if(true == m_FBS_Cmd.putByteBuffer(bf))
        {

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

            //---------------------  心跳包测试    ----------------------------------
@@ -336,6 +362,7 @@
                    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) {
@@ -357,7 +384,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 +408,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,31 +485,95 @@
                }

            }
            //---------------------  清除告警    ----------------------------------
            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模式成功");
                }
            }


            //---------------------  进入界面同步切换   ----------------------------------
            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("退出上位机控制");
                }
            }

            //---------------------  控制活化(启动/停止/暂停)   ----------------------------------
            else if(FBS_ComBase.CMD_STARTHHTEST == m_FBS_Cmd.CMD || FBS_ComBase.CMD_PAUSEHHTEST == m_FBS_Cmd.CMD || FBS_ComBase.CMD_STOPHHTEST == m_FBS_Cmd.CMD) {
                if(FBS_ComBase.RETURN_SUCCESS == m_FBS_Cmd.RecState) {
                    isSuccess = true;
                    System.out.println("启动/停止/暂停活化测试成功");
                }
            }
        }
        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){
                    this.server_ip = server_ip;
                    flag = reConnectDevice();
                }
            }
        }
        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;
        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);
            socket.connect(socAddress, 3000);
            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;
    }