提交jar版本

562935844@qq.com

2022-05-13 a3f9e5ce8dce3d86a60a79b85ce44424a612c6fa

 HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/config/HDLLinkConfig.java

@@ -1,24 +1,21 @@
package com.hdl.sdk.connect.config;

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.common.utils.TextUtils;
import com.hdl.sdk.connect.bean.request.AuthenticateRequest;
import com.hdl.sdk.connect.bean.response.GatewaySearchBean;


/**
 * Created by jlchen on 11/11/21.
 * Modify by panlili on 5/7/22
 *
 * @Description : HDLLinkConfig
 */
public class HDLLinkConfig {
    private static final String AUTHENTICATE_LS_KEY = "auth_ls_key";
    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";
    private static String AUTHENTICATE_LS_KEY = "";
    private static String AUTHENTICATE_GATEWAYID_KEY = "";
    private static String AUTHENTICATE_IPADDRESS_KEY = "";

    private String localSecret;//本地加密密钥
    private String gatewayId;
@@ -30,9 +27,9 @@
    /**
     * instance
     */
    private  static final HDLLinkConfig instance=new HDLLinkConfig();
    private HDLLinkConfig()
    {
    private static final HDLLinkConfig instance = new HDLLinkConfig();

    private HDLLinkConfig() {
        loadConfig();
    }

@@ -41,15 +38,7 @@
     *
     * @return AuthenticateConfig
     */
    public static  HDLLinkConfig getInstance() {
//        if (instance == null) {
//            synchronized (HDLLinkConfig.class) {
//                if (instance == null) {
//                    instance = new HDLLinkConfig();
//                    instance.loadConfig();
//                }
//            }
//        }
    public static HDLLinkConfig getInstance() {
        return instance;
    }

@@ -60,19 +49,15 @@
        this.gatewayId = "";
        this.ipAddress = "";
        this.localSecret = "";
        SPUtils.remove(AUTHENTICATE_LS_KEY);
        SPUtils.remove(AUTHENTICATE_GATEWAYID_KEY);
        SPUtils.remove(AUTHENTICATE_IPADDRESS_KEY);
        SPUtils.remove(AUTHENTICATE_IS_LS_KEY);
    }

    /**
     * 加载缓存
     */
    void loadConfig() {
        localSecret = SPUtils.getString(AUTHENTICATE_LS_KEY, "");
        gatewayId = SPUtils.getString(AUTHENTICATE_GATEWAYID_KEY, "");
        ipAddress = SPUtils.getString(AUTHENTICATE_IPADDRESS_KEY, "");
        localSecret = AUTHENTICATE_LS_KEY;
        gatewayId = AUTHENTICATE_GATEWAYID_KEY;
        ipAddress = AUTHENTICATE_IPADDRESS_KEY;
    }

    /**
@@ -86,9 +71,9 @@
        this.localSecret = localSecret;
        this.gatewayId = gatewayId;
        this.ipAddress = ipAddress;
        SPUtils.put(AUTHENTICATE_LS_KEY, localSecret);
        SPUtils.put(AUTHENTICATE_GATEWAYID_KEY, gatewayId);
        SPUtils.put(AUTHENTICATE_IPADDRESS_KEY, ipAddress);
        AUTHENTICATE_LS_KEY = localSecret;
        AUTHENTICATE_GATEWAYID_KEY = gatewayId;
        AUTHENTICATE_IPADDRESS_KEY = ipAddress;
    }

    /**
@@ -112,7 +97,7 @@

    public void setLocalSecret(String localSecret) {
        this.localSecret = localSecret;
        SPUtils.put(AUTHENTICATE_LS_KEY, localSecret);
        AUTHENTICATE_LS_KEY = localSecret;
    }

    public String getLocalSecret() {
@@ -122,14 +107,16 @@
    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;
    }

@@ -143,7 +130,7 @@
            if (!this.ipAddress.equals(this.currentGateway.getIp_address())) {
                //如果IP地址有变化则更新
                this.ipAddress = this.currentGateway.getIp_address();
                SPUtils.put(AUTHENTICATE_IPADDRESS_KEY, ipAddress);
                AUTHENTICATE_IPADDRESS_KEY = ipAddress;
            }
        }
    }