Merge branch 'master' into wjc

wjc

2023-08-21 0a18a8180bc6040c941b07df1be1f7b726b4c155

 HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/connect/HDLConnectHelper.java

@@ -12,6 +12,7 @@
import com.hdl.sdk.link.common.utils.ThreadToolUtils;

import com.hdl.sdk.link.core.bean.LinkRequest;

import com.hdl.sdk.link.core.bean.LinkResponse;

import com.hdl.sdk.link.core.bean.ModbusResponse;

import com.hdl.sdk.link.core.bean.ZigbeeResponse;

import com.hdl.sdk.link.core.bean.gateway.GatewayBean;

import com.hdl.sdk.link.core.config.HDLLinkConfig;

@@ -126,6 +127,14 @@
                        else{

                            notifyFailure(HDLLinkCode.HDL_TOPIC_NOT_RIGHT);

                        }

                    }else if(msg instanceof ModbusResponse){

                        ModbusResponse response = (ModbusResponse) msg;

                        if (replyTopic.equals(response.getTopic())) {

                            notifySucceed(response.getData());

                        }

                        else{

                            notifyFailure(HDLLinkCode.HDL_TOPIC_NOT_RIGHT);

                        }

                    }

                    else{

                        notifyFailure(new HDLLinkCode(HDLLinkCode.HDL_OBJECT_NOT_SUPPORT.getCode(), "Object Name:" + msg));