更改了udp测试后版本

hxb

2021-12-13 27a0768b0e0a042911b7f299fcc599d2da4e7fc0

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

@@ -71,8 +71,8 @@
    private volatile static HDLAuthSocket instance;

    private HDLAuthSocket() {
        initSearchGatewayEvent();
        initListenerGatewayEvent();
        initSearchGatewayEvent();
    }

//    public interface CallBack extends BaseCallBack {
@@ -89,8 +89,6 @@
            synchronized (HDLLinkConfig.class) {
                if (instance == null) {
                    instance = new HDLAuthSocket();
                    //1.启动Socket 开启监听
                    instance.getUdpBoot();
                }
            }
        }
@@ -132,6 +130,8 @@
     */
    public void startAuthenticateRequest(AuthenticateRequest request, HDLLinkCallBack callBack) {
        HDLLinkConfig.getInstance().clearConfig();
        //1.启动Socket 开启监听
        getUdpBoot();
        //2.构建监听Listener
//        authEvent =
        //3.监听网关广播的入网指令
@@ -177,7 +177,7 @@
        String requestStr = gs.toJson(request);
        LinkRequest message = new LinkRequest(topic, requestStr);

        HdlSocketHelper.send(getUdpBoot(), InetSocketAddress.createUnresolved(ip,UDP_PORT), message, new HdlSocketHelper.HdlSocketListener() {
        HdlSocketHelper.send(getUdpBoot(), ip,UDP_PORT, message, new HdlSocketHelper.HdlSocketListener() {
            @Override
            public void onSucceed(Object msg) {
                if (callBack == null) return;
@@ -293,7 +293,7 @@
     * @param callBack 回调
     */
    public void searchGatewayMulticast(SearchGatewayCallBack callBack) {
        searchGateway(HDLLinkConfig.getInstance().getGatewayId(),  InetSocketAddress.createUnresolved(UDP_GROUP_IP,UDP_PORT), callBack);
        searchGateway(HDLLinkConfig.getInstance().getGatewayId(), UDP_GROUP_IP,UDP_PORT, callBack);
    }

    /**
@@ -303,7 +303,7 @@
     */
    public void searchGatewayBroadcast(SearchGatewayCallBack callBack) {
        String ip = IpUtils.getBroadcastAddress();
        searchGateway(HDLLinkConfig.getInstance().getGatewayId(),  InetSocketAddress.createUnresolved(ip,UDP_PORT), callBack);
        searchGateway(HDLLinkConfig.getInstance().getGatewayId(),  ip,UDP_PORT, callBack);
    }


@@ -321,7 +321,7 @@
                GsonConvert.getGson().toJson(data));

        String ip = IpUtils.getBroadcastAddress();
        HdlSocketHelper.send(getUdpBoot(), InetSocketAddress.createUnresolved(ip,UDP_PORT), message, new HdlSocketHelper.HdlSocketListener() {
        HdlSocketHelper.send(getUdpBoot(), ip,UDP_PORT, message, new HdlSocketHelper.HdlSocketListener() {
            @Override
            public void onSucceed(Object msg) {
                if (callBack == null) return;
@@ -353,8 +353,8 @@
            return;
        }
        LinkRequest message = new LinkRequest(topic, bodyStr);
        String ip = HDLLinkConfig.getInstance().getIpAddress(); IpUtils.getBroadcastAddress();
        HdlSocketHelper.send(getUdpBoot(), InetSocketAddress.createUnresolved(ip,UDP_PORT), message, new HdlSocketHelper.HdlSocketListener() {
        String ip = HDLLinkConfig.getInstance().getIpAddress();
        HdlSocketHelper.send(getUdpBoot(), ip, UDP_PORT, message, new HdlSocketHelper.HdlSocketListener() {
                    @Override
                    public void onSucceed(Object msg) {
                        if (callBack == null) return;
@@ -383,7 +383,7 @@
        }
        LinkRequest message = new LinkRequest(topic, bodyStr);
        String ip = HDLLinkConfig.getInstance().getIpAddress();// IpUtils.getBroadcastAddress();
        getUdpBoot().sendMsg( InetSocketAddress.createUnresolved(ip,UDP_PORT),message.getSendBytes());
        getUdpBoot().sendMsg( ip,UDP_PORT,message.getSendBytes());
    }

    private GatewaySearchBean getGatewaySearchBean(Object msg) {
@@ -513,10 +513,11 @@
     * 搜索指定网关是否在线，搜索到则返回指定的网关对象
     *
     * @param gatewayId 网关id
     * @param desInetSocketAddress        目标的地址
     * @param ipAddress        目标的IP地址
     * @param port 目标的端口
     * @param callBack  回调
     */
    public void searchGateway(String gatewayId, InetSocketAddress desInetSocketAddress, SearchGatewayCallBack callBack) {
    public void searchGateway(String gatewayId, String ipAddress,int port, SearchGatewayCallBack callBack) {
        this.searchGatewayId = gatewayId;
        this.mSearchGatewayCallBack = callBack;
        //重置参数
@@ -538,7 +539,7 @@
                        //搜索网关
                        searchGatewayCount.set(searchGatewayCount.get() + 1);
                        LogUtils.i("搜索网关", "搜索网关第" + searchGatewayCount.get() + "次");
                        getUdpBoot().sendMsg(desInetSocketAddress,message.getSendBytes());
                        getUdpBoot().sendMsg(ipAddress, port, message.getSendBytes());
                        Thread.sleep(1000L);
                    } catch (InterruptedException e) {
                        e.printStackTrace();
@@ -548,11 +549,10 @@
                if (!isSearchGatewaySuccess.get()) {
                    //搜索10次，指定网关都没回复，回调超时
                    callBackSearchGatewayTimeout();
                    LogUtils.e("搜索网关--", "搜索10次，指定网关都没回复，回调超时");
                    LogUtils.e("搜索网关", "搜索10次，指定网关都没回复，回调超时");
                }
            }
        }).start();

    }

    /**