From 116def783f85af5896fc4500bc8a690d8b1eb5f3 Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期六, 23 九月 2023 14:46:27 +0800 Subject: [PATCH] Merge branch 'wjc' of http://59.41.255.150:6688/r/~wjc/HDLPhotovoltaicDebugAPP into wjc --- HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/utils/QueueUtils.java | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/utils/QueueUtils.java b/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/utils/QueueUtils.java index 2d0e0ea..2dddfd4 100644 --- a/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/utils/QueueUtils.java +++ b/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/utils/QueueUtils.java @@ -110,14 +110,17 @@ byte[] bodyBytes = AesUtil.aesDecrypt(linkPacket.getBody(), HDLLinkConfig.getInstance().getLocalSecret()); if (bodyBytes != null) { response.setData(new String(bodyBytes, StandardCharsets.UTF_8)); + response.setByteData(bodyBytes); } else { LogUtils.e("瑙e瘑澶辫触\r\n" + linkPacket.getTopic() + "\r\n" + ByteUtils.encodeHexString(linkPacket.getBody())); response.setData(new String(linkPacket.getBody(), "utf-8")); + response.setByteData(linkPacket.getBody()); } } else { response.setData(new String(linkPacket.getBody(), "utf-8")); + response.setByteData(linkPacket.getBody()); } - response.setByteData(linkPacket.getBody()); + // if (HDLConnectHelper.isLocal()) { LogUtils.i("鏈湴鎺ユ敹鍒版暟鎹�:\r\n" + response.getTopic() + "\r\n" + response.getData()); // } -- Gitblit v1.8.0