Merge remote-tracking branch 'origin/tzhtwcs' into tzhtwcs

野心家

2024-10-25 1a56f6f4a0c2b8fc61bfde8bd3418a9731b87647

 src/main/java/com/zy/core/thread/LedThread.java

@@ -52,8 +52,8 @@
    public LedThread(Slave slave) {
        this.slave = slave;
        try {
            Bx5GEnv.initial(3000);
            screen = new Bx5GScreenClient("my");
//            Bx5GEnv.initial(3000);
//            screen = new Bx5GScreenClient("my");
        } catch (Exception e) {
            e.printStackTrace();
            log.info("led连接构造器错误 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
@@ -63,8 +63,8 @@
    @Override
    @SuppressWarnings({"InfiniteLoopStatement", "unchecked"})
    public void run() {
        connect();
        close();
//        connect();
//        close();
        while (true) {
            try {
                Task task = MessageQueue.poll(SlaveType.Led, slave.getId());
@@ -73,6 +73,10 @@
                        // 写数据
                        case 1:
                            write((List<LedCommand>)task.getData());
                            break;
                        // 写数据
                        case 9:
                            write9((List<LedCommand>)task.getData());
                            break;
                        // 复位
                        case 2:
@@ -130,6 +134,40 @@
//                    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 write9(List<LedCommand> list) throws Bx5GException {
        if (!connect()) {
            return;
        }
        pf = new ProgramBxFile( 0, screen.getProfile());
        pf.setFrameShow(false);
        // 分别输入X，Y，width，height
        area = new TextCaptionBxArea( 0,0,96,48, screen.getProfile());
        // 创建一个数据页
        TextBxPage page = new TextBxPage();
        for (LedCommand command : list) {
            page.newLine(command.getTitle());
            page.newLine("\n");
        }

@@ -211,8 +249,11 @@
            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.getMatnr()).append("\n");
                    sb.append("名称：").append(matDto.getMaknx()).append("\n");
                    sb.append("数量：").append(matDto.getCount()).append("\n");
                    sb.append("规格：").append(matDto.getSpecs()).append("\n");
                    sb.append("图号：").append(matDto.getModel()).append("\n");
                }
            }
            sb.append("\n");
@@ -243,22 +284,22 @@
    @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());
        }
//        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;
    }

    @Override
    public void close() {
        screen.disconnect();
//        screen.disconnect();
    }