panlili2024
2025-03-05 134209ad70f82051da3ce63471df0cc8f778e57d
HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/config/HDLLinkConfig.java
@@ -21,7 +21,8 @@
    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";
    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;
@@ -29,6 +30,7 @@
    private GatewaySearchBean currentGateway;//当前网关
    private String networkName;
    private String homeId;
    private String parentOid;
    private AuthenticateRequest.AuthenticateDeviceInfoBean deviceInfoBean;//当前设备基本信息
    private AuthenticateRequest.RequestBean requestBean;//当前设备基本信息
@@ -37,9 +39,9 @@
    /**
     * instance
     */
    private  static final HDLLinkConfig instance=new HDLLinkConfig();
    private HDLLinkConfig()
    {
    private static final HDLLinkConfig instance = new HDLLinkConfig();
    private HDLLinkConfig() {
        loadConfig();
    }
@@ -48,7 +50,7 @@
     *
     * @return AuthenticateConfig
     */
    public static  HDLLinkConfig getInstance() {
    public static HDLLinkConfig getInstance() {
//        if (instance == null) {
//            synchronized (HDLLinkConfig.class) {
//                if (instance == null) {
@@ -67,12 +69,13 @@
        this.gatewayId = "";
        this.ipAddress = "";
        this.localSecret = "";
        this.homeId="";
        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);
    }
    /**
@@ -83,6 +86,7 @@
        gatewayId = SPUtils.getString(AUTHENTICATE_GATEWAYID_KEY, "");
        ipAddress = SPUtils.getString(AUTHENTICATE_IPADDRESS_KEY, "");
        homeId = SPUtils.getString(GATEWAY_REMOTEINFO_KEY, "");
        parentOid = SPUtils.getString(GATEWAY_PARENTOID_KEY, "");
    }
    /**
@@ -134,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() {
@@ -196,8 +211,8 @@
    public AuthenticateRequest.AuthenticateDeviceInfoBean getDeviceInfoBean() {
        AuthenticateRequest.AuthenticateDeviceInfoBean infoBean = (AuthenticateRequest.AuthenticateDeviceInfoBean) SPUtils.getSerializableEntity(AUTHENTICATE_IS_DEVICEINFO_KEY);
        if(infoBean==null){
            infoBean= new AuthenticateRequest.AuthenticateDeviceInfoBean();
        if (infoBean == null) {
            infoBean = new AuthenticateRequest.AuthenticateDeviceInfoBean();
        }
        return infoBean;
    }