From e7e494c6d168ea2942e1c6fa1c9c7808f4c12184 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期一, 18 九月 2023 13:40:17 +0800
Subject: [PATCH] 完善全局处理模块
---
HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/protocol/LinkMessageDecoder.java | 64 -------------------------------
1 files changed, 1 insertions(+), 63 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 4e2cbb0..e0f1a43 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
@@ -172,6 +172,7 @@
}
LinkResponse response = new LinkResponse();
response.setSource_ipAddress(ipaddress);
+ Log.d("panlili", "----->source_ipAddress= " + ipaddress);
response.setTopic(topic);
if (HDLLinkConfig.getInstance().ifNeedEncrypt(response.getTopic())) {
//闇�瑕佽В瀵�
@@ -196,69 +197,6 @@
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) || response.getTopic().equals(TopicConstant.LINK_BROADCAST)) {
- try {
- DeviceInfoResponse deviceInfoResponse = GsonConvert.getGson().fromJson(response.getData(), new TypeToken<DeviceInfoResponse>() {
- }.getType());
-
- if (!TextUtils.isEmpty(deviceInfoResponse.getObjects().getLocalSecret())) {
- byte[] baseBytes = Base64.decode(deviceInfoResponse.getObjects().getLocalSecret(), Base64.NO_WRAP);
- 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");
- Log.d("panlili", "鏇存柊瀵嗛挜----->localSecret= " + localSecret);
- 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");
- if (HDLLink.getInstance().listener != null) {
- HDLLink.getInstance().listener.onSuccess(msg);
- }
- }
-
- @Override
- public void onError(HDLLinkException e) {
- LogUtils.i("deleteNetwork onError");
- if (HDLLink.getInstance().listener != null) {
- HDLLink.getInstance().listener.onFailure();
- }
- }
- });
- } catch (Exception e) {
- LogUtils.i("LinkMessageDecoder.java:deleteNetwork----->e= " + e.getMessage());
- }
- }
//闈炴甯告暟鎹紝杩斿洖
if (!((bodyString.startsWith("{") && bodyString.endsWith("}"))
--
Gitblit v1.8.0