更改了udp测试后版本

hxb

2021-12-13 27a0768b0e0a042911b7f299fcc599d2da4e7fc0

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

@@ -29,7 +29,14 @@


    private SocketBoot boot;

    private UdpSocketBoot udpSocketBoot;

    private InetSocketAddress inetSocketAddress;

    /**

     * 发送的目标IP

     */

    private String ipAddress;

    /**

     * 发送的目标地址

     */

    private int port;

    private final LinkRequest linkRequest;

    private final EventListener eventListener;



@@ -71,11 +78,12 @@
    }



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

                            InetSocketAddress inetSocketAddress, LinkRequest linkRequest, String observeTopic, HdlSocketListener listener) {

                            String ipAddress,int port , LinkRequest linkRequest, String observeTopic, HdlSocketListener listener) {

        this.sendAwaitTime = sendAwaitTime;

        this.maxRetry = maxRetry;

        this.udpSocketBoot = udpSocketBoot;

        this.inetSocketAddress = inetSocketAddress;

        this.ipAddress = ipAddress;

        this.port = port;

        this.linkRequest = linkRequest;

        this.listener = listener;

        this.sendNumber = new AtomicInteger(0);

@@ -120,16 +128,17 @@
     * Udp的发送方法

     *

     * @param udpSocketBoot     Udp当前对接

     * @param inetSocketAddress 发送的目标地址

     * @param ipAddress 发送的目标IP地址

     * @param port 目的端口

     * @param linkRequest       发送的数据

     * @param observeTopic      发送的主题

     * @param listener          回调

     */

    public static void send(UdpSocketBoot udpSocketBoot, InetSocketAddress inetSocketAddress, LinkRequest linkRequest, String observeTopic, HdlSocketListener listener) {

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

        if (TextUtils.isEmpty(observeTopic)) {

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

        }

        HdlSocketHelper socketHelper = new HdlSocketHelper(DEF_SEND_TIMEOUT, DEF_SEND_ONE, udpSocketBoot, inetSocketAddress, linkRequest, observeTopic, listener);

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

        socketHelper.send();

    }



@@ -137,16 +146,17 @@
     * Udp发送的方法

     *

     * @param udpSocketBoot     当前Udp对象

     * @param inetSocketAddress 发送的目标地址

     * @param ipAddress 发送的目标IP地址

     * @param

     * @param linkRequest       发送的对象

     * @param listener          回调

     */

    public static void send(UdpSocketBoot udpSocketBoot, InetSocketAddress inetSocketAddress, LinkRequest linkRequest, HdlSocketListener listener) {

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

        String observeTopic = null;

        if (TextUtils.isEmpty(observeTopic)) {

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

        }

        HdlSocketHelper socketHelper = new HdlSocketHelper(DEF_SEND_TIMEOUT, DEF_SEND_ONE, udpSocketBoot, inetSocketAddress, linkRequest, observeTopic, listener);

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

        socketHelper.send();

    }



@@ -166,7 +176,7 @@
                            }

                            //如果是udp

                            if (null != udpSocketBoot) {

                                udpSocketBoot.sendMsg(inetSocketAddress, linkRequest.getSendBytes());

                                udpSocketBoot.sendMsg(ipAddress,port, linkRequest.getSendBytes());

                            }

                        }

                    } catch (Exception e) {