From ef0d4280cfb88779599282b27c505a0981a69f5f Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 26 三月 2021 12:30:18 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/LedThread.java |  139 +++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 123 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/LedThread.java b/src/main/java/com/zy/core/thread/LedThread.java
index bca7310..d2a5d83 100644
--- a/src/main/java/com/zy/core/thread/LedThread.java
+++ b/src/main/java/com/zy/core/thread/LedThread.java
@@ -1,10 +1,16 @@
 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;
@@ -14,6 +20,9 @@
 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
@@ -24,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<>();
+//    private boolean resetStatus = false;    //  澶嶄綅鐘舵��
+
+    // 鏄剧ず鍣�
+    private StringBuffer stringBuffer = new StringBuffer();
 
     public LedThread(Slave slave) {
         this.slave = slave;
         try {
             Bx5GEnv.initial(3000);
-            screen = new Bx5GScreenClient("MyScreen");
+            screen = new Bx5GScreenClient("my");
+            screen.turnOn();
         } catch (Exception e) {
             e.printStackTrace();
             log.info("led杩炴帴鏋勯�犲櫒閿欒 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
@@ -37,15 +55,28 @@
     }
 
     @Override
-    @SuppressWarnings("InfiniteLoopStatement")
+    @SuppressWarnings({"InfiniteLoopStatement", "unchecked"})
     public void run() {
-        connect();
+//        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;
+                        // 澶嶄綅
+                        case 2:
+                            reset();
+                            break;
+                        default:
+                            break;
+                    }
+                }
 
-
-
-                Thread.sleep(500);
+                Thread.sleep(1000);
             } catch (Exception e) {
                 e.printStackTrace();
             }
@@ -57,8 +88,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());
@@ -74,6 +104,78 @@
     }
 
 
+    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;
+
+        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");
+            if (!command.isEmptyMk()) {
+                for (MatDto matDto : command.getMatDtos()) {
+                    sb.append(matDto.getMaknx() + "銆愭暟閲�" + matDto.getCount() +"銆�").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;
+//        }
+    }
 
 
     public static void main(String[] args) throws Exception {
@@ -88,20 +190,25 @@
         ProgramBxFile pf = new ProgramBxFile( 0, screen.getProfile());
         pf.setFrameShow(false);
         // 鍒嗗埆杈撳叆X锛孻锛寃idth锛宧eigth
-        TextCaptionBxArea area = new TextCaptionBxArea( 100,50,800,600,screen.getProfile());
+        TextCaptionBxArea area = new TextCaptionBxArea( 0,0,192,128,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锛�");
+        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[2]);
+        page.setDisplayStyle(styles[6]);
         area.addPage(page);
         pf.addArea( area );
         // 鏇存柊鑺傜洰

--
Gitblit v1.9.1