From 5b556e4e6744a57dcbc372f0277a071d75e300d3 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期二, 23 九月 2025 09:05:29 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/impl/NyShuttleThread.java | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java b/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java
index ccaffca..946eb0c 100644
--- a/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java
+++ b/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java
@@ -82,6 +82,8 @@
if (deviceCommandMsg == null) {
continue;
}
+
+ this.connect();
executeCommand(deviceCommandMsg);
Thread.sleep(200);
@@ -130,6 +132,7 @@
}
private void listenSocketMessage() {
+ StringBuffer sb = new StringBuffer();
try {
if (this.socket == null) {
return;
@@ -147,13 +150,14 @@
// 鑾峰彇杈撳叆娴�
BufferedReader reader = new BufferedReader(new InputStreamReader(this.socket.getInputStream()));
// 璇诲彇鏈嶅姟鍣ㄧ殑鍝嶅簲
- StringBuffer sb = new StringBuffer();
char[] chars = new char[2048];//缂撳啿鍖�
while (true) {
reader.read(chars);
String trim = new String(chars);
- sb.append(trim);
- if (trim.lastIndexOf("\r\n") != -1) {
+ int lastIndexOf = trim.lastIndexOf("\r\n");
+ if (lastIndexOf != -1) {
+ trim = trim.substring(0, lastIndexOf);
+ sb.append(trim);
break;
}
}
@@ -167,9 +171,17 @@
return;
}
+ JSONObject header = null;
+ JSONObject body = null;
JSONObject response = result.getJSONObject("response");
- JSONObject header = response.getJSONObject("header");
- JSONObject body = response.getJSONObject("body");
+ if (response == null) {
+ JSONObject request = result.getJSONObject("request");
+ header = request.getJSONObject("header");
+ body = request.getJSONObject("body");
+ }else {
+ header = response.getJSONObject("header");
+ body = response.getJSONObject("body");
+ }
String msgType = result.getString("msgType");
--
Gitblit v1.9.1