2024年02月20日13:36:27

mac

2024-02-20 a4ede842ce9c2d59c042998e0e7bd5275d25fde4

 HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/gateway/HDLLinkLocalGateway.java

@@ -158,7 +158,8 @@
        }
        for (GatewayBean gatewayBean : this.getGatewayList()) {
            if (macAndSid.equals(gatewayBean.getDevice_mac())
                    || macAndSid.equals(gatewayBean.getSid())) {
                    || macAndSid.equals(gatewayBean.getSid())
                    || macAndSid.equals(gatewayBean.getOid())) {
                return gatewayBean;
            }
        }
@@ -235,7 +236,7 @@
        ThreadToolUtils.getInstance().newFixedThreadPool(1).execute(new Runnable() {
            @Override
            public void run() {
                int count = 5;
                int count = 10;
                while (0 < count--) {
                    try {
                        //搜索网关
@@ -263,10 +264,11 @@
     *
     * @param callBack 回调
     */
    public void refreshGateway(GatewayCallBack callBack) {
    public void refreshGateway(GatewayCallBack callBack, List<String> spks) {
        String topicReply = TopicConstant.GATEWAY_SEARCH_REPLY;
        final List<GatewayBean> tempGatewayBeanList = new ArrayList<>();
        EventListener eventListener = getSearchGatewayEvent(this.getGatewayTypeList(), tempGatewayBeanList);
        EventListener eventListener = getSearchGatewayEvent(spks, tempGatewayBeanList);
//        EventListener eventListener = getSearchGatewayEvent(this.getGatewayTypeList(), tempGatewayBeanList);
        EventDispatcher.getInstance().register(topicReply, eventListener);
        ThreadToolUtils.getInstance().newFixedThreadPool(1).execute(new Runnable() {
            @Override
@@ -364,7 +366,7 @@
                if (homeId.equals(gateway.getHomeId()) || (needEmptyHomeIdGateway == true && TextUtils.isEmpty(gateway.getHomeId()))) {
                    //更新缓存网关，会记录所有收到的网关，以为了保存网关的IP信息
                    updateGatewayList(gatewayBeanList, gateway);
                    //非搜索的网关类似返回
                    //非搜索的网关类型返回
                    if (spk.contains(gateway.getGatewayType())) {
                        //更新当前读取网关的列表，这个列表每次都是清空再读取
                        updateGatewayList(tempGatewayBeanList, gateway);