fuliqi
2025-02-21 64efb660b2c119c00432434c0f651f8996483f18
ycl-server/src/main/java/com/ycl/api/DH/module/LoginModule.java
@@ -217,8 +217,15 @@
                    for (NET_TITLE_OSD_INFO osd : stuOSD) {
                        String osdStr = null;
                        osdStr = new String(osd.szText, StandardCharsets.UTF_8).trim();
//                        log.info("TEXT:"+osdStr);
                        log.error("TEXT:"+osdStr);
                        if (!StringUtils.isEmpty(osdStr)) {
                            if (osdStr.contains("|")) {
                                String[] osdNames = osdStr.split("\\|");
                                osdResult.setOSD1(osdNames[0]);
                                osdResult.setOSD2(osdNames[1]);
                                osdResult.setOSD3(osdNames[2]);
                                osdResult.setName(osdNames[3]);
                            } else {
                            if (num == 0) {
                                osdResult.setOSD1(osdStr);
                            } else if (num == 1) {
@@ -227,6 +234,7 @@
                                osdResult.setOSD3(osdStr);
                            } else if (num == 3) {
                                osdResult.setName(osdStr);
                                }
                            }
                        }
                        num++;
@@ -240,6 +248,7 @@
    /**
     * 针对利旧设备获取OSD的方法
     *
     * @param serialNumber
     * @param loginId
     * @return
@@ -261,7 +270,7 @@
            NetSDKLib.NET_CUSTOM_TITLE_INFO[] stuCustomTitle = osdInfo4.stuCustomTitle;
            for (NetSDKLib.NET_CUSTOM_TITLE_INFO net_custom_title_info : stuCustomTitle) {
                String name = new String(net_custom_title_info.szText, StandardCharsets.UTF_8).trim();
                log.info("name:{}",name);
                log.error("name:{}", name);
                if(StringUtils.isNotEmpty(name) && name.contains("|")){
                    String[] osdNames = name.split("\\|");
                    //剔除掉空串
@@ -285,6 +294,7 @@
    /**
     * 获取单个配置
     *
     * @param hLoginHandle 登陆句柄
     * @param nChn 通道号,-1 表示全通道
     * @param strCmd 配置名称