From 3b47201d878ba8ff973b84baf15942475688e964 Mon Sep 17 00:00:00 2001 From: hxb <hxb@hdlchina.com.cn> Date: 星期五, 15 十二月 2023 16:04:28 +0800 Subject: [PATCH] 合并第一个版本 --- HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/utils/QueueUtils.java | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 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 1aac1f7..b4c04e5 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 @@ -114,13 +114,14 @@ response.setByteData(bodyBytes); } else { LogUtils.e("瑙e瘑澶辫触\r\n" + linkPacket.getTopic() + "\r\n" + ByteUtils.encodeHexString(linkPacket.getBody())); - response.setData(new String(linkPacket.getBody(), StandardCharsets.UTF_8)); response.setByteData(linkPacket.getBody()); + response.setData(new String(linkPacket.getBody(), "utf-8")); } } else { - response.setData(new String(linkPacket.getBody(), StandardCharsets.UTF_8)); response.setByteData(linkPacket.getBody()); + response.setData(new String(linkPacket.getBody(), "utf-8")); } + if (HDLConnectHelper.isLocal()) { if (HDLConnectHelper.isInverterTopic(response.getTopic())) { @@ -128,6 +129,20 @@ } else { LogUtils.i("鏈湴鎺ユ敹鍒版暟鎹�:\r\n" + response.getTopic() + "\r\n" + response.getData()); } +// if (!"/user/all/custom/gateway/broadcast".equals(response.getTopic())) { +// LogUtils.i("鏈湴鎺ユ敹鍒版暟鎹�:\r\n" + response.getTopic() + "\r\n" + response.getData()); +// } +// if(response.getTopic().contains("/custom/scene/list/get_reply")){ +// response.setData(response.getData()+"\":1}"); +// } +// LogUtils.i("鏈湴鎺ユ敹鍒版暟鎹�:\r\n" + response.getTopic() + "\r\n" + response.getData()+ "\r\n" + response.getData().length()); + } + if (response.getTopic().contains("/user/all/custom/gateway/")) { +// LogUtils.i("鏈湴鎺ユ敹鍒版暟鎹�:\r\n" + response.getTopic() + "\r\n" + response.getData() + "\r\n" + response.getData().length()); + } else if (response.getTopic().contains("thing/property/up")) { +// LogUtils.i("鏈湴鎺ユ敹鍒版暟鎹�:\r\n" + response.getTopic() + "\r\n" + response.getData() + "\r\n" + response.getData().length()); + } else { + LogUtils.i("鏈湴鎺ユ敹鍒版暟鎹�:\r\n" + response.getTopic() + "\r\n" + response.getData() + "\r\n" + response.getData().length()); } //瑙f瀽瀹屾垚,topic鍙戦�佷竴娆� EventDispatcher.getInstance().post(response.getTopic(), response); -- Gitblit v1.8.0