From ca5001d8800e80ffe226a05e5228802bef159337 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期一, 13 十二月 2021 10:38:34 +0800
Subject: [PATCH] Merge branch 'master' into dev-hxb
---
HDLSDK/hdl-socket/src/main/java/com/hdl/sdk/socket/SocketBoot.java | 46 ++++++++++++++++++++++++----------------------
1 files changed, 24 insertions(+), 22 deletions(-)
diff --git a/HDLSDK/hdl-socket/src/main/java/com/hdl/sdk/socket/SocketBoot.java b/HDLSDK/hdl-socket/src/main/java/com/hdl/sdk/socket/SocketBoot.java
index ac8ec9e..b8f557e 100644
--- a/HDLSDK/hdl-socket/src/main/java/com/hdl/sdk/socket/SocketBoot.java
+++ b/HDLSDK/hdl-socket/src/main/java/com/hdl/sdk/socket/SocketBoot.java
@@ -34,6 +34,10 @@
private final IClient client;
+ public IClient getClient() {
+ return client;
+ }
+
/**
* socket鏄惁鍦ㄨ繍琛�
*/
@@ -127,12 +131,10 @@
public void run() {
while (isRun.get()) {
if (client.isConnect()) {
- LogUtils.d("=====", "==鍙戦�佹暟鎹�==");
-
try {
SocketRequest socketRequest = mMessageQueue.take();
final String sendStr = new String(socketRequest.getData(), 0, socketRequest.getData().length);
- LogUtils.d("=====", "==鍙戦�佹暟鎹�==锛�"+sendStr);
+ LogUtils.i("鍙戦�佹暟鎹細"+sendStr);
final String action = socketRequest.getAction();
try {
client.sendMsg(socketRequest.getData());
@@ -172,28 +174,30 @@
}
+ /**
+ * 鍒濆鍖栨帴鏀剁嚎绋嬶紝鍙渶瑕佸垵濮嬪寲涓�娆�
+ */
public void initReceiveThread() {
if (receiveThread == null) {
receiveThread = ThreadToolUtils.getInstance().newFixedThreadPool(1);
- }
- receiveThread.execute(new Runnable() {
- @Override
- public void run() {
- while (isRun.get()) {
- if (client.isConnect()) {
- try {
- //璇诲彇鏁版嵁
- client.onHandleResponse();
- } catch (Exception e) {
- e.printStackTrace();
- LogUtils.d("====", "鏂紑杩炴帴" + e.getMessage());
- disconnectError();
+ receiveThread.execute(new Runnable() {
+ @Override
+ public void run() {
+ while (isRun.get()) {
+ if (client.isConnect()) {
+ try {
+ //璇诲彇鏁版嵁
+ client.onHandleResponse();
+ } catch (Exception e) {
+ e.printStackTrace();
+ disconnectError();
+ }
}
}
+ LogUtils.i("Socket 绾跨▼閫�鍑烘帴鏀舵暟鎹�");
}
- }
- });
-
+ });
+ }
}
@@ -209,7 +213,7 @@
@Override
public void run() {
if (isRun.get()) {
- LogUtils.d("====", "===鍙戦�佸績璺冲寘===");
+// LogUtils.d("====", "===鍙戦�佸績璺冲寘===");
if (client.getOptions() != null) {
final byte[] heartBeat = client.getOptions().getHeartbeatData();
if (heartBeat != null) {
@@ -258,7 +262,6 @@
if (!client.isConnect()) {
resetConnect(false);
}
-
}
/**
@@ -278,7 +281,6 @@
if (!client.isConnect() && isOpenRetry.get()) {
resetConnect(false);
}
-
}
}, 3000, TimeUnit.MILLISECONDS);
}
--
Gitblit v1.8.0