From fdcf461fbfa3bcd650685743e891ad3357898f0c Mon Sep 17 00:00:00 2001
From: 562935844@qq.com
Date: 星期四, 31 八月 2023 17:36:50 +0800
Subject: [PATCH] 更新sdk
---
HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/config/HDLLinkConfig.java | 94 +++++++++++++++++++++++++++++++++++-----------
1 files changed, 71 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 5fb4298..5ccf25d 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,7 +3,9 @@
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;
@@ -17,32 +19,41 @@
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";
+ public static final String AUTHENTICATE_IS_DEVICEINFO_KEY = "auth_deviceinfo_key";
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;
}
@@ -53,7 +64,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);
@@ -67,7 +77,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);
}
/**
@@ -87,15 +96,23 @@
}
/**
+ * 閲嶆柊淇濆瓨
+ */
+ public void reSaveConfig() {
+ this.saveConfig(this.localSecret, this.gatewayId, this.ipAddress);
+ }
+
+ /**
* 妫�娴嬫槸鍚﹀凡缁忚璇佽繃
*
* @return
*/
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) {
@@ -110,18 +127,23 @@
public String getGatewayId() {
return gatewayId;
}
+ public void setGatewayId(String gatewayId) {
+ this.gatewayId=gatewayId;
+ }
public String getIpAddress() {
return ipAddress;
}
-
- public boolean isLocalEncrypt() {
- return isLocalEncrypt;
+ public void setIpAddress(String ipAddress){
+ this.ipAddress = ipAddress;
}
- public void setLocalEncrypt(boolean localEncrypt) {
- isLocalEncrypt = localEncrypt;
- SPUtils.put(AUTHENTICATE_IS_LS_KEY, isLocalEncrypt);
+ public String getNetworkName() {
+ return networkName;
+ }
+
+ public void setNetworkName(String networkName) {
+ this.networkName = networkName;
}
public GatewaySearchBean getCurrentGateway() {
@@ -150,7 +172,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) //鏈夊瘑閽ュ氨鏄姞瀵�
);
}
@@ -164,4 +187,29 @@
return String.format(topicStr, gatewayId);
}
+ public AuthenticateRequest.AuthenticateDeviceInfoBean getDeviceInfoBean() {
+ AuthenticateRequest.AuthenticateDeviceInfoBean infoBean = (AuthenticateRequest.AuthenticateDeviceInfoBean) SPUtils.getSerializableEntity(AUTHENTICATE_IS_DEVICEINFO_KEY);
+ return infoBean;
+ }
+
+ public void setDeviceInfoBean(AuthenticateRequest.AuthenticateDeviceInfoBean deviceInfoBean) {
+ this.deviceInfoBean = deviceInfoBean;
+ SPUtils.saveSerializableEntity(AUTHENTICATE_IS_DEVICEINFO_KEY, 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