上报oid列表新增parentoid

562935844@qq.com

2023-10-18 c1e8d3a7709295a52814378e73a68e1e1fd20da6

上报oid列表新增parentoid

 HDLSDK/com.hdl.sdk/build.gradle

@@ -8,8 +8,8 @@
    defaultConfig {
        minSdkVersion rootProject.minSdkVersion
        targetSdkVersion rootProject.targetSdkVersion
        versionCode 116
        versionName "1.1.6"
        versionCode 117
        versionName "1.1.7"
    }
    buildTypes {
        debug {

 HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/common/HDLSdk.java

@@ -35,7 +35,7 @@
        return version;
    }

    private String version = "1.1.6";
    private String version = "1.1.7";

    private HDLSdk() {
    }

 HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/HDLLink.java

@@ -120,6 +120,10 @@
        HDLLinkConfig.getInstance().setNetworkName(networkName);
    }

    public String getParentOid() {
        return HDLLinkConfig.getInstance().getParentOid();
    }

    /**
     * 开始监听和发起入网及认证请求
     *
@@ -324,8 +328,8 @@
    /**
     * 上报sid列表
     *
     * @param requestList  sid列表
     * @param callBack 回调
     * @param requestList sid列表
     * @param callBack    回调
     */
    public void UploadSidList(List<ListSidRequest> requestList, HDLLinkCallBack callBack) {
        HDLSocket.getInstance().UploadSidList(requestList, callBack);

 HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/request/ListUploadRequest.java

@@ -18,6 +18,7 @@
    private String src;//来自哪个驱动，如Link设备没有则填"LINK"
    private String from;//来自哪个网关，如果时Link网络设备，则填自身oid；如果是驱动则不需要此字段
    private List<ImageInfo> image_info;
    private String parentOid;

    public String getOid() {
        return oid;
@@ -83,6 +84,14 @@
        this.from = from;
    }

    public String getParentOid() {
        return parentOid;
    }

    public void setParentOid(String parentOid) {
        this.parentOid = parentOid;
    }

    public List<ImageInfo> getImage_info() {
        return image_info;
    }

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

@@ -22,6 +22,7 @@
    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;
@@ -29,6 +30,7 @@
    private GatewaySearchBean currentGateway;//当前网关
    private String networkName;
    private String homeId;
    private String parentOid;

    private AuthenticateRequest.AuthenticateDeviceInfoBean deviceInfoBean;//当前设备基本信息
    private AuthenticateRequest.RequestBean requestBean;//当前设备基本信息
@@ -73,6 +75,7 @@
        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, "");
    }

    /**
@@ -145,6 +149,15 @@
        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;
    }

 HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/socket/HDLAuthSocket.java

@@ -162,6 +162,9 @@
                        //移除监听
                        EventDispatcher.getInstance().remove(TopicConstant.GATEWAY_AUTH_BROADCAST);
                        HDLLinkConfig.getInstance().setIpAddress(bean.getIPAddress());
                        if (!TextUtils.isEmpty(bean.getOID())) {
                            HDLLinkConfig.getInstance().setParentOid(bean.getOID());
                        }
                        String ipStr = bean.getIPAddress();
                        if (!TextUtils.isEmpty(ipStr)) {
                            sendAuthenticateRequest(ipStr, request, callBack);

 HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/socket/HDLSocket.java

@@ -662,6 +662,11 @@
            data.setId(IdUtils.getUUId());

            data.setTime_stamp(time);



            //2023.10.18修改，上报oid列表增加parentOid

            if (request!=null && !TextUtils.isEmpty(HDLLinkConfig.getInstance().getParentOid())) {

                request.setParentOid(HDLLinkConfig.getInstance().getParentOid());

            }



            List<ListUploadRequest> list = new ArrayList<>();

            list.add(request);