From dcb7088c2dca789074f8f48597dca3c55f3ab6f1 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 01 二月 2024 19:37:09 +0800
Subject: [PATCH] 2024年02月01日19:37:00

---
 HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/utils/QueueUtils.java |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 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..33f8ccc 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("瑙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 (!linkPacket.isCloudPacket()) {
+            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());
+            }
         }
         //瑙f瀽瀹屾垚,topic鍙戦�佷竴娆�
         EventDispatcher.getInstance().post(response.getTopic(), response);

--
Gitblit v1.8.0