From af2cbc2a24b3724e7fc3e6b42e134b21a3144c75 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期四, 17 二月 2022 15:33:19 +0800
Subject: [PATCH] 过滤掉非json数据不传给三方使用
---
HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/protocol/LinkMessageDecoder.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 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 0d20188..31e03b1 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
@@ -1,6 +1,7 @@
package com.hdl.sdk.connect.protocol;
+import android.annotation.TargetApi;
import android.os.Build;
import android.util.Log;
@@ -116,7 +117,7 @@
}
}
- @RequiresApi(api = Build.VERSION_CODES.O)
+
@Override
protected synchronized LinkResponse decoder(Object msg) throws Exception {
if (msg instanceof byte[]) {
@@ -164,19 +165,24 @@
body = bodyBytes;
} else {
try {
- LogUtils.e("瑙ｅ瘑澶辫触锛屾暟鎹唴瀹规槸锛歕r\n" + Base64.getEncoder().encodeToString(body));
+ LogUtils.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"));
+ }
} catch (Exception e) {
}
}
}
String bodyString = new String(body, "utf-8");
+ response.setData(bodyString);
+ LogUtils.i( "鎺ユ敹鍒版暟鎹�:" + response.getTopic() + "\r\n" + response.getData());
//闈炴甯告暟鎹紝杩斿洖
if (!(bodyString.startsWith("{") || bodyString.startsWith("["))) {
continue;
}
- response.setData(bodyString);
- LogUtils.i( "LinkMessageDecoder->decoder:" + response.getTopic() + "\r\n" + response.getData());
//瑙ｆ瀽瀹屾垚,topic鍙戦�佷竴娆�
EventDispatcher.getInstance().post(response.getTopic(), response);
}
--
Gitblit v1.8.0