From c8de85433e5800a7b5595a96d99f4b49f24c38b4 Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期二, 16 十二月 2025 13:11:23 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/network/ZyRgvConnectDriver.java | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/core/network/ZyRgvConnectDriver.java b/src/main/java/com/zy/core/network/ZyRgvConnectDriver.java
index bd015f1..9b82eea 100644
--- a/src/main/java/com/zy/core/network/ZyRgvConnectDriver.java
+++ b/src/main/java/com/zy/core/network/ZyRgvConnectDriver.java
@@ -15,6 +15,8 @@
private boolean connected = false;
private DeviceConfig deviceConfig;
private ZyRgvConnectApi zyRgvConnectApi;
+ private volatile boolean closed = false;
+ private Thread selfThread;
public ZyRgvConnectDriver(DeviceConfig deviceConfig) {
this.deviceConfig = deviceConfig;
@@ -23,12 +25,16 @@
@Override
@SuppressWarnings("InfiniteLoopStatement")
public void run() {
- while (!Thread.currentThread().isInterrupted()) {
+ selfThread = Thread.currentThread();
+ while (!closed && !Thread.currentThread().isInterrupted()) {
try {
if (!connected) {
connect();
}
Thread.sleep(1000);
+ } catch (InterruptedException ie) {
+ Thread.currentThread().interrupt();
+ break;
} catch (Exception e) {
e.printStackTrace();
}
@@ -49,9 +55,21 @@
@Override
public void close() {
- zyRgvConnectApi.disconnect();
- zyRgvConnectApi = null;
+ closed = true;
+ Thread t = selfThread;
+ if (t != null) {
+ try { t.interrupt(); } catch (Exception ignore) {}
+ }
+ if (zyRgvConnectApi != null) {
+ zyRgvConnectApi.disconnect();
+ zyRgvConnectApi = null;
+ }
connected = false;
+ }
+
+ public void start() {
+ Thread t = new Thread(this);
+ t.start();
}
public ZyRgvStatusEntity getStatus() {
@@ -64,4 +82,4 @@
public CommandResponse sendCommand(RgvCommand command) {
return zyRgvConnectApi.sendCommand(command);
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.1