From 21f24be124930874b04cf9678a7def716611cf2b Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期四, 23 二月 2023 14:11:32 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/LedThread.java | 403 --------------------------------------------------------
1 files changed, 6 insertions(+), 397 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/LedThread.java b/src/main/java/com/zy/core/thread/LedThread.java
index 0cbc00a..9aa2c99 100644
--- a/src/main/java/com/zy/core/thread/LedThread.java
+++ b/src/main/java/com/zy/core/thread/LedThread.java
@@ -1,8 +1,5 @@
package com.zy.core.thread;
-import com.alibaba.fastjson.JSON;
-import com.core.common.Cools;
-import com.zy.common.entity.Parameter;
import com.zy.common.model.MatDto;
import com.zy.core.Slave;
import com.zy.core.ThreadHandler;
@@ -12,17 +9,7 @@
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.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;
@@ -35,13 +22,7 @@
public class LedThread implements Runnable, ThreadHandler {
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<>();
- private boolean ledMk = false;
- private boolean resetStatus = false; // 澶嶄綅鐘舵��
// 鏄剧ず鍣�
private StringBuffer stringBuffer = new StringBuffer();
@@ -51,20 +32,12 @@
public LedThread(Slave slave) {
this.slave = slave;
- try {
-// Bx5GEnv.initial(3000);
-// screen = new Bx5GScreenClient("my");
- } catch (Exception e) {
- e.printStackTrace();
- log.info("led杩炴帴鏋勯�犲櫒閿欒 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
- }
}
@Override
@SuppressWarnings({"InfiniteLoopStatement", "unchecked"})
public void run() {
// connect();
- close();
while (true) {
try {
Task task = MessageQueue.poll(SlaveType.Led, slave.getId());
@@ -78,130 +51,24 @@
case 2:
reset();
break;
- // 鍐欐暟鎹� 娑叉櫠
case 3:
- write7((List<LedCommand>)task.getData());
- break;
- // 澶嶄綅 娑叉櫠
- case 4:
- reset7();
- break;
- case 5:
error((String) task.getData());
break;
- case 6:
+ case 4:
errorReset();
break;
default:
break;
}
}
-
- Thread.sleep(400);
+ Thread.sleep(1000);
} catch (Exception e) {
e.printStackTrace();
}
}
}
- private void write(List<LedCommand> list) throws Bx5GException {
- if (!connect()) {
- return;
- }
- pf = new ProgramBxFile( 0, screen.getProfile());
- pf.setFrameShow(false);
- // 鍒嗗埆杈撳叆X锛孻锛寃idth锛宧eight
- area = new TextCaptionBxArea( 0,0,96,48, screen.getProfile());
- // 鍒涘缓涓�涓暟鎹〉
- TextBxPage page = new TextBxPage();
- for (LedCommand command : list) {
- page.newLine(command.getTitle() +"锛�"+command.getWorkNo()+")");
- page.newLine("搴撲綅锛�"+ (command.getIoType() < 100 ? command.getLocNo() : command.getSourceLocNo()));
- page.newLine("鐩爣绔欙細"+command.getStaNo());
- if (!command.isEmptyMk()) {
- for (MatDto matDto : command.getMatDtos()) {
- //鍘绘帀灏忔暟鐐�
- 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,12));
- // 璁剧疆鏂囨湰棰滆壊
- page.setForeground(Color.red);
- // 璁剧疆鏄剧ず鐗规妧涓哄揩閫熸墦鍑�
- page.setDisplayStyle(styles[6]);
- area.clearPages();
- area.addPage(page);
- pf.addArea(area);
- if (pf.validate() != null) {
- log.info("pf out of range");
- } else {
- // 鏇存柊鑺傜洰
- screen.writeProgram(pf);
-// resetStatus = false;
- }
- close();
- }
-
- private void reset() throws Bx5GException {
- if (!connect()) {
- return;
- }
-// if (resetStatus) {
-// return;
-// }
- pf = new ProgramBxFile( 0, screen.getProfile());
- pf.setFrameShow(false);
- // 鍒嗗埆杈撳叆X锛孻锛寃idth锛宧eight
- area = new TextCaptionBxArea( 0,0,96,48, screen.getProfile());
- // 鍒涘缓涓�涓暟鎹〉
- TextBxPage page = new TextBxPage();
-
-// List<String> list = null;
-// try {
-// String ledDefaultMsg = Parameter.get().getLedDefaultMsg();
-// list = JSON.parseArray(ledDefaultMsg, String.class);
-// } catch (Exception ignore) {
-// }
-// if (!Cools.isEmpty(list)) {
-// for (String str : list) {
-// page.newLine(str);
-// }
-// } else {
-// page.newLine("鑷姩鍖栫珛浣撲粨搴�");
-// page.newLine("瑗挎牸杩堣偂浠芥湁闄愬叕鍙�");
-// }
- page.newLine("鍔涙簮鏅鸿兘浠撳偍");
-
- // 璁剧疆瀛椾綋
- page.setFont(new Font("瀹嬩綋",Font.PLAIN,13));
- // 璁剧疆鏂囨湰棰滆壊
- page.setForeground(Color.red);
- // 璁剧疆鏄剧ず鐗规妧涓哄揩閫熸墦鍑�
- page.setDisplayStyle(styles[6]);
- area.clearPages();
- area.addPage(page);
- pf.addArea(area);
- // 鏇存柊鑺傜洰
- if (pf.validate() != null) {
- log.info("pf out of range");
- } else {
- // 鏇存柊鑺傜洰
- screen.writeProgram(pf);
-// resetStatus = true;
- }
- close();
- }
- private void write7(List<LedCommand> list) {
+ private void write(List<LedCommand> list) {
commandList = list;
StringBuilder sb = new StringBuilder();
@@ -211,8 +78,7 @@
sb.append("鐩爣绔欙細").append(command.getStaNo()).append("\n");
if (!command.isEmptyMk()) {
for (MatDto matDto : command.getMatDtos()) {
- sb.append("鐗╂枡缂栫爜锛�").append(matDto.getMatNo()).append("\n");
- sb.append("鏁伴噺锛�").append(matDto.getCount()).append("\n");
+ sb.append(matDto.getMatNo()).append("-").append(matDto.getMaknx()).append("\n");
}
}
sb.append("\n");
@@ -224,7 +90,7 @@
}
- private void reset7() {
+ private void reset() {
commandList = null;
stringBuffer.delete(0, stringBuffer.length());
@@ -242,268 +108,11 @@
@Override
public boolean connect() {
- boolean connRes = false;
- try {
- connRes = screen.connect(slave.getIp(),slave.getPort());
- screen.turnOn();
- } 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;
+ return true;
}
@Override
public void close() {
-// screen.disconnect();
- }
-
-
-
- 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.101",5005)) {
- System.err.println("杩炴帴澶辫触锛侊紒锛侊紒");
- return;
- }
- screen.turnOn();
-
-
- while (true) {
- Thread.sleep(5000L);
-
- ProgramBxFile pf = new ProgramBxFile( 0, screen.getProfile());
- pf.setFrameShow(false);
- // 鍒嗗埆杈撳叆X锛孻锛寃idth锛宧eigth
- TextCaptionBxArea area = new TextCaptionBxArea( 0,0,192,96,screen.getProfile());
-
- // 鍒涘缓涓�涓暟鎹〉
- // 绗竴琛屾暟鎹�
- TextBxPage page = new TextBxPage("鍑哄簱浠诲姟锛�303锛�");
- page.newLine("婧愬簱浣嶏細0100204");
- page.newLine("鐩爣绔欙細1000");
- // 璁剧疆瀛椾綋
- page.setFont( new Font("瀹嬩綋",Font.PLAIN,15));
- // 璁剧疆鏂囨湰棰滆壊
- page.setForeground(Color.red);
- // 璁剧疆鏄剧ず鐗规妧涓哄揩閫熸墦鍑�
- page.setDisplayStyle(styles[6]);
- area.clearPages();
- area.addPage(page);
- pf.addArea( area );
-
- // 鏇存柊鑺傜洰
- // 鏇存柊鑺傜洰
- if (pf.validate() != null) {
- System.out.println("pf out of range");
- log.info("pf out of range");
- } else {
- // 鏇存柊鑺傜洰
- screen.writeProgram(pf);
- }
- }
-
- // 缁у紑涓庢帶鍒跺櫒涔嬮棿鐨勯摼鎺�
-// screen.disconnect();
- }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- public static void main1(String[] args) throws Exception {
- Bx5GEnv.initial(3000);
- // 鍒涘缓screen瀵硅薄锛岀敤浜庡鎺у埗鍣ㄨ繘琛岃闂紝瀹㈡埛绔ā寮�
- Bx5GScreenClient screen = new Bx5GScreenClient("my");
- // 鍒涘缓screen瀵硅薄锛岀敤浜庡鎺у埗鍣ㄨ繘琛岃闂紝涓插彛妯″紡
- // Bx5GScreenRS screen = new Bx5GScreenRS("MyScreen");
-
- // 鍦ㄥ鎺у埗鍣ㄤ氦浜掍箣鍓嶏紝闇�瑕佸厛涓庢帶鍒跺櫒寤虹珛杩炴帴
- boolean conn = screen.connect("192.168.10.61",5005);
- System.out.println(conn);
- // 涓庢帶鍒跺櫒浜や簰瀹屾垚鍚庯紝闇�鏂紑涓庢帶鍒跺櫒涔嬮棿鐨勮繛鎺�
-// screen.disconnect();
-
- // 浠ヤ笅涓轰竴浜涚畝鍗曟帶鍒跺懡浠ょ殑浣跨敤鏂规硶
- // 寮�鍏虫満鍛戒护
-// screen.turnOff();// 鍏虫満
- screen.turnOn();// 寮�鏈�
-// screen.syncTime();// 鏍℃椂
-// screen.ping();// ping鍛戒护
-// // 鏌ヨ鎺у埗鍣ㄧ姸鎬�
-// screen.checkControllerStatus();
-// // 鏌ヨ鎺у埗鍣ㄥ綋鍓嶅浐浠剁増鏈�
-// screen.checkFirmware();
-// // 鏌ヨ鎺у埗鍣ㄥ唴瀛�
-// screen.checkMemVolumes();
-// // 閿佸畾灞忓箷褰撳墠鐢婚潰
-// screen.lock();
-// // 瑙ｉ櫎閿佸畾灞忓箷褰撳墠鐢婚潰
-// screen.unlock();
-
- Bx5GScreen.Result <ReturnControllerStatus> result1 =
- screen.checkControllerStatus();
- if (result1.isOK())
- {
- ReturnControllerStatus status = result1.reply;
- System.out.println(status.getBrightness());
- System.out.println(status.getRtcDay());
- System.out.println(status.getScreenOnOff());
- //
- // 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 );
-
-
-
-
-
-
-
-
-
-
- //
- // 浠ヤ笅鏄姩鎬佸尯閮ㄥ垎 Demo
- // 鍔ㄦ�佸尯鐨勭壒鐐�
-
- // DynamicBxAreaRule(id, runMode, immediatePlay, timeout)
- // runMode 杩愯妯″紡锛�
- // 0锛氬惊鐜樉绀恒��
- // 1锛氭樉绀哄畬鎴愬悗闈欐鏄剧ず鏈�鍚庝竴椤垫暟鎹��
- // 2锛氬惊鐜樉绀猴紝瓒呰繃璁惧畾鏃堕棿鍚庢暟鎹粛鏈洿鏂版椂涓嶅啀鏄剧ず銆�
- // 3锛氬惊鐜樉绀猴紝瓒呰繃璁惧畾鏃堕棿鍚庢暟鎹粛鏈洿鏂版椂鏄剧ず Logo 淇℃伅銆�
- // 4锛氬惊鐜樉绀猴紝鏄剧ず瀹屾渶鍚庝竴椤靛悗灏变笉鍐嶆樉绀恒��
- // immediatePlay 鏄惁绔嬪嵆鎾斁锛�
- // 0锛氫笌寮傛鑺傜洰涓�璧锋挱鏀俱��
- // 1锛氬紓姝ヨ妭鐩仠姝㈡挱鏀撅紝浠呮挱鏀惧姩鎬佸尯鍩熴��
- // 2锛氬綋鎾斁瀹岃妭鐩紪鍙锋渶楂樼殑寮傛鑺傜洰鍚庢挱鏀捐鍔ㄦ�佸尯鍩熴��
-
- //
- // 瀹氫箟涓�涓姩鎬佸尯
- // 鍙互閫氳繃ID鏉ユ洿鏂颁笉鍚岀殑鍔ㄦ�佸尯鍐呭, 姝ゅ ID 涓� 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);
-
- //
- // 缁у紑涓庢帶鍒跺櫒涔嬮棿鐨勯摼鎺�
- screen.disconnect();
-
-
}
}
--
Gitblit v1.9.1