From 30e96788f05f5ce28b58d991051c79e9c952c824 Mon Sep 17 00:00:00 2001
From: 562935844@qq.com
Date: 星期三, 28 十二月 2022 14:51:34 +0800
Subject: [PATCH] 修改入网认证流程
---
HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/HDLLink.java | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/HDLLink.java b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/HDLLink.java
index debe128..e5e993b 100644
--- a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/HDLLink.java
+++ b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/HDLLink.java
@@ -1,5 +1,7 @@
package com.hdl.sdk.connect;
+import com.hdl.sdk.common.utils.LogUtils;
+import com.hdl.sdk.common.utils.ThreadToolUtils;
import com.hdl.sdk.connect.bean.request.DeviceControlRequest;
import com.hdl.sdk.connect.callback.HDLLinkCallBack;
import com.hdl.sdk.connect.callback.HDLLinkResponseCallBack;
@@ -11,6 +13,7 @@
import com.hdl.sdk.connect.socket.HDLSocket;
import java.util.List;
+import java.util.concurrent.TimeUnit;
/**
* Created by jlchen on 11/15/21.
@@ -21,20 +24,20 @@
/**
* instance
*/
- private volatile static HDLLink instance;
+ private static final HDLLink instance=new HDLLink();
/**
* getInstance
*
* @return HDLLink
*/
- public static synchronized HDLLink getInstance() {
- if (instance == null) {
- synchronized (HDLLink.class) {
- if (instance == null) {
- instance = new HDLLink();
- }
- }
- }
+ public static HDLLink getInstance() {
+// if (instance == null) {
+// synchronized (HDLLink.class) {
+// if (instance == null) {
+// instance = new HDLLink();
+// }
+// }
+// }
return instance;
}
@@ -71,6 +74,7 @@
* @param callBack 缁撴灉鍥炶皟
*/
public void startAuthenticateRequest(AuthenticateRequest request, HDLLinkCallBack callBack) {
+ LogUtils.i("鍙戦�佽璇佽姹�");
HDLAuthSocket.getInstance().startAuthenticateRequest(request,callBack);
}
@@ -207,6 +211,7 @@
* @param callBack 鍥炶皟
*/
public void tcpSendMsg(String topic, String bodyStr, HDLLinkCallBack callBack) {
+ HDLAuthSocket.getInstance();//閫氳繃杩欎釜鍙互鍏堝垵濮嬪寲UDP鐩戝惉浜嬩欢
HDLSocket.getInstance().tcpSendMsg(topic, bodyStr, callBack);
}
@@ -237,6 +242,7 @@
* @param bodyStr 鍥炲鐨勪富棰�
*/
public void tcpSendMsg(String topic, String bodyStr) {
+ HDLAuthSocket.getInstance();//閫氳繃杩欎釜鍙互鍏堝垵濮嬪寲UDP鐩戝惉浜嬩欢
HDLSocket.getInstance().tcpSendMsg(topic, bodyStr);
}
}
--
Gitblit v1.8.0