From 29e8cbccfba7cd77026c724d093d6a82da99e5af Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 22 九月 2022 13:55:09 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/LedThread.java |  355 +++++-----------------------------------------------------
 1 files changed, 33 insertions(+), 322 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/LedThread.java b/src/main/java/com/zy/core/thread/LedThread.java
index 9c57985..e37e85a 100644
--- a/src/main/java/com/zy/core/thread/LedThread.java
+++ b/src/main/java/com/zy/core/thread/LedThread.java
@@ -9,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;
@@ -32,26 +22,16 @@
 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 resetStatus = false;    //  澶嶄綅鐘舵��
 
     // 鏄剧ず鍣�
     private StringBuffer stringBuffer = new StringBuffer();
+    private List<LedCommand> commandList;
+
+    private StringBuffer errorMsg = new StringBuffer();
 
     public LedThread(Slave slave) {
         this.slave = slave;
-        try {
-            Bx5GEnv.initial(3000);
-            screen = new Bx5GScreenClient("my");
-            screen.turnOn();
-        } catch (Exception e) {
-            e.printStackTrace();
-            log.info("led杩炴帴鏋勯�犲櫒閿欒 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
-        }
     }
 
     @Override
@@ -71,11 +51,16 @@
                         case 2:
                             reset();
                             break;
+                        case 3:
+                            error((String) task.getData());
+                            break;
+                        case 4:
+                            errorReset();
+                            break;
                         default:
                             break;
                     }
                 }
-
                 Thread.sleep(1000);
             } catch (Exception e) {
                 e.printStackTrace();
@@ -83,325 +68,51 @@
         }
     }
 
-    @Override
-    public boolean connect() {
-        boolean connRes = false;
-        try {
-            connRes = screen.connect(slave.getIp(),slave.getPort());
-        } 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;
-    }
-
-    @Override
-    public void close() {
-        screen.disconnect();
-    }
-
-
-    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();
-//        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;
+    private void write(List<LedCommand> list) {
+        commandList = list;
 
         StringBuilder sb = new StringBuilder();
         for (LedCommand command : list) {
-            sb.append(command.getTitle() +"锛�"+command.getWorkNo()+")").append("\n");
-            sb.append("婧愬簱浣嶏細"+command.getSourceLocNo()).append("\n");
-            sb.append("鐩爣绔欙細"+command.getStaNo()).append("\n");
+            sb.append(command.getTitle()).append("锛�").append(command.getWorkNo()).append(")").append("\n");
+            sb.append("婧愬簱浣嶏細").append(command.getSourceLocNo()).append("\n");
+            sb.append("鐩爣绔欙細").append(command.getStaNo()).append("\n");
             if (!command.isEmptyMk()) {
                 for (MatDto matDto : command.getMatDtos()) {
-                    sb.append(matDto.getMaknx() + "銆愭暟閲�" + matDto.getCount() +"銆�").append("\n");
+                    sb.append(matDto.getMatnr()).append("-").append(matDto.getBatch()).append("\n");
                 }
             }
             sb.append("\n");
         }
         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);
-
-            stringBuffer.delete(0, stringBuffer.length());
-            resetStatus = true;
-        }
+        errorReset();
     }
 
 
-    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();
+    private void reset() {
+        commandList = null;
+
+        stringBuffer.delete(0, stringBuffer.length());
     }
 
 
+    private void error(String msg) {
+        errorMsg.delete(0, errorMsg.length());
+        errorMsg.append(msg);
+    }
 
+    public void errorReset() {
+        this.errorMsg.delete(0, errorMsg.length());
+    }
 
+    @Override
+    public boolean connect() {
+        return true;
+    }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    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();
-//        // 瑙i櫎閿佸畾灞忓箷褰撳墠鐢婚潰
-//        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();
-
-
+    @Override
+    public void close() {
     }
 
 }

--
Gitblit v1.9.1