From 4a209c4c6ef8b4402114ca26b45dd4bbe869190b Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 29 六月 2023 15:31:36 +0800
Subject: [PATCH] 2023年06月29日15:31:33
---
HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/gateway/HDLLinkLocalGateway.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/gateway/HDLLinkLocalGateway.java b/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/gateway/HDLLinkLocalGateway.java
index d7b6668..1f50858 100644
--- a/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/gateway/HDLLinkLocalGateway.java
+++ b/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/gateway/HDLLinkLocalGateway.java
@@ -716,25 +716,26 @@
/**
* 鍙戦�佹暟鎹埌Link缃戝叧
*
- * @param ip 缃戝叧IP
* @param mac 缃戝叧mac
* @param isEncrypt 鏄惁鍔犲瘑
* @param topic 璇锋眰涓婚
* @param jObject 璐熻浇鏁版嵁<娌℃湁濉玭ull></>
* @param sendPath 鍙戦�佽矾寰�<绫诲悕+鏂规硶鍚�>class->methodName</>
*/
- public void sendDataToLinkGateway(String ip, String mac, boolean isEncrypt,
+ public void sendDataToLinkGateway(String mac, boolean isEncrypt,
String topic, Object jObject, String sendPath, HDLLinkCallBack callBack) {
- String topicSend = topic.replace("%s", mac);
+ GatewayBean gatewayBean = this.getLocalGateway(mac);
+ if (gatewayBean == null) {
+ callBack.onError(HDLLinkException.getErrorWithCode(hdlLinkCode));
+ return;
+ }
+ String topicSend = topic.replace("%s", gatewayBean.getOid());
//缁勮闇�瑕佸彂閫佺殑鏁版嵁
String sendStr = createSendData(jObject);
// LogUtils.i("sendDataToLinkGateway->" + sendPath + "->鏈湴鍙戦�乗r\n" + topicSend + "\r\n" + sendStr);
LinkRequest message = new LinkRequest(topicSend, sendStr, isEncrypt);
- GatewayBean gatewayBean = this.getLocalGateway(mac);
- if (gatewayBean != null) {
- message.setCloudTopic(topic.replace("%s", gatewayBean.getGatewayId()));
- }
- new HDLConnectHelper(ip, message, new HDLConnectHelper.HdlSocketListener() {
+ 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;
--
Gitblit v1.8.0