From a61093fc99633b2e5d6a7a14ddd91f26ce2e24ab Mon Sep 17 00:00:00 2001 From: hxb <hxb@hdlchina.com.cn> Date: 星期三, 13 四月 2022 17:04:08 +0800 Subject: [PATCH] 非安卓x1.0 --- HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/protocol/LinkMessageDecoder.java | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/protocol/LinkMessageDecoder.java b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/protocol/LinkMessageDecoder.java index 31e03b1..f5ba2c0 100644 --- a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/protocol/LinkMessageDecoder.java +++ b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/protocol/LinkMessageDecoder.java @@ -5,7 +5,6 @@ import android.os.Build; import android.util.Log; -import androidx.annotation.RequiresApi; import com.google.gson.internal.bind.DateTypeAdapter; import com.hdl.sdk.common.utils.LogUtils; @@ -119,7 +118,7 @@ @Override - protected synchronized LinkResponse decoder(Object msg) throws Exception { + protected synchronized LinkResponse decoder(Object msg,String ipaddress) throws Exception { if (msg instanceof byte[]) { bytes.addAll(ByteUtils.toByteList((byte[]) msg)); //濡傛灉澶氭潯鍛戒护鎵撳寘鍦ㄤ竴鏉℃暟鎹腑锛岄兘闇�瑕佸鐞嗗畬 @@ -157,6 +156,7 @@ bytes.add(recevieBytes[i]); } LinkResponse response = new LinkResponse(); + response.setSource_ipAddress(ipaddress); response.setTopic(topic); if (HDLLinkConfig.getInstance().ifNeedEncrypt(response.getTopic())) { //闇�瑕佽В瀵� @@ -165,11 +165,13 @@ body = bodyBytes; } else { try { - LogUtils.e("瑙e瘑澶辫触锛屾暟鎹唴瀹规槸锛歕r\n"); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) - LogUtils.e(Base64.getEncoder().encodeToString(body)); - else { - LogUtils.e(new String(body, "utf-8")); + //涔嬪墠鐨勭増鏈繖鍧楁槸鏄庢枃鐨� + if (!topic.contains("heartbeat_reply")) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) + LogUtils.e("瑙e瘑澶辫触锛屾暟鎹唴瀹规槸锛歕r\n" + Base64.getEncoder().encodeToString(body)); + else { + LogUtils.e("瑙e瘑澶辫触锛屾暟鎹唴瀹规槸锛歕r\n" + new String(body, "utf-8")); + } } } catch (Exception e) { } @@ -180,7 +182,8 @@ response.setData(bodyString); LogUtils.i( "鎺ユ敹鍒版暟鎹�:" + response.getTopic() + "\r\n" + response.getData()); //闈炴甯告暟鎹紝杩斿洖 - if (!(bodyString.startsWith("{") || bodyString.startsWith("["))) { + if (!((bodyString.startsWith("{") &&bodyString.endsWith("}")) + || (bodyString.startsWith("[")&&bodyString.endsWith("]")))) { continue; } //瑙f瀽瀹屾垚,topic鍙戦�佷竴娆� -- Gitblit v1.8.0