From 28a7821e43bd5763739fe67384cfea6693b3500b Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 08 九月 2020 13:19:26 +0800
Subject: [PATCH] Merge branches 'gdwcs' and 'jswcs' of https://gitee.com/luxiaotao1123/zy-wcs into jswcs
---
src/main/java/com/zy/core/thread/LedThread.java | 249 ++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 214 insertions(+), 35 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/LedThread.java b/src/main/java/com/zy/core/thread/LedThread.java
index d0d5eb2..0384e64 100644
--- a/src/main/java/com/zy/core/thread/LedThread.java
+++ b/src/main/java/com/zy/core/thread/LedThread.java
@@ -1,17 +1,28 @@
package com.zy.core.thread;
+import com.zy.common.model.MatDto;
import com.zy.core.Slave;
import com.zy.core.ThreadHandler;
+import com.zy.core.cache.MessageQueue;
+import com.zy.core.enums.SlaveType;
+import com.zy.core.model.Task;
+import com.zy.core.model.command.LedCommand;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import onbon.bx05.Bx5GEnv;
+import onbon.bx05.Bx5GException;
import onbon.bx05.Bx5GScreen;
import onbon.bx05.Bx5GScreenClient;
import onbon.bx05.area.TextCaptionBxArea;
import onbon.bx05.area.page.TextBxPage;
-import onbon.bx05.cmd.dyn7.DynamicBxAreaRule;
+import onbon.bx05.file.ProgramBxFile;
import onbon.bx05.message.led.ReturnControllerStatus;
import onbon.bx05.utils.DisplayStyleFactory;
+
+import java.awt.*;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
/**
* Created by vincent on 2020/9/1
@@ -22,12 +33,21 @@
private Slave slave;
private Bx5GScreenClient screen;
+ ProgramBxFile pf;
+ TextCaptionBxArea area;
+ DisplayStyleFactory.DisplayStyle[] styles = DisplayStyleFactory.getStyles().toArray(new DisplayStyleFactory.DisplayStyle[0]);
+ private Set<Integer> workNos = new HashSet<>();
public LedThread(Slave slave) {
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);
+ // 鍒嗗埆杈撳叆X锛孻锛寃idth锛宧eight
+ area = new TextCaptionBxArea( 0,0,192,128,screen.getProfile());
} catch (Exception e) {
e.printStackTrace();
log.info("led杩炴帴鏋勯�犲櫒閿欒 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
@@ -35,15 +55,24 @@
}
@Override
- @SuppressWarnings("InfiniteLoopStatement")
+ @SuppressWarnings({"InfiniteLoopStatement", "unchecked"})
public void run() {
connect();
while (true) {
try {
+ Task task = MessageQueue.poll(SlaveType.Led, slave.getId());
+ if (task != null) {
+ switch (task.getStep()) {
+ // 鍐欐暟鎹�
+ case 1:
+ write((List<LedCommand>)task.getData());
+ break;
+ default:
+ break;
+ }
+ }
-
-
- Thread.sleep(500);
+ Thread.sleep(3000);
} catch (Exception e) {
e.printStackTrace();
}
@@ -55,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());
@@ -72,7 +100,103 @@
}
+ private void write(List<LedCommand> list) throws Bx5GException {
+ // 鍒涘缓涓�涓暟鎹〉
+ TextBxPage page = new TextBxPage();
+ for (LedCommand command : list) {
+ page.newLine("鍑哄簱浠诲姟锛�"+command.getWorkNo()+")");
+ page.newLine("婧愬簱浣嶏細"+command.getSourceLocNo());
+ page.newLine("鐩爣绔欙細"+command.getStaNo());
+ 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.addPage(page);
+ pf.addArea(area);
+ // 鏇存柊鑺傜洰
+ screen.writeProgram(pf);
+ }
+
+
+
+
public static void main(String[] args) throws Exception {
+ 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)) {
+ System.err.println("杩炴帴澶辫触锛侊紒锛侊紒");
+ return;
+ }
+ screen.turnOn();
+ ProgramBxFile pf = new ProgramBxFile( 0, screen.getProfile());
+ pf.setFrameShow(false);
+ // 鍒嗗埆杈撳叆X锛孻锛寃idth锛宧eigth
+ TextCaptionBxArea area = new TextCaptionBxArea( 0,0,192,128,screen.getProfile());
+ // 鍒涘缓涓�涓暟鎹〉
+ // 绗竴琛屾暟鎹�
+ TextBxPage page = new TextBxPage("鍏ㄦ澘鍏ュ簱");
+ page.newLine("鐩爣搴撲綅锛�0100204");
+ // 绗簩琛屾暟鎹�
+ page.newLine("鎺ユ敹鍣� RX18 XH 6V 銆愭暟閲忥細2銆�");
+ page.newLine("涓帶 BM钃濈墮 鑻辨枃 6V 銆愭暟閲忥細1銆�");
+ page.newLine("绾挎潫 S2588-1-XX 鏃犲疄鐗┿�愭暟閲忥細5銆�");
+ page.newLine("鎺ユ敹鍣� RX18 XH 6V 銆愭暟閲忥細2銆�");
+ page.newLine("涓帶 BM钃濈墮 鑻辨枃 6V 銆愭暟閲忥細1銆�");
+ page.newLine("绾挎潫 S2588-1-XX 鏃犲疄鐗┿�愭暟閲忥細5銆�");
+ page.newLine("鎺ユ敹鍣� RX18 XH 6V 銆愭暟閲忥細2銆�");
+ page.newLine("涓帶 BM钃濈墮 鑻辨枃 6V 銆愭暟閲忥細1銆�");
+ page.newLine("绾挎潫 S2588-1-XX 鏃犲疄鐗┿�愭暟閲忥細5銆�");
+ // 璁剧疆瀛椾綋
+ page.setFont( new Font("瀹嬩綋",Font.PLAIN,12));
+ // 璁剧疆鏄剧ず鐗规妧涓哄揩閫熸墦鍑�
+ page.setDisplayStyle(styles[6]);
+ area.addPage(page);
+ pf.addArea( area );
+ // 鏇存柊鑺傜洰
+ screen.writeProgram(pf);
+ // 缁у紑涓庢帶鍒跺櫒涔嬮棿鐨勯摼鎺�
+ screen.disconnect();
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ public static void main1(String[] args) throws Exception {
Bx5GEnv.initial(3000);
// 鍒涘缓screen瀵硅薄锛岀敤浜庡鎺у埗鍣ㄨ繘琛岃闂紝瀹㈡埛绔ā寮�
Bx5GScreenClient screen = new Bx5GScreenClient("my");
@@ -114,6 +238,61 @@
// status 杩樻湁寰堝鍏朵粬鎺ュ彛锛屽彲浠ユ牴鎹疄闄呴渶姹傚啀娆¤皟鐢ㄤ互鑾峰彇鐩稿簲鐘舵��
}
+//
+ // 浠ヤ笅鏄潤鎬佸尯閮ㄥ垎 Demo
+
+ // 鍒涘缓鑺傜洰鏂囦欢
+ ProgramBxFile pf = new ProgramBxFile( 0,screen.getProfile() );
+// 鏄惁鏄剧ず鑺傜洰杈规
+ pf.setFrameShow(true);
+// 鑺傜洰杈规鐨勭Щ鍔ㄩ�熷害
+ pf.setFrameSpeed(20);
+// 浣跨敤绗嚑涓唴缃竟妗�
+ pf.loadFrameImage(13);
+
+ DisplayStyleFactory.DisplayStyle[] styles = DisplayStyleFactory.getStyles().toArray(new DisplayStyleFactory.DisplayStyle[0]);
+// 鍒涘缓涓�涓枃鏈尯
+ // 鍒嗗埆杈撳叆X锛孻锛寃idth锛宧eigth
+ // 娉ㄦ剰鍖哄煙鍧愭爣鍜屽搴﹂珮搴︼紝涓嶈瓒婄晫
+ TextCaptionBxArea area = new TextCaptionBxArea( 0,0,160,64,screen.getProfile() );
+
+ // 鍒涘缓涓�涓暟鎹〉
+ // 绗竴琛屾暟鎹�
+ TextBxPage page = new TextBxPage("鍏ュ簱");
+ // 绗簩琛屾暟鎹�
+ page.newLine( "鐗╂枡锛�" );
+ page.newLine("鎺ユ敹鍣� RX18 XH 6V 锛堟暟閲忥細2锛�");
+ page.newLine("涓帶 BM钃濈墮 鑻辨枃 6V 锛堟暟閲忥細1锛�");
+ page.newLine("绾挎潫 S2588-1-XX 鏃犲疄鐗╋紙鏁伴噺锛�5锛�");
+ page.newLine("鐩爣搴撲綅锛�0100204");
+ // 璁剧疆瀛椾綋
+ page.setFont( new Font("瀹嬩綋",Font.PLAIN,12) );
+ // 璁剧疆鏄剧ず鐗规妧涓哄揩閫熸墦鍑�
+ page.setDisplayStyle( styles[2] );
+
+ // 鏁版嵁椤靛彲浠ユ槸鍥剧墖
+// ImageFileBxPage iPage = new ImageFileBxPage( "E;a/001.bmp" );
+//
+// // 鏁版嵁椤靛彲浠ユ槸txt鏂囦欢
+// TextFileBxPage tPage = new TextFileBxPage("E:a/001.txt");
+
+ // 灏嗗墠闈㈢殑page娣诲姞鍒癮rea涓� area涓彲浠ユ坊鍔犲涓猵age 鍏朵腑page鍙互鏄瓧绗︿覆锛屽彲浠ユ槸txt鏂囦欢锛屽彲浠ユ槸鍥剧墖锛屼笉鍙互鏄〃鏍硷紝濡傛灉闇�瑕丩ed灞忎笂鏄剧ず琛ㄦ牸锛岃鍏堝皢琛ㄦ牸缁樺埗鎴愬浘鐗�
+ area.addPage( page );
+// area.addPage( iPage );
+// area.addPage( tPage );
+ // 灏哸rea娣诲姞鍒拌妭鐩腑 鑺傜洰涓彲浠ユ坊鍔犲涓猘rea
+ pf.addArea( area );
+
+ // 鏇存柊鑺傜洰
+ screen.writeProgram( pf );
+
+
+
+
+
+
+
+
//
@@ -135,36 +314,36 @@
//
// 瀹氫箟涓�涓姩鎬佸尯
// 鍙互閫氳繃ID鏉ユ洿鏂颁笉鍚岀殑鍔ㄦ�佸尯鍐呭, 姝ゅ ID 涓� 0
- DynamicBxAreaRule dynRule = new DynamicBxAreaRule(0, (byte) 0, (byte) 1, 0);
+// DynamicBxAreaRule dynRule = new DynamicBxAreaRule(0, (byte) 0, (byte) 1, 0);
//dArea.addProgram("P000");
//dArea.addProgram("P001");
- int posX = 440;
- int posY = 4;
- TextCaptionBxArea dAreaContent = new TextCaptionBxArea(posX, posY, 64, 16, screen.getProfile());
- TextBxPage page = new TextBxPage("鍔ㄦ�佺涓�娆″皾璇�");
- page.setDisplayStyle(DisplayStyleFactory.getStyle(4));
- dAreaContent.addPage(page);
-
- // 鍙戦�佸姩鎬佸尯涔嬪墠锛屽鏋滈渶瑕佸垹闄や箣鍓嶇殑鍔ㄦ�佸尯锛屽彲浠ヨ皟鐢ㄤ互涓嬫帴鍙�
- // 閫氬父濡傛灉鍔ㄦ�佸尯鐨勪綅缃垨澶у皬娌℃湁鍙戠敓鏀瑰彉锛屼笉鐢ㄥ垹闄�
- screen.deleteAllDynamic();
-
- // 鏇存柊鍔ㄦ�佸尯
- screen.writeDynamic(dynRule, dAreaContent);
- Thread.sleep(15000);
-
- //
- // 涓嬮潰妯℃嫙鍐嶆鏇存柊鍔ㄦ�佸尯
- page = new TextBxPage("鍐嶆灏濊瘯");
- TextBxPage page2 = new TextBxPage("鎴愬姛");
-
- dAreaContent.clearPages();
- dAreaContent.addPage(page);
- dAreaContent.addPage(page2);
-
- // 鏇存柊鍔ㄦ�佸尯
- screen.writeDynamic(dynRule, dAreaContent);
+// int posX = 440;
+// int posY = 4;
+// TextCaptionBxArea dAreaContent = new TextCaptionBxArea(posX, posY, 64, 16, screen.getProfile());
+// TextBxPage page = new TextBxPage("鍔ㄦ�佺涓�娆″皾璇�");
+// page.setDisplayStyle(DisplayStyleFactory.getStyle(4));
+// dAreaContent.addPage(page);
+//
+// // 鍙戦�佸姩鎬佸尯涔嬪墠锛屽鏋滈渶瑕佸垹闄や箣鍓嶇殑鍔ㄦ�佸尯锛屽彲浠ヨ皟鐢ㄤ互涓嬫帴鍙�
+// // 閫氬父濡傛灉鍔ㄦ�佸尯鐨勪綅缃垨澶у皬娌℃湁鍙戠敓鏀瑰彉锛屼笉鐢ㄥ垹闄�
+// screen.deleteAllDynamic();
+//
+// // 鏇存柊鍔ㄦ�佸尯
+// screen.writeDynamic(dynRule, dAreaContent);
+// Thread.sleep(15000);
+//
+// //
+// // 涓嬮潰妯℃嫙鍐嶆鏇存柊鍔ㄦ�佸尯
+// page = new TextBxPage("鍐嶆灏濊瘯");
+// TextBxPage page2 = new TextBxPage("鎴愬姛");
+//
+// dAreaContent.clearPages();
+// dAreaContent.addPage(page);
+// dAreaContent.addPage(page2);
+//
+// // 鏇存柊鍔ㄦ�佸尯
+// screen.writeDynamic(dynRule, dAreaContent);
//
// 缁у紑涓庢帶鍒跺櫒涔嬮棿鐨勯摼鎺�
--
Gitblit v1.9.1