From a77a5ebbe056a238fca5b803e17648b60c46d1e8 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 10 九月 2020 09:48:21 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/LedThread.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/LedThread.java b/src/main/java/com/zy/core/thread/LedThread.java
index 32baf97..1f6ae16 100644
--- a/src/main/java/com/zy/core/thread/LedThread.java
+++ b/src/main/java/com/zy/core/thread/LedThread.java
@@ -42,7 +42,7 @@
this.slave = slave;
try {
Bx5GEnv.initial(3000);
- screen = new Bx5GScreenClient("MyScreen");
+ screen = new Bx5GScreenClient("my");
screen.turnOn();
pf = new ProgramBxFile( 0, screen.getProfile());
pf.setFrameShow(false);
@@ -84,8 +84,7 @@
boolean connRes = false;
try {
connRes = screen.connect(slave.getIp(),slave.getPort());
- } catch (Exception e) {
- e.printStackTrace();
+ } catch (Exception ignore) {
}
if (connRes) {
log.info("led杩炴帴鎴愬姛 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
@@ -105,11 +104,13 @@
// 鍒涘缓涓�涓暟鎹〉
TextBxPage page = new TextBxPage();
for (LedCommand command : list) {
- page.newLine("鍑哄簱浠诲姟锛�"+command.getWorkNo()+")");
+ page.newLine(command.getTitle() +"锛�"+command.getWorkNo()+")");
page.newLine("婧愬簱浣嶏細"+command.getSourceLocNo());
page.newLine("鐩爣绔欙細"+command.getStaNo());
- for (MatDto matDto : command.getMatDtos()) {
- page.newLine(matDto.getMaknx() + "銆愭暟閲�" + matDto.getCount() +"銆�");
+ if (!command.isEmptyMk()) {
+ for (MatDto matDto : command.getMatDtos()) {
+ page.newLine(matDto.getMaknx() + "銆愭暟閲�" + matDto.getCount() +"銆�");
+ }
}
page.newLine("\n");
}
--
Gitblit v1.9.1