From 44155b50cbb4f6ad78474f40331ed8838a3b0d49 Mon Sep 17 00:00:00 2001 From: JLChen <551775569@qq.com> Date: 星期一, 15 十一月 2021 09:27:36 +0800 Subject: [PATCH] 2021-11-15 1.增加认证和加密通讯,未调通 --- HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/HDLSocket.java | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/HDLSocket.java b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/HDLSocket.java index 00cb3a2..22b1dbe 100644 --- a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/HDLSocket.java +++ b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/HDLSocket.java @@ -16,6 +16,7 @@ import com.hdl.sdk.common.utils.SPUtils; import com.hdl.sdk.common.utils.ThreadToolUtils; import com.hdl.sdk.common.utils.gson.GsonConvert; +import com.hdl.sdk.connect.bean.AuthenticateRequest; import com.hdl.sdk.connect.bean.BaseLocalRequest; import com.hdl.sdk.connect.bean.BaseLocalResponse; import com.hdl.sdk.connect.bean.DeviceControlRequest; @@ -218,6 +219,7 @@ * 缁勬挱鎼滅储 */ public void searchGateway(CallBack callBack) { + gatewayId = "";//閲嶇疆缃戝叧ID this.searchCallBack = callBack; if (searchGatewayThread != null) { @@ -441,7 +443,7 @@ String replyTopic = String.format(TopicConstant.PROPERTY_DOWN_REPLY, getGatewayId()); try { - sendMsg(message.toString().getBytes("utf-8"), replyTopic, callBack, new SendListener() { + sendMsg(message.getSendBytes(), replyTopic, callBack, new SendListener() { @Override public void onSucceed() { @@ -454,7 +456,7 @@ } } }); - } catch (UnsupportedEncodingException e) { + } catch (Exception e) { if (callBack != null) { callBack.onError("鎺у埗鎸囦护鍙戦�佸け璐�"); } -- Gitblit v1.8.0