From 2574334327d47d5b0d62e1e9fe442a493bbcf2bd Mon Sep 17 00:00:00 2001 From: 562935844@qq.com Date: 星期二, 11 四月 2023 15:52:54 +0800 Subject: [PATCH] 新增接收主机退网delete/notify主题处理 --- HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/config/HDLLinkConfig.java | 70 +++++++++++++++++++++++----------- 1 files changed, 47 insertions(+), 23 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 49c705a..7b8c005 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 @@ -3,6 +3,7 @@ import android.text.TextUtils; import com.hdl.sdk.common.config.TopicConstant; +import com.hdl.sdk.common.utils.LogUtils; import com.hdl.sdk.common.utils.SPUtils; import com.hdl.sdk.connect.bean.request.AuthenticateRequest; import com.hdl.sdk.connect.bean.response.GatewaySearchBean; @@ -22,30 +23,36 @@ private String localSecret;//鏈湴鍔犲瘑瀵嗛挜 private String gatewayId; private String ipAddress; - private boolean isLocalEncrypt;//缃戝叧鏄惁闇�瑕佸姞瀵嗛�氳 private GatewaySearchBean currentGateway;//褰撳墠缃戝叧 + private String networkName; private AuthenticateRequest.AuthenticateDeviceInfoBean deviceInfoBean;//褰撳墠璁惧鍩烘湰淇℃伅 + private AuthenticateRequest.RequestBean requestBean;//褰撳墠璁惧鍩烘湰淇℃伅 + private AuthenticateRequest.AuthBean authBean;//褰撳墠璁惧璁よ瘉淇℃伅 /** * instance */ - private volatile static HDLLinkConfig instance; + private static final HDLLinkConfig instance=new HDLLinkConfig(); + private HDLLinkConfig() + { + loadConfig(); + } /** * getInstance * * @return AuthenticateConfig */ - public static synchronized HDLLinkConfig getInstance() { - if (instance == null) { - synchronized (HDLLinkConfig.class) { - if (instance == null) { - instance = new HDLLinkConfig(); - instance.loadConfig(); - } - } - } + public static HDLLinkConfig getInstance() { +// if (instance == null) { +// synchronized (HDLLinkConfig.class) { +// if (instance == null) { +// instance = new HDLLinkConfig(); +// instance.loadConfig(); +// } +// } +// } return instance; } @@ -56,7 +63,6 @@ this.gatewayId = ""; this.ipAddress = ""; this.localSecret = ""; - this.isLocalEncrypt = false; SPUtils.remove(AUTHENTICATE_LS_KEY); SPUtils.remove(AUTHENTICATE_GATEWAYID_KEY); SPUtils.remove(AUTHENTICATE_IPADDRESS_KEY); @@ -70,7 +76,6 @@ localSecret = SPUtils.getString(AUTHENTICATE_LS_KEY, ""); gatewayId = SPUtils.getString(AUTHENTICATE_GATEWAYID_KEY, ""); ipAddress = SPUtils.getString(AUTHENTICATE_IPADDRESS_KEY, ""); - isLocalEncrypt = SPUtils.getBoolean(AUTHENTICATE_IS_LS_KEY, false); } /** @@ -103,9 +108,10 @@ */ public boolean checkIfCertified() { //localSecret涓嶄负绌哄苟涓旈暱搴︾瓑浜�16 缃戝叧id涓嶈兘涓虹┖ - return !TextUtils.isEmpty(localSecret) - && localSecret.length() == 16 - && !TextUtils.isEmpty(gatewayId); + return !TextUtils.isEmpty(gatewayId); +// return !TextUtils.isEmpty(localSecret) +// && localSecret.length() == 16 +// && !TextUtils.isEmpty(gatewayId); } public void setLocalSecret(String localSecret) { @@ -120,6 +126,9 @@ public String getGatewayId() { return gatewayId; } + public void setGatewayId(String gatewayId) { + this.gatewayId=gatewayId; + } public String getIpAddress() { return ipAddress; @@ -128,13 +137,12 @@ this.ipAddress = ipAddress; } - public boolean isLocalEncrypt() { - return isLocalEncrypt; + public String getNetworkName() { + return networkName; } - public void setLocalEncrypt(boolean localEncrypt) { - isLocalEncrypt = localEncrypt; - SPUtils.put(AUTHENTICATE_IS_LS_KEY, isLocalEncrypt); + public void setNetworkName(String networkName) { + this.networkName = networkName; } public GatewaySearchBean getCurrentGateway() { @@ -163,8 +171,8 @@ return (!topicStr.contains(TopicConstant.GATEWAY_AUTH_BROADCAST) //缃戝叧骞挎挱鍏ョ綉鎸囦护 && !topicStr.contains(TopicConstant.DEIVCE_AUTH_REQUEST) //鍏ョ綉璁よ瘉 && !topicStr.contains(TopicConstant.GATEWAY_SEARCH) //鎼滅储缃戝叧涓婚 - && !topicStr.equals(TopicConstant.BROADCAST) - && isLocalEncrypt//鍚敤鍔犲瘑鏍囧織 + && !topicStr.contains(TopicConstant.BROADCAST) + && !TextUtils.isEmpty(localSecret) //鏈夊瘑閽ュ氨鏄姞瀵� ); } @@ -185,4 +193,20 @@ public void setDeviceInfoBean(AuthenticateRequest.AuthenticateDeviceInfoBean deviceInfoBean) { this.deviceInfoBean = deviceInfoBean; } + + public AuthenticateRequest.RequestBean getRequestBean() { + return requestBean; + } + + public void setRequestBean(AuthenticateRequest.RequestBean requestBean) { + this.requestBean = requestBean; + } + + public AuthenticateRequest.AuthBean getAuthBean() { + return authBean; + } + + public void setAuthBean(AuthenticateRequest.AuthBean authBean) { + this.authBean = authBean; + } } -- Gitblit v1.8.0