From e7b78e0a428fa54d94c1b274a4305640b2859e80 Mon Sep 17 00:00:00 2001 From: JLChen <551775569@qq.com> Date: 星期一, 15 十一月 2021 15:15:57 +0800 Subject: [PATCH] 2021-11-15 1.更新 --- HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/config/HDLLinkConfig.java | 25 ++++++++++++++++++++++--- 1 files changed, 22 insertions(+), 3 deletions(-) diff --git a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/config/HDLLinkConfig.java b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/config/HDLLinkConfig.java index b671bb6..426367b 100644 --- a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/config/HDLLinkConfig.java +++ b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/config/HDLLinkConfig.java @@ -4,6 +4,7 @@ import com.hdl.sdk.common.config.TopicConstant; import com.hdl.sdk.common.utils.SPUtils; +import com.hdl.sdk.connect.bean.GatewaySearchBean; /** @@ -20,6 +21,7 @@ private String gatewayId; private String ipAddress; private boolean isLocalEncrypt;//缃戝叧鏄惁闇�瑕佸姞瀵嗛�氳 + private GatewaySearchBean currentGateway;//褰撳墠缃戝叧 /** * instance @@ -83,8 +85,10 @@ * @return */ public boolean checkIfCertified(){ - //localSecret涓嶄负绌哄苟涓旈暱搴︾瓑浜�16 - return !TextUtils.isEmpty(localSecret) && localSecret.length() == 16; + //localSecret涓嶄负绌哄苟涓旈暱搴︾瓑浜�16 缃戝叧id涓嶈兘涓虹┖ + return !TextUtils.isEmpty(localSecret) + && localSecret.length() == 16 + && !TextUtils.isEmpty(gatewayId); } public void setLocalSecret(String localSecret) { @@ -112,6 +116,14 @@ isLocalEncrypt = localEncrypt; } + public GatewaySearchBean getCurrentGateway() { + return currentGateway; + } + + public void setCurrentGateway(GatewaySearchBean currentGateway) { + this.currentGateway = currentGateway; + } + /** * 鍒ゆ柇褰撳墠涓婚鏁版嵁鏄惁闇�瑕佸姞瀵� * @param topicStr 褰撳墠涓婚 @@ -126,6 +138,13 @@ ); } - + /** + * 鎷兼帴缃戝叧ID鑾峰彇瀹屾暣鐨勪富棰� + * @param topicStr + * @return + */ + public String getFullTopic(String topicStr){ + return String.format(topicStr, gatewayId); + } } -- Gitblit v1.8.0