From 0b9facdaa03b58df935ac06b07545b1b08c12b0a Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 26 三月 2021 12:20:03 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/LedThread.java | 113 +++++++++++++++++++++++++++++++++-----------------------
1 files changed, 67 insertions(+), 46 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/LedThread.java b/src/main/java/com/zy/core/thread/LedThread.java
index 3b9d7e5..d2a5d83 100644
--- a/src/main/java/com/zy/core/thread/LedThread.java
+++ b/src/main/java/com/zy/core/thread/LedThread.java
@@ -37,7 +37,10 @@
TextCaptionBxArea area;
DisplayStyleFactory.DisplayStyle[] styles = DisplayStyleFactory.getStyles().toArray(new DisplayStyleFactory.DisplayStyle[0]);
private Set<Integer> workNos = new HashSet<>();
- private boolean resetStatus = false; // 澶嶄綅鐘舵��
+// private boolean resetStatus = false; // 澶嶄綅鐘舵��
+
+ // 鏄剧ず鍣�
+ private StringBuffer stringBuffer = new StringBuffer();
public LedThread(Slave slave) {
this.slave = slave;
@@ -54,7 +57,7 @@
@Override
@SuppressWarnings({"InfiniteLoopStatement", "unchecked"})
public void run() {
- connect();
+// connect();
while (true) {
try {
Task task = MessageQueue.poll(SlaveType.Led, slave.getId());
@@ -73,7 +76,7 @@
}
}
- Thread.sleep(3000);
+ Thread.sleep(1000);
} catch (Exception e) {
e.printStackTrace();
}
@@ -102,58 +105,76 @@
private void write(List<LedCommand> list) throws Bx5GException {
- pf = new ProgramBxFile( 0, screen.getProfile());
- pf.setFrameShow(false);
- // 鍒嗗埆杈撳叆X锛孻锛寃idth锛宧eight
- area = new TextCaptionBxArea( 0,0,192,128,screen.getProfile());
- // 鍒涘缓涓�涓暟鎹〉
- TextBxPage page = new TextBxPage();
+// pf = new ProgramBxFile( 0, screen.getProfile());
+// pf.setFrameShow(false);
+// // 鍒嗗埆杈撳叆X锛孻锛寃idth锛宧eight
+// area = new TextCaptionBxArea( 0,0,192,128,screen.getProfile());
+// // 鍒涘缓涓�涓暟鎹〉
+// TextBxPage page = new TextBxPage();
+// for (LedCommand command : list) {
+// page.newLine(command.getTitle() +"锛�"+command.getWorkNo()+")");
+// page.newLine("婧愬簱浣嶏細"+command.getSourceLocNo());
+// page.newLine("鐩爣绔欙細"+command.getStaNo());
+// if (!command.isEmptyMk()) {
+// for (MatDto matDto : command.getMatDtos()) {
+// page.newLine(matDto.getMaknx() + "銆愭暟閲�" + matDto.getCount() +"銆�");
+// }
+// }
+// page.newLine("\n");
+// }
+//
+// // 璁剧疆瀛椾綋
+// page.setFont(new Font("瀹嬩綋",Font.PLAIN,12));
+// // 璁剧疆鏄剧ず鐗规妧涓哄揩閫熸墦鍑�
+// page.setDisplayStyle(styles[6]);
+// area.clearPages();
+// area.addPage(page);
+// pf.addArea(area);
+// // 鏇存柊鑺傜洰
+// screen.writeProgram(pf);
+// resetStatus = false;
+
+ StringBuilder sb = new StringBuilder();
for (LedCommand command : list) {
- page.newLine(command.getTitle() +"锛�"+command.getWorkNo()+")");
- page.newLine("婧愬簱浣嶏細"+command.getSourceLocNo());
- page.newLine("鐩爣绔欙細"+command.getStaNo());
+ sb.append(command.getTitle() +"锛�"+command.getWorkNo()+")").append("\n");
+ sb.append("婧愬簱浣嶏細"+command.getSourceLocNo()).append("\n");
+ sb.append("鐩爣绔欙細"+command.getStaNo()).append("\n");
if (!command.isEmptyMk()) {
for (MatDto matDto : command.getMatDtos()) {
- page.newLine(matDto.getMaknx() + "銆愭暟閲�" + matDto.getCount() +"銆�");
+ sb.append(matDto.getMaknx() + "銆愭暟閲�" + matDto.getCount() +"銆�").append("\n");
}
}
- page.newLine("\n");
+ sb.append("\n");
}
-
- // 璁剧疆瀛椾綋
- page.setFont(new Font("瀹嬩綋",Font.PLAIN,12));
- // 璁剧疆鏄剧ず鐗规妧涓哄揩閫熸墦鍑�
- page.setDisplayStyle(styles[6]);
- area.clearPages();
- area.addPage(page);
- pf.addArea(area);
- // 鏇存柊鑺傜洰
- screen.writeProgram(pf);
- resetStatus = false;
+ stringBuffer.delete(0, stringBuffer.length());
+ stringBuffer.append(sb.toString());
+// resetStatus = false;
}
private void reset() throws Bx5GException {
- if (!resetStatus) {
- pf = new ProgramBxFile( 0, screen.getProfile());
- pf.setFrameShow(false);
- // 鍒嗗埆杈撳叆X锛孻锛寃idth锛宧eight
- area = new TextCaptionBxArea( 0,0,192,128,screen.getProfile());
- // 鍒涘缓涓�涓暟鎹〉
- TextBxPage page = new TextBxPage();
- page.newLine("骞垮痉涓壃鐗╂祦瑁呭鏈夐檺鍏徃");
- page.newLine("鑷姩鍖栫珛浣撲粨搴�");
- page.newLine("娴欐睙涓壃鐗╂祦瑁呭鏈夐檺鍏徃");
- // 璁剧疆瀛椾綋
- page.setFont(new Font("瀹嬩綋",Font.PLAIN,12));
- // 璁剧疆鏄剧ず鐗规妧涓哄揩閫熸墦鍑�
- page.setDisplayStyle(styles[6]);
- area.clearPages();
- area.addPage(page);
- pf.addArea(area);
- // 鏇存柊鑺傜洰
- screen.writeProgram(pf);
- resetStatus = true;
- }
+// if (!resetStatus) {
+// pf = new ProgramBxFile( 0, screen.getProfile());
+// pf.setFrameShow(false);
+// // 鍒嗗埆杈撳叆X锛孻锛寃idth锛宧eight
+// area = new TextCaptionBxArea( 0,0,192,128,screen.getProfile());
+// // 鍒涘缓涓�涓暟鎹〉
+// TextBxPage page = new TextBxPage();
+// page.newLine("骞垮痉涓壃鐗╂祦瑁呭鏈夐檺鍏徃");
+// page.newLine("鑷姩鍖栫珛浣撲粨搴�");
+// page.newLine("娴欐睙涓壃绔嬪簱鎶�鏈湁闄愬叕鍙�");
+// // 璁剧疆瀛椾綋
+// page.setFont(new Font("瀹嬩綋",Font.PLAIN,12));
+// // 璁剧疆鏄剧ず鐗规妧涓哄揩閫熸墦鍑�
+// page.setDisplayStyle(styles[6]);
+// area.clearPages();
+// area.addPage(page);
+// pf.addArea(area);
+// // 鏇存柊鑺傜洰
+// screen.writeProgram(pf);
+
+ stringBuffer.delete(0, stringBuffer.length());
+// resetStatus = true;
+// }
}
--
Gitblit v1.9.1