From b77dc026ffd21dba8652d28409c51e27d3e5a76c Mon Sep 17 00:00:00 2001
From: 562935844@qq.com
Date: 星期四, 31 八月 2023 09:21:06 +0800
Subject: [PATCH] 更新sdk

---
 HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/config/HDLLinkConfig.java |   58 +++++++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 45 insertions(+), 13 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 a21c26c..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
@@ -24,28 +24,35 @@
     private String gatewayId;
     private String ipAddress;
     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;
     }
 
@@ -101,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) {
@@ -127,6 +135,14 @@
     }
     public void setIpAddress(String ipAddress){
         this.ipAddress = ipAddress;
+    }
+
+    public String getNetworkName() {
+        return networkName;
+    }
+
+    public void setNetworkName(String networkName) {
+        this.networkName = networkName;
     }
 
     public GatewaySearchBean getCurrentGateway() {
@@ -177,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