From ddd686a24cf45ca91aebcaf07c5b2b347b0cd455 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期一, 06 十一月 2023 16:37:44 +0800
Subject: [PATCH] 2023年11月06日16:37:26
---
HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/utils/QueueUtils.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 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 f9233b6..1aac1f7 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
@@ -10,6 +10,7 @@
import java.io.UnsupportedEncodingException;
import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
import java.util.LinkedList;
import java.util.Queue;
import java.util.concurrent.ExecutorService;
@@ -110,16 +111,23 @@
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("瑙ｅ瘑澶辫触\r\n" + linkPacket.getTopic() + "\r\n" + ByteUtils.encodeHexString(linkPacket.getBody()));
- response.setData(new String(linkPacket.getBody(), "utf-8"));
+ response.setData(new String(linkPacket.getBody(), StandardCharsets.UTF_8));
+ response.setByteData(linkPacket.getBody());
}
} else {
- response.setData(new String(linkPacket.getBody(), "utf-8"));
+ response.setData(new String(linkPacket.getBody(), StandardCharsets.UTF_8));
+ response.setByteData(linkPacket.getBody());
}
- response.setByteData(linkPacket.getBody());
+
if (HDLConnectHelper.isLocal()) {
- LogUtils.i("鏈湴鎺ユ敹鍒版暟鎹�:\r\n" + response.getTopic() + "\r\n" + response.getData());
+ if (HDLConnectHelper.isInverterTopic(response.getTopic())) {
+ LogUtils.i("鏈湴鎺ユ敹鍒版暟鎹�:\r\n" + response.getTopic() + "\r\n" + Arrays.toString(HDLConnectHelper.byteArrayConvertIntArray(response.getByteData())));
+ } else {
+ LogUtils.i("鏈湴鎺ユ敹鍒版暟鎹�:\r\n" + response.getTopic() + "\r\n" + response.getData());
+ }
}
//瑙ｆ瀽瀹屾垚,topic鍙戦�佷竴娆�
EventDispatcher.getInstance().post(response.getTopic(), response);
--
Gitblit v1.8.0