Merge branch 'xgmwcs' of http://47.97.1.152:5880/r/zy-wcs into xgmwcs

luxiaotao1123

2022-03-01 adbda4e54b89ea45d42fbb5079c93023dc702520

 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，Y，width，height
        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) {
@@ -111,7 +107,7 @@
        }

        // 设置字体
        page.setFont(new Font("宋体",Font.PLAIN,14));
        page.setFont(new Font("宋体",Font.PLAIN,12));
        // 设置文本颜色
        page.setForeground(Color.red);
        // 设置显示特技为快速打出
@@ -119,36 +115,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，Y，width，height
        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 +129,13 @@
//        if (!connect()) {
//            return;
//        }
//        if (resetStatus) {
//            return;
//        }
        pf = new ProgramBxFile( 0, screen.getProfile());
        pf.setFrameShow(false);
        // 分别输入X，Y，width，height
        area = new TextCaptionBxArea( 0,0,192,128, screen.getProfile());
        area = new TextCaptionBxArea( 0,0,96,48, screen.getProfile());
        // 创建一个数据页
        TextBxPage page = new TextBxPage();

@@ -175,11 +151,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 +164,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 +180,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;
    }

@@ -219,7 +201,7 @@
        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 +214,7 @@
            ProgramBxFile pf = new ProgramBxFile( 0, screen.getProfile());
            pf.setFrameShow(false);
            // 分别输入X，Y，width，heigth
            TextCaptionBxArea area = new TextCaptionBxArea(  0,0,192,128,screen.getProfile());
            TextCaptionBxArea area = new TextCaptionBxArea(  0,0,192,96,screen.getProfile());

            // 创建一个数据页
            // 第一行数据
@@ -240,7 +222,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 +232,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);
            }
        }

        // 继开与控制器之间的链接