From d1bb52748505caa0c9bd9c71c4c91c1afba73847 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期五, 30 六月 2023 18:11:05 +0800
Subject: [PATCH] 2023年06月30日18:11:01
---
HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/gateway/HDLLinkLocalGateway.java | 48 +++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 47 insertions(+), 1 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 2f19257..8e9d490 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
@@ -158,7 +158,8 @@
}
for (GatewayBean gatewayBean : this.getGatewayList()) {
if (macAndSid.equals(gatewayBean.getDevice_mac())
- || macAndSid.equals(gatewayBean.getSid())) {
+ || macAndSid.equals(gatewayBean.getSid())
+ || macAndSid.equals(gatewayBean.getOid())) {
return gatewayBean;
}
}
@@ -760,6 +761,51 @@
}
/**
+ * 鍙戦�佹暟鎹埌Link缃戝叧
+ *
+ * @param mac 缃戝叧mac
+ * @param topic 璇锋眰涓婚
+ * @param jObject 璐熻浇鏁版嵁<娌℃湁濉玭ull></>
+ * @param sendPath 鍙戦�佽矾寰�<绫诲悕+鏂规硶鍚�>class->methodName</>
+ */
+ public void sendDataToLinkGateway(String mac,
+ String topic, Object jObject, String sendPath, HDLLinkCallBack callBack) {
+ GatewayBean gatewayBean = this.getLocalGateway(mac);
+ if (gatewayBean == null) {
+ callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_GATEWAY_FOUND_LOCALLY));
+ 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, gatewayBean.getIsLocalEncrypt());
+ 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"));
+ }
+ } catch (Exception e) {
+ callBack.onSuccess(e.getMessage());
+ }
+// LogUtils.i("sendDataToLinkGateway->"+sendPath+"->鏈湴鎺ユ敹鏁版嵁\r\n"+msg.toString());
+ }
+
+ @Override
+ public void onFailure(HDLLinkCode hdlLinkCode) {
+ if (callBack == null) return;
+ callBack.onError(HDLLinkException.getErrorWithCode(hdlLinkCode));
+// LogUtils.i("sendDataToLinkGateway->" + sendPath + "->鏈湴鎺ユ敹鏁版嵁->澶辫触(-200)");
+ }
+ }, true, mac).send();
+ }
+
+ /**
* 缁勮闇�瑕佸彂閫佺殑鏁版嵁
*
* @param jObject 璐熻浇鏁版嵁<娌℃湁濉玭ull>
--
Gitblit v1.8.0