From b9cc7390e8e8ce64c41c26fb369c98ce669d660c Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 07 五月 2025 15:02:30 +0800
Subject: [PATCH] Merge branch '1.2.0'
---
sdk/src/main/java/com/hdl/sdk/link/gateway/HDLLinkLocalGateway.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/sdk/src/main/java/com/hdl/sdk/link/gateway/HDLLinkLocalGateway.java b/sdk/src/main/java/com/hdl/sdk/link/gateway/HDLLinkLocalGateway.java
index 8b63103..eafd433 100644
--- a/sdk/src/main/java/com/hdl/sdk/link/gateway/HDLLinkLocalGateway.java
+++ b/sdk/src/main/java/com/hdl/sdk/link/gateway/HDLLinkLocalGateway.java
@@ -1178,21 +1178,23 @@
callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_GATEWAY_NOT_EXIST));
return;
}
- String topicSend = topic.replace("%s", gatewayBean.getOid());
+ String topicSend = topic.replace("%s", gatewayBean.getDevice_mac());
//缁勮闇�瑕佸彂閫佺殑鏁版嵁
String sendStr = createSendData(jObject);
-// LogUtils.i("sendDataToLinkGateway->" + sendPath + "->鏈湴鍙戦�乗r\n" + topicSend + "\r\n" + sendStr);
- LinkRequest message = new LinkRequest(topicSend, sendStr, HDLLinkConfig.getInstance().isLocalEncrypt());
+// LogUtils.i("鏈湴鍙戦�乵ac---->"+mac);
+ LinkRequest message = new LinkRequest(topicSend, sendStr, gatewayBean.isLocalEncrypt());
message.setCloudTopic(topic.replace("%s", gatewayBean.getGatewayId()));
new HDLConnectHelper(gatewayBean.getIp_address(), message, new HDLConnectHelper.HdlSocketListener() {
@Override
public void onSucceed(Object msg) {
+
if (callBack == null) return;
try {
JSONObject jsonObject = new JSONObject(new Gson().toJson(msg));
if (jsonObject.has("data")) {
callBack.onSuccess(jsonObject.getString("data"));
}
+// LogUtils.i("鏈湴鍙戦�乵ac鎺ユ敹鏁版嵁---->"+jsonObject.getString("data"));
} catch (Exception e) {
callBack.onSuccess(e.getMessage());
}
--
Gitblit v1.8.0