From 134209ad70f82051da3ce63471df0cc8f778e57d Mon Sep 17 00:00:00 2001 From: panlili2024 <14743743+panlili2024@user.noreply.gitee.com> Date: 星期三, 05 三月 2025 14:30:19 +0800 Subject: [PATCH] 增加source屏扫码绑定住宅接口 --- HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/config/HDLLinkConfig.java | 51 ++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 44 insertions(+), 7 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 7b8c005..892b6e6 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,12 +19,18 @@ 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;//褰撳墠璁惧鍩烘湰淇℃伅 @@ -33,9 +39,9 @@ /** * instance */ - private static final HDLLinkConfig instance=new HDLLinkConfig(); - private HDLLinkConfig() - { + private static final HDLLinkConfig instance = new HDLLinkConfig(); + + private HDLLinkConfig() { loadConfig(); } @@ -44,7 +50,7 @@ * * @return AuthenticateConfig */ - public static HDLLinkConfig getInstance() { + public static HDLLinkConfig getInstance() { // if (instance == null) { // synchronized (HDLLinkConfig.class) { // if (instance == null) { @@ -63,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); } /** @@ -76,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, ""); } /** @@ -92,6 +103,7 @@ SPUtils.put(AUTHENTICATE_LS_KEY, localSecret); SPUtils.put(AUTHENTICATE_GATEWAYID_KEY, gatewayId); SPUtils.put(AUTHENTICATE_IPADDRESS_KEY, ipAddress); + } /** @@ -126,15 +138,26 @@ public String getGatewayId() { return gatewayId; } + public void setGatewayId(String gatewayId) { - this.gatewayId=gatewayId; + this.gatewayId = gatewayId; } public String getIpAddress() { return ipAddress; } - public void setIpAddress(String ipAddress){ + + 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() { @@ -187,11 +210,16 @@ } 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() { @@ -209,4 +237,13 @@ 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