From c1e8d3a7709295a52814378e73a68e1e1fd20da6 Mon Sep 17 00:00:00 2001
From: 562935844@qq.com
Date: 星期三, 18 十月 2023 16:47:40 +0800
Subject: [PATCH] 上报oid列表新增parentoid

---
 HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/config/HDLLinkConfig.java |   71 +++++++++++++++++++++++++++++++++--
 1 files changed, 67 insertions(+), 4 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 bfe3d60..006fd97 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
@@ -19,13 +19,22 @@
     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";
+
+    public static final String GATEWAY_REMOTEINFO_KEY="gateway_remoteinfo_key";
+    private static final String GATEWAY_PARENTOID_KEY = "gateway_parentoiid_key";
 
     private String localSecret;//鏈湴鍔犲瘑瀵嗛挜
     private String gatewayId;
     private String ipAddress;
     private GatewaySearchBean currentGateway;//褰撳墠缃戝叧
+    private String networkName;
+    private String homeId;
+    private String parentOid;
 
     private AuthenticateRequest.AuthenticateDeviceInfoBean deviceInfoBean;//褰撳墠璁惧鍩烘湰淇℃伅
+    private AuthenticateRequest.RequestBean requestBean;//褰撳墠璁惧鍩烘湰淇℃伅
+    private AuthenticateRequest.AuthBean authBean;//褰撳墠璁惧璁よ瘉淇℃伅
 
     /**
      * instance
@@ -60,10 +69,13 @@
         this.gatewayId = "";
         this.ipAddress = "";
         this.localSecret = "";
+        this.homeId="";
         SPUtils.remove(AUTHENTICATE_LS_KEY);
         SPUtils.remove(AUTHENTICATE_GATEWAYID_KEY);
         SPUtils.remove(AUTHENTICATE_IPADDRESS_KEY);
         SPUtils.remove(AUTHENTICATE_IS_LS_KEY);
+        SPUtils.remove(GATEWAY_REMOTEINFO_KEY);
+        SPUtils.remove(GATEWAY_PARENTOID_KEY);
     }
 
     /**
@@ -73,6 +85,8 @@
         localSecret = SPUtils.getString(AUTHENTICATE_LS_KEY, "");
         gatewayId = SPUtils.getString(AUTHENTICATE_GATEWAYID_KEY, "");
         ipAddress = SPUtils.getString(AUTHENTICATE_IPADDRESS_KEY, "");
+        homeId = SPUtils.getString(GATEWAY_REMOTEINFO_KEY, "");
+        parentOid = SPUtils.getString(GATEWAY_PARENTOID_KEY, "");
     }
 
     /**
@@ -89,6 +103,7 @@
         SPUtils.put(AUTHENTICATE_LS_KEY, localSecret);
         SPUtils.put(AUTHENTICATE_GATEWAYID_KEY, gatewayId);
         SPUtils.put(AUTHENTICATE_IPADDRESS_KEY, ipAddress);
+
     }
 
     /**
@@ -105,9 +120,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) {
@@ -131,6 +147,23 @@
     }
     public void setIpAddress(String ipAddress){
         this.ipAddress = ipAddress;
+    }
+
+    public String getParentOid() {
+        return parentOid;
+    }
+
+    public void setParentOid(String parentOid) {
+        this.parentOid = parentOid;
+        SPUtils.put(GATEWAY_PARENTOID_KEY, parentOid);
+    }
+
+    public String getNetworkName() {
+        return networkName;
+    }
+
+    public void setNetworkName(String networkName) {
+        this.networkName = networkName;
     }
 
     public GatewaySearchBean getCurrentGateway() {
@@ -175,10 +208,40 @@
     }
 
     public AuthenticateRequest.AuthenticateDeviceInfoBean getDeviceInfoBean() {
-        return deviceInfoBean;
+        AuthenticateRequest.AuthenticateDeviceInfoBean infoBean = (AuthenticateRequest.AuthenticateDeviceInfoBean) SPUtils.getSerializableEntity(AUTHENTICATE_IS_DEVICEINFO_KEY);
+        if(infoBean==null){
+            infoBean= new AuthenticateRequest.AuthenticateDeviceInfoBean();
+        }
+        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;
+    }
+
+    public String getHomeId() {
+        return homeId;
+    }
+
+    public void setHomeId(String homeId) {
+        this.homeId = homeId;
+        SPUtils.put(GATEWAY_REMOTEINFO_KEY, homeId);
     }
 }

--
Gitblit v1.8.0