From 1dd75fb35eab53befc522c262b12aca4230172ac Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期五, 30 六月 2023 15:57:53 +0800
Subject: [PATCH] 可以使用
---
HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/connect/HDLModBusConnect.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/connect/HDLModBusConnect.java b/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/connect/HDLModBusConnect.java
index 241fee5..de159e0 100644
--- a/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/connect/HDLModBusConnect.java
+++ b/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/connect/HDLModBusConnect.java
@@ -85,7 +85,8 @@
}
byte []data = linkResponse.getByteData();
ModbusResponse modbusResponse= new ModbusResponse();
- modbusResponse.setTopic("Modbus"+data[0]+data[1]);
+ String topic="Modbus"+data[0]+data[1];
+ modbusResponse.setTopic(topic);
modbusResponse.setData(data);
String oid = null;
//鏄惁鏄�氳繃涓荤綉鍏抽�忎紶涓婚
@@ -102,9 +103,9 @@
break;
}
}
- EventDispatcher.getInstance().post(allTopic, modbusResponse);
+ EventDispatcher.getInstance().post(topic, modbusResponse);
//鍙戝竷Zigbee鍘熺敓涓婚鍙婃暟鎹�
-// EventDispatcher.getInstance().post(allTopic, zigbeeResponse);
+// EventDispatcher.getInstance().post(allTopic, modbusResponse);
}
} catch (Exception e) {
LogUtils.e(TAG,"LinkResponse杞琈odbusResponse寮傚父:"+ e.getMessage());
@@ -113,9 +114,8 @@
};
//娉ㄥ唽鐩存帴閫氳鐨勪富棰橈紝鍖呮嫭鐩存帴鍜屼富缃戝叧閫氳鎴栬�呯洿鎺ュ拰浠庣綉鍏抽�氳
registerListener(String.format(TopicConstant.NATIVE_MODBUS_UP, "+"), eventListener);
- registerListener(String.format(TopicConstant.NATIVE_MODBUS_DOWN_REPLY, "+"), eventListener);
-
- // registerListener(String.format(TopicConstant.NATIVE_ZIGBEE_UP_SLAVE, "+", "+"), eventListener);
+ //registerListener(String.format(TopicConstant.NATIVE_MODBUS_DOWN_REPLY, "+"), eventListener);
+ //registerListener(String.format(TopicConstant.NATIVE_ZIGBEE_UP_SLAVE, "+", "+"), eventListener);
}
/**
@@ -139,18 +139,18 @@
String tempTopic = String.format(TopicConstant.NATIVE_MODBUS_DOWN, gatewayOidOrGatewayId);
LinkRequest request = new LinkRequest(tempTopic, payload, gatewayBean.getIsLocalEncrypt());
- if ("true".equals(gatewayBean.getMaster())) {
+// if ("true".equals(gatewayBean.getMaster())) {
request.setCloudTopic(String.format(TopicConstant.NATIVE_MODBUS_DOWN, HDLLinkConfig.getInstance().getGatewayId()));
- } else {
- request.setCloudTopic(String.format(TopicConstant.NATIVE_MODBUS_DOWN_SLAVE, HDLLinkConfig.getInstance().getGatewayId(), gatewayOidOrGatewayId));
- }
+// } else {
+// request.setCloudTopic(String.format(TopicConstant.NATIVE_MODBUS_DOWN_SLAVE, HDLLinkConfig.getInstance().getGatewayId(), gatewayOidOrGatewayId));
+// }
request.setReplyTopic("Modbus"+payload[0]+payload[1]);
long timeout = 2 * 1000;
new HDLConnectHelper(timeout, 1, gatewayBean.getIp_address(), 8586, request, new HDLConnectHelper.HdlSocketListener() {
@Override
public void onSucceed(Object msg) {
- if (msg instanceof Byte[]) {
+ if (msg instanceof byte[]) {
if (null != baseCallBack) {
baseCallBack.onSuccess((byte[])msg);
}
--
Gitblit v1.8.0