完善tcp

hxb

2021-12-21 93f13e7b2e046c6d86d10e7abc2ecaa4c4adabc3

 HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/socket/HDLSocket.java

@@ -3,40 +3,34 @@
import android.text.TextUtils;



import com.google.gson.JsonObject;

import com.google.gson.reflect.TypeToken;

import com.hdl.sdk.common.config.TopicConstant;

import com.hdl.sdk.common.event.EventDispatcher;

import com.hdl.sdk.common.event.EventListener;

import com.hdl.sdk.common.exception.HDLLinkCode;

import com.hdl.sdk.common.exception.HDLLinkException;

import com.hdl.sdk.common.utils.IdUtils;

import com.hdl.sdk.common.utils.IpUtils;

import com.hdl.sdk.common.utils.LogUtils;

import com.hdl.sdk.common.utils.SPUtils;

import com.hdl.sdk.common.utils.ThreadToolUtils;

import com.hdl.sdk.common.utils.gson.GsonConvert;

import com.hdl.sdk.connect.bean.request.BroadcastRequest;

import com.hdl.sdk.connect.bean.response.BaseLocalResponse;

import com.hdl.sdk.connect.bean.request.DeviceControlRequest;

import com.hdl.sdk.connect.bean.request.FunctionAttributeRequest;

import com.hdl.sdk.connect.bean.response.GatewaySearchBean;

import com.hdl.sdk.connect.bean.LinkRequest;

import com.hdl.sdk.connect.bean.LinkResponse;

import com.hdl.sdk.connect.bean.request.PropertyReadRequest;

import com.hdl.sdk.connect.bean.request.PropertyUpRequest;

import com.hdl.sdk.connect.callback.BaseCallBack;

import com.hdl.sdk.connect.callback.HDLLinkCallBack;

import com.hdl.sdk.connect.callback.HDLLinkResponseCallBack;

import com.hdl.sdk.connect.config.HDLLinkConfig;

import com.hdl.sdk.connect.protocol.LinkMessageDecoder;

import com.hdl.sdk.connect.protocol.LinkMessageEncoder;

import com.hdl.sdk.socket.SocketBoot;

import com.hdl.sdk.socket.SocketOptions;

import com.hdl.sdk.socket.client.TcpClient;

import com.hdl.sdk.socket.client.UdpClient;

import com.hdl.sdk.socket.codec.MessagePipeLine;

import com.hdl.sdk.socket.listener.ConnectStatusListener;

import com.hdl.sdk.socket.listener.SendListener;



import java.io.UnsupportedEncodingException;

import java.util.ArrayList;

import java.util.List;

import java.util.concurrent.ScheduledExecutorService;

@@ -63,7 +57,7 @@
        statusListener = new ConnectStatusListener() {

            @Override

            public void onConnecting() {



                broadcastRequest();

            }



            @Override

@@ -78,6 +72,31 @@
        };

    }



    /**

     * 广播自身信息给主网关

     */

    private void broadcastRequest() {

        String time = String.valueOf(System.currentTimeMillis());

        if (null == HDLLinkConfig.getInstance().getDeviceInfoBean()) {

            LogUtils.i("DeviceInfoBean为空，请设置当前对象");

            return;

        }

        BroadcastRequest request = new BroadcastRequest(IdUtils.getUUId(), time, HDLLinkConfig.getInstance().getDeviceInfoBean(), "200");

        HDLAuthSocket.getInstance().udpSendMsg(TopicConstant.BROADCAST, GsonConvert.getGson().toJson(request),true);

        HDLAuthSocket.getInstance().udpSendMsg(TopicConstant.BROADCAST, GsonConvert.getGson().toJson(request), true, new HDLLinkResponseCallBack() {

            @Override

            public void onSuccess(LinkResponse msg) {

                LogUtils.i("广播信息给主网关成功！");

            }



            @Override

            public void onError(HDLLinkException e) {



            }

        });

        HDLAuthSocket.getInstance().udpSendMsg(TopicConstant.BROADCAST, GsonConvert.getGson().toJson(request),true);

    }



    private static class SingletonInstance {

        private static final HDLSocket INSTANCE = new HDLSocket();

    }

@@ -86,17 +105,17 @@
        return SingletonInstance.INSTANCE;

    }





    SocketOptions options;

    private SocketOptions getTcpOptions() {

        final SocketOptions options = new SocketOptions();

        if(null!=options){

            return options;

        }

        options = new SocketOptions();

        final MessagePipeLine pipeLine = new MessagePipeLine();

        pipeLine.add(new LinkMessageDecoder());

        pipeLine.add(new LinkMessageEncoder());

        options.setHandleMessage(pipeLine);

        options.setEnabledHeartbeat(false);//是否开启心跳包发送检测

//        options.setHeartbeatTimeInterval(10*1000L);

//        options.setHeartbeatData("TCP");

//        options.setEnabledHeartbeat(true);//是否开启心跳包发送检测

        options.addConnectStatusListener(statusListener);

        return options;

    }



@@ -389,9 +408,11 @@
        if (TextUtils.isEmpty(getTcpIp())) {

            throw new RuntimeException("请搜索网关");

        }

        if (tcpBoot == null) {

        //如果没有初始化，或者网关IP更改了，就重新初始化

        if (tcpBoot == null||!getTcpOptions().getIp().equals(getTcpIp())) {

            tcpBoot = TcpClient.init(getTcpIp(), getTcpPort(), getTcpOptions());

        }



        return tcpBoot;

    }



@@ -558,14 +579,14 @@
                @Override

                public void onMessage(Object msg) {

                    if (msg instanceof LinkResponse) {

                        LogUtils.e("sendMsg onSuccess");

                        LogUtils.i("sendMsg onSuccess");

                        threadPool.shutdownNow();

                        LogUtils.i("sendMsg eventListener remove");

                        EventDispatcher.getInstance().remove(eventTag, this);

                        if (callBack != null) {

                            callBack.onSuccess(msg.toString());

                        }

                        threadPool.shutdownNow();

                    }

                    LogUtils.e("sendMsg eventListener remove");

                    EventDispatcher.getInstance().remove(eventTag, this);

                }

            };



@@ -591,6 +612,7 @@
                }

            }, 1000, 500, TimeUnit.MILLISECONDS);

            EventDispatcher.getInstance().register(eventTag, eventListener);

            //先发送一次

            getTcp().sendMsg(data, new SendListener() {

                @Override

                public void onSucceed() {