From ffc84e8ad20d6734dbbfc1fb4c8533a35ba9072e Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期一, 22 一月 2024 08:41:03 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/LedThread.java | 117 ++++++++++++++++++++++++++++++----------------------------
1 files changed, 61 insertions(+), 56 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/LedThread.java b/src/main/java/com/zy/core/thread/LedThread.java
index deb64fe..3305f41 100644
--- a/src/main/java/com/zy/core/thread/LedThread.java
+++ b/src/main/java/com/zy/core/thread/LedThread.java
@@ -41,7 +41,7 @@
DisplayStyleFactory.DisplayStyle[] styles = DisplayStyleFactory.getStyles().toArray(new DisplayStyleFactory.DisplayStyle[0]);
private Set<Integer> workNos = new HashSet<>();
private boolean ledMk = true;
-// private boolean resetStatus = false; // 澶嶄綅鐘舵��
+ private boolean resetStatus = false; // 澶嶄綅鐘舵��
public LedThread(Slave slave) {
this.slave = slave;
@@ -72,10 +72,6 @@
case 2:
reset();
break;
- // 璀﹀憡淇℃伅
- case 3:
- write(String.valueOf(task.getData()));
- break;
default:
break;
}
@@ -89,13 +85,13 @@
}
private void write(List<LedCommand> list) throws Bx5GException {
-// if (!connect()) {
-// return;
-// }
+ if (!connect()) {
+ return;
+ }
pf = new ProgramBxFile( 0, screen.getProfile());
pf.setFrameShow(false);
// 鍒嗗埆杈撳叆X锛孻锛寃idth锛宧eight
- area = new TextCaptionBxArea( 0,0,192,128, screen.getProfile());
+ area = new TextCaptionBxArea( 0,0,96,48, screen.getProfile());
// 鍒涘缓涓�涓暟鎹〉
TextBxPage page = new TextBxPage();
for (LedCommand command : list) {
@@ -104,14 +100,21 @@
page.newLine("鐩爣绔欙細"+command.getStaNo());
if (!command.isEmptyMk()) {
for (MatDto matDto : command.getMatDtos()) {
- page.newLine(matDto.getMaknx() + "銆愭暟閲�" + matDto.getCount() +"銆�");
+ //鍘绘帀灏忔暟鐐�
+ String strQty = matDto.getCount().toString();
+ int idx = strQty.lastIndexOf(".");
+ if(idx >= 0){
+ strQty.substring(0,idx);
+ }
+ page.newLine(matDto.getMaknx() + "[鏁伴噺" + strQty +"]");
+// page.newLine(matDto.getMaknx() + "銆愭暟閲�" + matDto.getCount() +"銆�");
}
}
page.newLine("\n");
}
// 璁剧疆瀛椾綋
- page.setFont(new Font("瀹嬩綋",Font.PLAIN,14));
+ page.setFont(new Font("瀹嬩綋",Font.PLAIN,10));
// 璁剧疆鏂囨湰棰滆壊
page.setForeground(Color.red);
// 璁剧疆鏄剧ず鐗规妧涓哄揩閫熸墦鍑�
@@ -119,36 +122,13 @@
area.clearPages();
area.addPage(page);
pf.addArea(area);
- // 鏇存柊鑺傜洰
- screen.writeProgram(pf);
-// resetStatus = false;
- close();
- }
-
- private void write(String str) throws Bx5GException {
-// if (!connect() || Cools.isEmpty(str)) {
-// return;
-// }
- 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(str);
- page.newLine("\n");
- // 璁剧疆瀛椾綋
- page.setFont(new Font("瀹嬩綋",Font.PLAIN,14));
- // 璁剧疆鏂囨湰棰滆壊
- page.setForeground(Color.red);
- // 璁剧疆鏄剧ず鐗规妧涓哄揩閫熸墦鍑�
- page.setDisplayStyle(styles[6]);
- area.clearPages();
- area.addPage(page);
- pf.addArea(area);
- // 鏇存柊鑺傜洰
- screen.writeProgram(pf);
-// resetStatus = false;
+ if (pf.validate() != null) {
+ log.info("pf out of range");
+ } else {
+ // 鏇存柊鑺傜洰
+ screen.writeProgram(pf);
+// resetStatus = false;
+ }
close();
}
@@ -156,10 +136,13 @@
// if (!connect()) {
// return;
// }
+// if (resetStatus) {
+// return;
+// }
pf = new ProgramBxFile( 0, screen.getProfile());
pf.setFrameShow(false);
// 鍒嗗埆杈撳叆X锛孻锛寃idth锛宧eight
- area = new TextCaptionBxArea( 0,0,192,128, screen.getProfile());
+ area = new TextCaptionBxArea( 0,0,96,48, screen.getProfile());
// 鍒涘缓涓�涓暟鎹〉
TextBxPage page = new TextBxPage();
@@ -175,11 +158,11 @@
}
} else {
page.newLine("鑷姩鍖栫珛浣撲粨搴�");
- page.newLine("娴欐睙涓壃绔嬪簱鎶�鏈湁闄愬叕鍙�");
+ page.newLine("瑗挎牸杩堣偂浠芥湁闄愬叕鍙�");
}
// 璁剧疆瀛椾綋
- page.setFont(new Font("瀹嬩綋",Font.PLAIN,15));
+ page.setFont(new Font("瀹嬩綋",Font.PLAIN,13));
// 璁剧疆鏂囨湰棰滆壊
page.setForeground(Color.red);
// 璁剧疆鏄剧ず鐗规妧涓哄揩閫熸墦鍑�
@@ -188,7 +171,13 @@
area.addPage(page);
pf.addArea(area);
// 鏇存柊鑺傜洰
- screen.writeProgram(pf);
+ if (pf.validate() != null) {
+ log.info("pf out of range");
+ } else {
+ // 鏇存柊鑺傜洰
+ screen.writeProgram(pf);
+// resetStatus = true;
+ }
close();
}
@@ -198,13 +187,13 @@
try {
connRes = screen.connect(slave.getIp(),slave.getPort());
screen.turnOn();
- if (connRes) {
- log.info("led杩炴帴鎴愬姛 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
- reset();
- } else {
- log.error("led杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
- }
- } catch (Exception ignore) { }
+ } catch (Exception ignore) {
+ }
+ if (connRes) {
+ log.info("led杩炴帴鎴愬姛 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+ } else {
+ log.error("led杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+ }
return connRes;
}
@@ -216,10 +205,17 @@
public static void main(String[] args) throws Exception {
+ String strQty = "1234";
+ int index = strQty.lastIndexOf(".");
+ if(index>=0) {
+ strQty=strQty.substring(0, index);
+ }
+ System.out.println("2==>>"+strQty);
+
Bx5GEnv.initial(3000);
Bx5GScreenClient screen = new Bx5GScreenClient("my");
DisplayStyleFactory.DisplayStyle[] styles = DisplayStyleFactory.getStyles().toArray(new DisplayStyleFactory.DisplayStyle[0]);
- if (!screen.connect("192.168.10.61",5005)) {
+ if (!screen.connect("192.168.10.101",5005)) {
System.err.println("杩炴帴澶辫触锛侊紒锛侊紒");
return;
}
@@ -232,7 +228,7 @@
ProgramBxFile pf = new ProgramBxFile( 0, screen.getProfile());
pf.setFrameShow(false);
// 鍒嗗埆杈撳叆X锛孻锛寃idth锛宧eigth
- TextCaptionBxArea area = new TextCaptionBxArea( 0,0,192,128,screen.getProfile());
+ TextCaptionBxArea area = new TextCaptionBxArea( 0,0,192,96,screen.getProfile());
// 鍒涘缓涓�涓暟鎹〉
// 绗竴琛屾暟鎹�
@@ -240,7 +236,9 @@
page.newLine("婧愬簱浣嶏細0100204");
page.newLine("鐩爣绔欙細1000");
// 璁剧疆瀛椾綋
- page.setFont( new Font("瀹嬩綋",Font.PLAIN,12));
+ page.setFont( new Font("瀹嬩綋",Font.PLAIN,15));
+ // 璁剧疆鏂囨湰棰滆壊
+ page.setForeground(Color.red);
// 璁剧疆鏄剧ず鐗规妧涓哄揩閫熸墦鍑�
page.setDisplayStyle(styles[6]);
area.clearPages();
@@ -248,7 +246,14 @@
pf.addArea( area );
// 鏇存柊鑺傜洰
- screen.writeProgram(pf);
+ // 鏇存柊鑺傜洰
+ if (pf.validate() != null) {
+ System.out.println("pf out of range");
+ log.info("pf out of range");
+ } else {
+ // 鏇存柊鑺傜洰
+ screen.writeProgram(pf);
+ }
}
// 缁у紑涓庢帶鍒跺櫒涔嬮棿鐨勯摼鎺�
--
Gitblit v1.9.1