From 936fb552a30c05fc7a60c20f47bf6fccbc2dc1c1 Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期三, 27 十二月 2023 16:17:23 +0800 Subject: [PATCH] 备份一下代码 --- HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/connect/HDLModBusConnect.java | 9 +++++---- 1 files changed, 5 insertions(+), 4 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..47347c1 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,7 +79,7 @@ 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(); @@ -102,6 +102,7 @@ break; } } + EventDispatcher.getInstance().post(topic, modbusResponse); //鍙戝竷Zigbee鍘熺敓涓婚鍙婃暟鎹� // EventDispatcher.getInstance().post(allTopic, modbusResponse); @@ -144,14 +145,14 @@ // request.setCloudTopic(String.format(TopicConstant.NATIVE_MODBUS_DOWN_SLAVE, HDLLinkConfig.getInstance().getGatewayId(), gatewayOidOrGatewayId)); // } request.setReplyTopic("Modbus" + payload[0] + payload[1]); - long timeout = 2 * 1000; + long timeout = 5 * 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 int[]) { if (null != baseCallBack) { - baseCallBack.onSuccess((byte[]) msg); + baseCallBack.onSuccess((int[]) msg); } } else { LogUtils.e("鍙戦�丮odbus鍥炶皟瀵硅薄绫诲瀷闈炴暟缁勭被鍨嬶紝绫诲瀷鏄�" + msg.getClass()); -- Gitblit v1.8.0