From d3d67236f302677c87dc6c5ebde560d73c147578 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 13 十二月 2021 16:36:01 +0800
Subject: [PATCH] 2021-12-13 1.更新aar
---
HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/config/HDLLinkConfig.java | 32 +++++++++++++++++++++++++++-----
1 files changed, 27 insertions(+), 5 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 a212728..dd5e830 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
@@ -28,6 +28,7 @@
* instance
*/
private volatile static HDLLinkConfig instance;
+
/**
* getInstance
*
@@ -62,15 +63,16 @@
/**
* 鍔犺浇缂撳瓨
*/
- void loadConfig(){
+ void loadConfig() {
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);
+ isLocalEncrypt = SPUtils.getBoolean(AUTHENTICATE_IS_LS_KEY, false);
}
/**
* 淇濆瓨閰嶇疆
+ *
* @param localSecret
* @param gatewayId
* @param ipAddress
@@ -85,10 +87,18 @@
}
/**
+ * 閲嶆柊淇濆瓨
+ */
+ public void reSaveConfig() {
+ this.saveConfig(this.localSecret, this.gatewayId, this.ipAddress);
+ }
+
+ /**
* 妫�娴嬫槸鍚﹀凡缁忚璇佽繃
+ *
* @return
*/
- public boolean checkIfCertified(){
+ public boolean checkIfCertified() {
//localSecret涓嶄负绌哄苟涓旈暱搴︾瓑浜�16 缃戝叧id涓嶈兘涓虹┖
return !TextUtils.isEmpty(localSecret)
&& localSecret.length() == 16
@@ -111,6 +121,9 @@
public String getIpAddress() {
return ipAddress;
}
+ public void setIpAddress(String ipAddress){
+ this.ipAddress = ipAddress;
+ }
public boolean isLocalEncrypt() {
return isLocalEncrypt;
@@ -127,14 +140,22 @@
public void setCurrentGateway(GatewaySearchBean currentGateway) {
this.currentGateway = currentGateway;
+ if (this.currentGateway != null && !TextUtils.isEmpty(this.currentGateway.getIp_address())) {
+ if (!this.ipAddress.equals(this.currentGateway.getIp_address())) {
+ //濡傛灉IP鍦板潃鏈夊彉鍖栧垯鏇存柊
+ this.ipAddress = this.currentGateway.getIp_address();
+ SPUtils.put(AUTHENTICATE_IPADDRESS_KEY, ipAddress);
+ }
+ }
}
/**
* 鍒ゆ柇褰撳墠涓婚鏁版嵁鏄惁闇�瑕佸姞瀵�
+ *
* @param topicStr 褰撳墠涓婚
* @return
*/
- public boolean ifNeedEncrypt(String topicStr){
+ public boolean ifNeedEncrypt(String topicStr) {
//杩囨护鐩稿叧闇�瑕佸姞瀵嗙殑涓婚
return (!topicStr.contains(TopicConstant.GATEWAY_AUTH_BROADCAST) //缃戝叧骞挎挱鍏ョ綉鎸囦护
&& !topicStr.contains(TopicConstant.DEIVCE_AUTH_REQUEST) //鍏ョ綉璁よ瘉
@@ -145,10 +166,11 @@
/**
* 鎷兼帴缃戝叧ID鑾峰彇瀹屾暣鐨勪富棰�
+ *
* @param topicStr
* @return
*/
- public String getFullTopic(String topicStr){
+ public String getFullTopic(String topicStr) {
return String.format(topicStr, gatewayId);
}
--
Gitblit v1.8.0