上报oid列表新增parentoid

562935844@qq.com

2023-10-18 c1e8d3a7709295a52814378e73a68e1e1fd20da6

 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);



@@ -701,8 +706,8 @@
    /**

     * 上报Sid列表

     *

     * @param requestList  sid列表

     * @param callBack 回调

     * @param requestList sid列表

     * @param callBack    回调

     */

    public void UploadSidList(List<ListSidRequest> requestList, HDLLinkCallBack callBack) {

        if (!TextUtils.isEmpty(getGatewayId()) && !TextUtils.isEmpty(getTcpIp())) {

@@ -949,14 +954,13 @@
//        String replyTopic = topic + "_reply";



        try {

            sendMsg(message.getSendBytes(), topic, callBack, new SendListener() {

            sendMsg(message.getSendBytes(), topic, null, new SendListener() {

                @Override

                public void onSucceed() {

                    HDLLinkConfig.getInstance().clearConfig();

                    if (callBack == null) return;

                    try {

                        callBack.onSuccess("退网成功");

                        HDLLinkConfig.getInstance().clearConfig();



                    } catch (Exception e) {

                        callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_DATA_ERROR));

                    }

@@ -995,7 +999,11 @@
    public void tcpSendMsg(String topic, String bodyStr, HDLLinkCallBack callBack) {

        try {

            LinkRequest message = new LinkRequest(topic, bodyStr);

            if (topic != null && topic.endsWith("_reply")) {

                callBack = null;

            }

            String replyTopic = topic + "_reply";

            HDLLinkCallBack finalCallBack = callBack;

            sendMsg(message.getSendBytes(), replyTopic, callBack, new SendListener() {

                @Override

                public void onSucceed() {

@@ -1004,8 +1012,8 @@


                @Override

                public void onError() {

                    if (callBack != null) {

                        callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_SEND_ERROR));

                    if (finalCallBack != null) {

                        finalCallBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_SEND_ERROR));

                    }

                }

            });

@@ -1116,8 +1124,9 @@


    /**

     * 回复网关配置命令

     *

     * @param mac_Oid_GatewayId

     * @param msgId 消息Id

     * @param msgId             消息Id

     * @param callBack

     */

    public void gatewayRemoteEditReply(String mac_Oid_GatewayId, String msgId, HDLLinkCallBack callBack) {

@@ -1135,7 +1144,6 @@
        String topic = String.format(TopicConstant.GATEWAY_EDIT_REMOTE_REPLY, mac_Oid_GatewayId);

        LinkRequest message = new LinkRequest(topic,

                GsonConvert.getGson().toJson(data));







        try {