From a3f9e5ce8dce3d86a60a79b85ce44424a612c6fa Mon Sep 17 00:00:00 2001
From: 562935844@qq.com
Date: 星期五, 13 五月 2022 14:06:45 +0800
Subject: [PATCH] 提交jar版本
---
HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/config/HDLLinkConfig.java | 80 ++++++++++++++++++---------------------
1 files changed, 37 insertions(+), 43 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 dd5e830..bc00c48 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
@@ -1,48 +1,44 @@
package com.hdl.sdk.connect.config;
-import android.text.TextUtils;
-
import com.hdl.sdk.common.config.TopicConstant;
-import com.hdl.sdk.common.utils.SPUtils;
+import com.hdl.sdk.common.utils.TextUtils;
+import com.hdl.sdk.connect.bean.request.AuthenticateRequest;
import com.hdl.sdk.connect.bean.response.GatewaySearchBean;
/**
* Created by jlchen on 11/11/21.
+ * Modify by panlili on 5/7/22
*
* @Description : HDLLinkConfig
*/
public class HDLLinkConfig {
- 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 static String AUTHENTICATE_LS_KEY = "";
+ private static String AUTHENTICATE_GATEWAYID_KEY = "";
+ private static String AUTHENTICATE_IPADDRESS_KEY = "";
private String localSecret;//鏈湴鍔犲瘑瀵嗛挜
private String gatewayId;
private String ipAddress;
- private boolean isLocalEncrypt;//缃戝叧鏄惁闇�瑕佸姞瀵嗛�氳
private GatewaySearchBean currentGateway;//褰撳墠缃戝叧
+
+ private AuthenticateRequest.AuthenticateDeviceInfoBean deviceInfoBean;//褰撳墠璁惧鍩烘湰淇℃伅
/**
* 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() {
return instance;
}
@@ -53,21 +49,15 @@
this.gatewayId = "";
this.ipAddress = "";
this.localSecret = "";
- 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, "");
- gatewayId = SPUtils.getString(AUTHENTICATE_GATEWAYID_KEY, "");
- ipAddress = SPUtils.getString(AUTHENTICATE_IPADDRESS_KEY, "");
- isLocalEncrypt = SPUtils.getBoolean(AUTHENTICATE_IS_LS_KEY, false);
+ localSecret = AUTHENTICATE_LS_KEY;
+ gatewayId = AUTHENTICATE_GATEWAYID_KEY;
+ ipAddress = AUTHENTICATE_IPADDRESS_KEY;
}
/**
@@ -81,9 +71,9 @@
this.localSecret = localSecret;
this.gatewayId = gatewayId;
this.ipAddress = ipAddress;
- SPUtils.put(AUTHENTICATE_LS_KEY, localSecret);
- SPUtils.put(AUTHENTICATE_GATEWAYID_KEY, gatewayId);
- SPUtils.put(AUTHENTICATE_IPADDRESS_KEY, ipAddress);
+ AUTHENTICATE_LS_KEY = localSecret;
+ AUTHENTICATE_GATEWAYID_KEY = gatewayId;
+ AUTHENTICATE_IPADDRESS_KEY = ipAddress;
}
/**
@@ -107,7 +97,7 @@
public void setLocalSecret(String localSecret) {
this.localSecret = localSecret;
- SPUtils.put(AUTHENTICATE_LS_KEY, localSecret);
+ AUTHENTICATE_LS_KEY = localSecret;
}
public String getLocalSecret() {
@@ -118,20 +108,16 @@
return gatewayId;
}
+ public void setGatewayId(String gatewayId) {
+ this.gatewayId = gatewayId;
+ }
+
public String getIpAddress() {
return ipAddress;
}
- public void setIpAddress(String ipAddress){
+
+ public void setIpAddress(String ipAddress) {
this.ipAddress = ipAddress;
- }
-
- public boolean isLocalEncrypt() {
- return isLocalEncrypt;
- }
-
- public void setLocalEncrypt(boolean localEncrypt) {
- isLocalEncrypt = localEncrypt;
- SPUtils.put(AUTHENTICATE_IS_LS_KEY, isLocalEncrypt);
}
public GatewaySearchBean getCurrentGateway() {
@@ -144,7 +130,7 @@
if (!this.ipAddress.equals(this.currentGateway.getIp_address())) {
//濡傛灉IP鍦板潃鏈夊彉鍖栧垯鏇存柊
this.ipAddress = this.currentGateway.getIp_address();
- SPUtils.put(AUTHENTICATE_IPADDRESS_KEY, ipAddress);
+ AUTHENTICATE_IPADDRESS_KEY = ipAddress;
}
}
}
@@ -160,7 +146,8 @@
return (!topicStr.contains(TopicConstant.GATEWAY_AUTH_BROADCAST) //缃戝叧骞挎挱鍏ョ綉鎸囦护
&& !topicStr.contains(TopicConstant.DEIVCE_AUTH_REQUEST) //鍏ョ綉璁よ瘉
&& !topicStr.contains(TopicConstant.GATEWAY_SEARCH) //鎼滅储缃戝叧涓婚
- && isLocalEncrypt//鍚敤鍔犲瘑鏍囧織
+ && !topicStr.contains(TopicConstant.BROADCAST)
+ && !TextUtils.isEmpty(localSecret) //鏈夊瘑閽ュ氨鏄姞瀵�
);
}
@@ -174,4 +161,11 @@
return String.format(topicStr, gatewayId);
}
+ public AuthenticateRequest.AuthenticateDeviceInfoBean getDeviceInfoBean() {
+ return deviceInfoBean;
+ }
+
+ public void setDeviceInfoBean(AuthenticateRequest.AuthenticateDeviceInfoBean deviceInfoBean) {
+ this.deviceInfoBean = deviceInfoBean;
+ }
}
--
Gitblit v1.8.0