2021-12-13 1.优化udp发送

JLChen

2021-12-13 43e38e768360ac8ced4f31fb4a423f2badda5587

2021-12-13 1.优化udp发送

 HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java

@@ -106,6 +106,8 @@
        beans.add(new DemoBean("设备功能列表"));
        beans.add(new DemoBean("UDP发送"));
        beans.add(new DemoBean("TCP发送"));
        beans.add(new DemoBean("UDP发送，监听主题回复，带重发带回调"));
        beans.add(new DemoBean("TCP发送，监听主题回复，带重发带回调"));
        demoAdapter = new DemoAdapter(beans);
        rv.setAdapter(demoAdapter);

@@ -164,11 +166,18 @@
                        //TCP发送
                        tcpSend();
                        break;
                    case 11:
                        //UDP发送，监听主题回复，带重发带回调
                        udpSendWithCallback();
                        break;
                    case 12:
                        //TCP发送，监听主题回复，带重发带回调
                        tcpSendWithCallback();
                        break;
                }
            }
        });
    }



    public void showToast(String text) {
@@ -200,6 +209,7 @@

    /**
     * 处理收到的主题
     *
     * @param response
     */
    private void handleLinkResponse(LinkResponse response){
@@ -338,6 +348,7 @@
                tv.setText("网关不在线");
                responseTv.setText(e.getMsg());
            }

            @Override
            public void onSuccess(GatewaySearchBean gatewaySearchBean) {
                tv.setText("网关在线");
@@ -402,6 +413,7 @@
                tv.setText("读取成功");
                responseTv.setText(data);
            }

            @Override
            public void onError(HDLLinkException e) {
                tv.setText("读取失败");
@@ -460,6 +472,7 @@

    //场景列表
    // {"id":"8a5eaa143ce943b987b577df5a66759b","time_stamp":"1637040217235","objects":[{"sid":"04010560D2C7170A0A0100000000","name":"回家模式","status":"off","group":"255","delay":"0","modify_time":"1634871490"},{"sid":"04010560D2C76E0A0A0100010000","name":"离家模式","status":"off","group":"255","delay":"0","modify_time":"1634785823"}]}

    /**
     * 控制场景
     * 执行成功的话 响应code为200
@@ -497,15 +510,17 @@
     * TCP发送 只发一次，不监听回复，不重发
     */
    private void tcpSend() {
        tv.setText("TCP发送 只发一次，不监听回复，不重发");
        String propertyDownTopic = String.format(TopicConstant.PROPERTY_DOWN, HDLLinkConfig.getInstance().getGatewayId());
        String bodyStr = getPropertyDownBodyStr();
        HDLLink.getInstance().tcpSendMsg(propertyDownTopic, bodyStr);
    }

    /**
     * 只发一次，不监听回复，不重发
     * UDP只发一次，不监听回复，不重发
     */
    private void udpSend() {
        tv.setText("UDP发送 只发一次，不监听回复，不重发");
        String propertyDownTopic = String.format(TopicConstant.PROPERTY_DOWN, HDLLinkConfig.getInstance().getGatewayId());
        String bodyStr = getPropertyDownBodyStr();
        HDLLink.getInstance().udpSendMsg(propertyDownTopic, bodyStr);
@@ -532,4 +547,46 @@

        return GsonConvert.getGson().toJson(data);
    }

    /**
     * UDP发送，监听主题回复，带重发带回调
     */
    private void udpSendWithCallback() {
        tv.setText("UDP发送，监听主题回复，带重发带回调");
        String propertyDownTopic = String.format(TopicConstant.PROPERTY_DOWN, HDLLinkConfig.getInstance().getGatewayId());
        String bodyStr = getPropertyDownBodyStr();
        HDLLink.getInstance().udpSendMsg(propertyDownTopic, bodyStr, new HDLLinkResponseCallBack() {
            @Override
            public void onSuccess(LinkResponse msg) {
                Log.i("udpSendWithCallback", "udpSendWithCallback");
                responseTv.setText(GsonConvert.getGson().toJson(msg));
            }

            @Override
            public void onError(HDLLinkException e) {
                responseTv.setText(e.getMsg());
            }
        });
    }

    /**
     * TCP发送，监听主题回复，带重发带回调
     */
    private void tcpSendWithCallback() {
        tv.setText("TCP发送，监听主题回复，带重发带回调");
        String propertyDownTopic = String.format(TopicConstant.PROPERTY_DOWN, HDLLinkConfig.getInstance().getGatewayId());
        String bodyStr = getPropertyDownBodyStr();
        HDLLink.getInstance().tcpSendMsg(propertyDownTopic, bodyStr, new HDLLinkCallBack() {
            @Override
            public void onSuccess(String msg) {
                Log.i("tcpSendWithCallback", "tcpSendWithCallback");
                responseTv.setText(msg);
            }

            @Override
            public void onError(HDLLinkException e) {
                responseTv.setText(e.getMsg());
            }
        });
    }
}

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

@@ -4,6 +4,7 @@


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

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

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

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

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

import com.hdl.sdk.socket.SocketBoot;

@@ -48,33 +49,12 @@


    private ScheduledExecutorService sendThread;



    private String observeTopic;



    public interface HdlSocketListener {

        void onSucceed(Object msg);



        void onFailure();

    }



    private HdlSocketHelper(Long sendAwaitTime, int maxRetry, SocketBoot boot, LinkRequest linkRequest, String observeTopic, HdlSocketListener listener) {

        this.sendAwaitTime = sendAwaitTime;

        this.maxRetry = maxRetry;

        this.boot = boot;

        this.linkRequest = linkRequest;

        this.listener = listener;

        this.sendNumber = new AtomicInteger(0);

        eventListener = new EventListener() {

            @Override

            public void onMessage(Object msg) {

                isSend.set(true);

                if (listener != null) {

                    listener.onSucceed(msg);

                }

                if (sendThread != null) {

                    sendThread.shutdownNow();

                }

                EventDispatcher.getInstance().remove(eventListener);

            }

        };

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

    }



    private HdlSocketHelper(Long sendAwaitTime, int maxRetry, UdpSocketBoot udpSocketBoot,

@@ -86,6 +66,7 @@
        this.port = port;

        this.linkRequest = linkRequest;

        this.listener = listener;

        this.observeTopic = observeTopic;

        this.sendNumber = new AtomicInteger(0);

        eventListener = new EventListener() {

            @Override

@@ -97,31 +78,33 @@
                if (sendThread != null) {

                    sendThread.shutdownNow();

                }

                EventDispatcher.getInstance().remove(eventListener);

                //移除监听

                removeListener();

            }

        };

        //注册监听

        registerListener();

    }





    /**

     * 注册监听

     */

    void registerListener() {

        if (!TextUtils.isEmpty(observeTopic)) {

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

//            LogUtils.i("HdlSocketHelper", "register event");

        }

    }



    public static void send(SocketBoot boot, LinkRequest linkRequest, String observeTopic, HdlSocketListener listener, Long sendAwaitTime, int maxRetry) {

        if (TextUtils.isEmpty(observeTopic)) {

            observeTopic = linkRequest.getTopic() + "_reply";

    /**

     * 移除监听

     */

    void removeListener() {

        if (!TextUtils.isEmpty(observeTopic)) {

            EventDispatcher.getInstance().remove(observeTopic, eventListener);

//            LogUtils.i("HdlSocketHelper", "remove event");

        }

        HdlSocketHelper socketHelper = new HdlSocketHelper(sendAwaitTime, maxRetry, boot, linkRequest, observeTopic, listener);

        socketHelper.send();

    }



    public static void send(SocketBoot boot, LinkRequest linkRequest, String observeTopic, HdlSocketListener listener) {

        send(boot, linkRequest, observeTopic, listener, DEF_SEND_TIMEOUT, DEF_MAX_RETRY);

    }





    public static void send(SocketBoot boot, LinkRequest linkRequest, HdlSocketListener listener) {

        send(boot, linkRequest, "", listener, DEF_SEND_TIMEOUT, DEF_MAX_RETRY);

    }



    public static void sendOne(SocketBoot boot, LinkRequest linkRequest, HdlSocketListener listener) {

        send(boot, linkRequest, "", listener, DEF_SEND_TIMEOUT, DEF_SEND_ONE);

    }



    /**

@@ -153,8 +136,9 @@
     * @param listener          回调

     */

    public static void sendUdp(UdpSocketBoot udpSocketBoot, String  ipAddress ,int port, LinkRequest linkRequest, HdlSocketListener listener) {

        sendUdp(udpSocketBoot,ipAddress,port,linkRequest,null,DEF_MAX_RETRY,listener);

        sendUdp(udpSocketBoot, ipAddress, port, linkRequest, "", DEF_MAX_RETRY, listener);

    }





    /**

     * Udp的发送方法

@@ -165,7 +149,8 @@
     * @param linkRequest       发送的数据

     */

    public static void sendUdpOne(UdpSocketBoot udpSocketBoot, String  ipAddress ,int port, LinkRequest linkRequest) {

        sendUdp(udpSocketBoot, ipAddress, port, linkRequest, null, DEF_SEND_ONE, null);

        HdlSocketHelper socketHelper = new HdlSocketHelper(DEF_SEND_TIMEOUT, DEF_SEND_ONE, udpSocketBoot, ipAddress, port, linkRequest, null, null);

        socketHelper.send();

    }



    private void send() {

@@ -219,7 +204,8 @@
     * 发送失败

     */

    private void notifyFailure() {

        EventDispatcher.getInstance().remove(eventListener);

        //移除监听

        removeListener();

        if (sendThread != null) {

            sendThread.shutdownNow();

            sendThread = null;