From a4246a571c78ac6c46e7bf7dbfc123b7148caed8 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 16 十一月 2021 13:43:48 +0800
Subject: [PATCH] 2021-11-16 1.更新
---
HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/config/HDLLinkConfig.java | 40 ++++++++++++++++++++++++++++++++--------
1 files changed, 32 insertions(+), 8 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..a212728 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.response.GatewaySearchBean;
/**
@@ -12,14 +13,16 @@
* @Description : HDLLinkConfig
*/
public class HDLLinkConfig {
- private static final String Authenticate_LS_KEY = "auth_ls_key";
+ private static final String AUTHENTICATE_LS_KEY = "auth_ls_key";
private static final String AUTHENTICATE_GATEWAYID_KEY = "auth_gatewayid_key";
private static final String AUTHENTICATE_IPADDRESS_KEY = "auth_ipaddress_key";
+ private static final String AUTHENTICATE_IS_LS_KEY = "auth_isls_key";
private String localSecret;//鏈湴鍔犲瘑瀵嗛挜
private String gatewayId;
private String ipAddress;
private boolean isLocalEncrypt;//缃戝叧鏄惁闇�瑕佸姞瀵嗛�氳
+ private GatewaySearchBean currentGateway;//褰撳墠缃戝叧
/**
* instance
@@ -49,18 +52,21 @@
this.gatewayId = "";
this.ipAddress = "";
this.localSecret = "";
- SPUtils.remove(Authenticate_LS_KEY);
+ this.isLocalEncrypt = false;
+ SPUtils.remove(AUTHENTICATE_LS_KEY);
SPUtils.remove(AUTHENTICATE_GATEWAYID_KEY);
SPUtils.remove(AUTHENTICATE_IPADDRESS_KEY);
+ SPUtils.remove(AUTHENTICATE_IS_LS_KEY);
}
/**
* 鍔犺浇缂撳瓨
*/
void loadConfig(){
- localSecret = SPUtils.getString(Authenticate_LS_KEY, "");
+ 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);
}
/**
@@ -73,7 +79,7 @@
this.localSecret = localSecret;
this.gatewayId = gatewayId;
this.ipAddress = ipAddress;
- SPUtils.put(Authenticate_LS_KEY, localSecret);
+ SPUtils.put(AUTHENTICATE_LS_KEY, localSecret);
SPUtils.put(AUTHENTICATE_GATEWAYID_KEY, gatewayId);
SPUtils.put(AUTHENTICATE_IPADDRESS_KEY, ipAddress);
}
@@ -83,13 +89,15 @@
* @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) {
this.localSecret = localSecret;
- SPUtils.put(Authenticate_LS_KEY, localSecret);
+ SPUtils.put(AUTHENTICATE_LS_KEY, localSecret);
}
public String getLocalSecret() {
@@ -110,6 +118,15 @@
public void setLocalEncrypt(boolean localEncrypt) {
isLocalEncrypt = localEncrypt;
+ SPUtils.put(AUTHENTICATE_IS_LS_KEY, isLocalEncrypt);
+ }
+
+ public GatewaySearchBean getCurrentGateway() {
+ return currentGateway;
+ }
+
+ public void setCurrentGateway(GatewaySearchBean currentGateway) {
+ this.currentGateway = currentGateway;
}
/**
@@ -126,6 +143,13 @@
);
}
-
+ /**
+ * 鎷兼帴缃戝叧ID鑾峰彇瀹屾暣鐨勪富棰�
+ * @param topicStr
+ * @return
+ */
+ public String getFullTopic(String topicStr){
+ return String.format(topicStr, gatewayId);
+ }
}
--
Gitblit v1.8.0