From d451118d4be05f180cfe1f99bc5904f74db8cc3f Mon Sep 17 00:00:00 2001 From: hxb <hxb@hdlchina.com.cn> Date: 星期四, 22 二月 2024 15:40:58 +0800 Subject: [PATCH] 引用线上库 --- HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/connect/HDLUdpConnect.java | 22 ++++++++++++++++------ 1 files changed, 16 insertions(+), 6 deletions(-) diff --git a/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/connect/HDLUdpConnect.java b/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/connect/HDLUdpConnect.java index 8bcbcb0..30a79a4 100644 --- a/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/connect/HDLUdpConnect.java +++ b/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/connect/HDLUdpConnect.java @@ -508,14 +508,24 @@ }.getType()); GatewayBean gateway = response.getObjects(); if (gateway != null) { - if (!TextUtils.isEmpty(gateway.getGatewayId()) - && !TextUtils.isEmpty(gateway.getHomeId())) { +// if (!TextUtils.isEmpty(HDLLinkConfig.getInstance().getGatewayId()) +// && !TextUtils.isEmpty(HDLLinkConfig.getInstance().getHomeId())) { +// //涓荤綉鍏冲苟涓旀槸褰撳墠缁戝畾鐨勭綉鍏� +// if ("true".equals(gateway.getMaster().toLowerCase())) { +// if (gateway.getGatewayId().equals(HDLLinkConfig.getInstance().getGatewayId()) +// || gateway.getDevice_mac().equals(HDLLinkConfig.getInstance().getGatewayId()) +// || gateway.getOid().equals(HDLLinkConfig.getInstance().getGatewayId()) +// || gateway.getHomeId().equals(HDLLinkConfig.getInstance().getHomeId())) { +// HDLLinkConfig.getInstance().setLocalEncrypt(gateway.getIsLocalEncrypt());//璁剧疆鏄惁鍔犲瘑 +// HDLLinkConfig.getInstance().setIpAddress(gateway.getIp_address()); +// //鏇存柊褰撳墠缃戝叧鐨勪俊鎭� +// HDLLinkConfig.getInstance().reSaveConfig(); +// } +// } + if (!TextUtils.isEmpty(gateway.getHomeId())) { //涓荤綉鍏冲苟涓旀槸褰撳墠缁戝畾鐨勭綉鍏� if ("true".equals(gateway.getMaster().toLowerCase())) { - if (gateway.getGatewayId().equals(HDLLinkConfig.getInstance().getGatewayId()) - || gateway.getDevice_mac().equals(HDLLinkConfig.getInstance().getGatewayId()) - || gateway.getOid().equals(HDLLinkConfig.getInstance().getGatewayId()) - || gateway.getHomeId().equals(HDLLinkConfig.getInstance().getHomeId())) { + if (gateway.getHomeId().equals(HDLLinkConfig.getInstance().getHomeId())) { HDLLinkConfig.getInstance().setLocalEncrypt(gateway.getIsLocalEncrypt());//璁剧疆鏄惁鍔犲瘑 HDLLinkConfig.getInstance().setIpAddress(gateway.getIp_address()); //鏇存柊褰撳墠缃戝叧鐨勪俊鎭� -- Gitblit v1.8.0