From 0a18a8180bc6040c941b07df1be1f7b726b4c155 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 21 八月 2023 14:19:26 +0800
Subject: [PATCH] Merge branch 'master' into wjc
---
HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/connect/HDLModBusConnect.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 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 addf469..d212f28 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
@@ -79,11 +79,13 @@
try {
if (msg instanceof LinkResponse) {
LinkResponse linkResponse = (LinkResponse) msg;
- if (linkResponse.getTopic() == null || !linkResponse.getTopic().contains("custom/native/inverter/")) {
+ if (linkResponse.getTopic() == null || !linkResponse.getTopic().contains("custom/native/inverter/up")) {
return;
}
byte[] data = linkResponse.getByteData();
ModbusResponse modbusResponse = new ModbusResponse();
+ int a=data[0]&0xff;
+ int b=data[1]&0xff;
String topic = "Modbus" + data[0] + data[1];
modbusResponse.setTopic(topic);
modbusResponse.setData(data);
@@ -102,6 +104,7 @@
break;
}
}
+
EventDispatcher.getInstance().post(topic, modbusResponse);
//鍙戝竷Zigbee鍘熺敓涓婚鍙婃暟鎹�
// EventDispatcher.getInstance().post(allTopic, modbusResponse);
@@ -149,9 +152,9 @@
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 int[]) {
if (null != baseCallBack) {
- baseCallBack.onSuccess((byte[]) msg);
+ baseCallBack.onSuccess((int[]) msg);
}
} else {
LogUtils.e("鍙戦�丮odbus鍥炶皟瀵硅薄绫诲瀷闈炴暟缁勭被鍨嬶紝绫诲瀷鏄�" + msg.getClass());
--
Gitblit v1.8.0