From 881519bc1efeb83701e0ca44d026385db3d8509a Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期一, 18 九月 2023 13:27:44 +0800
Subject: [PATCH] 增加全局处理方法
---
HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/protocol/LinkMessageDecoder.java | 64 ++-----------------------------
1 files changed, 5 insertions(+), 59 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 a227a2a..4c15135 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
@@ -15,6 +15,7 @@
import com.hdl.sdk.common.utils.LogUtils;
import com.hdl.sdk.common.utils.SPUtils;
import com.hdl.sdk.common.utils.gson.GsonConvert;
+import com.hdl.sdk.connect.HDLLink;
import com.hdl.sdk.connect.bean.LinkResponse;
import com.hdl.sdk.connect.bean.request.AuthenticateRequest;
import com.hdl.sdk.connect.bean.response.DeviceDeleteResponse;
@@ -27,8 +28,9 @@
import com.hdl.sdk.socket.codec.ByteToMessageDecoder;
import java.util.ArrayList;
-import java.util.Base64;
import java.util.List;
+
+import android.util.Base64;
import kotlin.ParameterName;
@@ -181,7 +183,7 @@
//涔嬪墠鐨勭増鏈繖鍧楁槸鏄庢枃鐨�
if (!topic.contains("heartbeat_reply")) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
- LogUtils.e("瑙ｅ瘑澶辫触锛屾暟鎹唴瀹规槸锛歕r\n" + Base64.getEncoder().encodeToString(body));
+ LogUtils.e("瑙ｅ瘑澶辫触锛屾暟鎹唴瀹规槸锛歕r\n" + Base64.encodeToString(body, Base64.NO_WRAP));
else {
LogUtils.e("瑙ｅ瘑澶辫触锛屾暟鎹唴瀹规槸锛歕r\n" + new String(body, "utf-8"));
}
@@ -194,63 +196,7 @@
String bodyString = new String(body, "utf-8");
response.setData(bodyString);
LogUtils.i("鎺ユ敹鍒版暟鎹�:" + response.getTopic() + "\r\n" + response.getData());
-
- String updateLocalSecret = String.format(TopicConstant.LINK_BROADCAST, HDLLinkConfig.getInstance().getGatewayId());
- String deleteNetwork = "";
- if (HDLLinkConfig.getInstance().getDeviceInfoBean() != null) {
- deleteNetwork = String.format(TopicConstant.DELETE_NOTIFY, HDLLinkConfig.getInstance().getDeviceInfoBean().getOID());
- }
-
- if (response.getTopic().equals("/user/all/custom/gateway/search")) {
- HDLAuthSocket.getInstance().UploadGatewayInfo(new HDLLinkCallBack() {
- @Override
- public void onSuccess(String msg) {
- LogUtils.i("UploadGatewayInfo onSucceed");
- }
-
- @Override
- public void onError(HDLLinkException e) {
- LogUtils.i("UploadGatewayInfo onError");
- }
- });
- } else if (response.getTopic().equals(updateLocalSecret)) {
- try {
- DeviceInfoResponse deviceInfoResponse = GsonConvert.getGson().fromJson(response.getData(), new TypeToken<DeviceInfoResponse>() {
- }.getType());
-
- if (!TextUtils.isEmpty(deviceInfoResponse.getObjects().getLocalSecret())) {
- byte[] baseBytes = Base64.getDecoder().decode(deviceInfoResponse.getObjects().getLocalSecret());
- String mackey = "";
- if (!TextUtils.isEmpty(SPUtils.getString("auth_mackey_key", ""))) {
- mackey = SPUtils.getString("auth_mackey_key", "");
- byte[] bodyBytes = AesUtil.aesDecrypt(baseBytes, mackey.substring(mackey.length() - 16));
- String localSecret = new String(bodyBytes, "utf-8");
- HDLLinkConfig.getInstance().setLocalSecret(localSecret);
- }
- }
- } catch (Exception e) {
- LogUtils.i("LinkMessageDecoder.java:getLocalSecret----->e= " + e.getMessage());
- }
- } else if (response.getTopic().equals(deleteNetwork)) {
- try {
- DeviceDeleteResponse deviceDeleteResponse = GsonConvert.getGson().fromJson(response.getData(), new TypeToken<DeviceDeleteResponse>() {
- }.getType());
- HDLSocket.getInstance().deleteNetwork(deviceDeleteResponse.getObjects().get(0).getOID(), new HDLLinkCallBack() {
- @Override
- public void onSuccess(String msg) {
- LogUtils.i("deleteNetwork onSucceed");
- }
-
- @Override
- public void onError(HDLLinkException e) {
- LogUtils.i("deleteNetwork onError");
- }
- });
- } catch (Exception e) {
- LogUtils.i("LinkMessageDecoder.java:deleteNetwork----->e= " + e.getMessage());
- }
- }
-
+
//闈炴甯告暟鎹紝杩斿洖
if (!((bodyString.startsWith("{") && bodyString.endsWith("}"))
|| (bodyString.startsWith("[") && bodyString.endsWith("]")))) {
--
Gitblit v1.8.0