From dbfe54f4ba94343827108297551b882c37db68ab Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 14 十一月 2020 16:05:57 +0800
Subject: [PATCH] Merge branch 'jswcs' of https://gitee.com/luxiaotao1123/zy-wcs into jswcs
---
src/main/java/com/zy/core/thread/BarcodeThread.java | 10 ++++++----
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 2 +-
src/main/java/com/zy/core/thread/MelsecCrnThread.java | 2 +-
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/BarcodeThread.java b/src/main/java/com/zy/core/thread/BarcodeThread.java
index 7c613d7..6555d84 100644
--- a/src/main/java/com/zy/core/thread/BarcodeThread.java
+++ b/src/main/java/com/zy/core/thread/BarcodeThread.java
@@ -12,6 +12,7 @@
import java.net.InetSocketAddress;
import java.net.Socket;
import java.net.SocketAddress;
+import java.net.SocketTimeoutException;
/**
* 鏉＄爜鎵弿浠嚎绋�
@@ -37,12 +38,13 @@
connect();
while (true) {
try {
- write("T".getBytes(), "T".length());
- byte[] read = read(11, 1000);
+// write("T".getBytes(), "T".length());
+ byte[] read = read(11, 200);
if (null != read) {
barcode = new String(read);
}
Thread.sleep(100);
+ } catch (SocketTimeoutException ignore) {
} catch (Exception e) {
e.printStackTrace();
}
@@ -98,7 +100,7 @@
if (socket == null) {
return null;
}
- socket.setSoTimeout(timeOut * 1000);
+ socket.setSoTimeout(timeOut);
byte[] bytes = new byte[bufferSize];
int len = dataInputStream.read(bytes);
byte[] tempBytes = null;
@@ -142,7 +144,7 @@
boolean connect = barcodeThread.connect();
System.out.println(connect);
barcodeThread.write("T".getBytes(), "T".length());
- byte[] read = barcodeThread.read(11, 1000);
+ byte[] read = barcodeThread.read(11, 1);
System.out.println(new String(read));
}
}
diff --git a/src/main/java/com/zy/core/thread/MelsecCrnThread.java b/src/main/java/com/zy/core/thread/MelsecCrnThread.java
index 9990237..db83baa 100644
--- a/src/main/java/com/zy/core/thread/MelsecCrnThread.java
+++ b/src/main/java/com/zy/core/thread/MelsecCrnThread.java
@@ -94,7 +94,7 @@
}
Thread.sleep(500);
} catch (Exception e) {
- e.printStackTrace();
+// e.printStackTrace();
}
}
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index afabb67..3d84147 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -85,7 +85,7 @@
}
Thread.sleep(500);
} catch (Exception e) {
- e.printStackTrace();
+// e.printStackTrace();
}
}
--
Gitblit v1.9.1