zxl
2025-03-11 5c82602d54928cc414177084ab6d81cef4c11d15
ycl-server/src/main/java/com/ycl/api/YS/YSApi.java
@@ -98,11 +98,20 @@
            log.error("YSname:{}" , name);
            if (StringUtils.isNotEmpty(name) && name.contains("|")){
                String[] osdNames = name.split("\\|");
                osdResult.setOSD1(osdNames[0]);
                osdResult.setOSD2(osdNames[1]);
                osdResult.setOSD3(osdNames[2]);
                osdResult.setName(osdNames[3]);
                osdResult.setOSD4(osdNames[4]);
                for (int i = 0; i < osdNames.length; i++) {
                    if (i == 0) {
                        osdResult.setOSD1(osdNames[i]);
                    }
                    if (i == 1) {
                        osdResult.setOSD2(osdNames[i]);
                    }
                    if (i == 2) {
                        osdResult.setOSD3(osdNames[i]);
                    }
                    if (i == 3) {
                        osdResult.setName(osdNames[i]);
                    }
                }
            }else {
                //省份
                osdResult.setOSD1(name);
@@ -110,7 +119,7 @@
                int num = 0;
                for (NetDEVSDKLib.NETDEV_OSD_TEXT_OVERLAY_S osd : stOSDInfo.astTextOverlay) {
                    String text = new String(osd.szOSDText, StandardCharsets.UTF_8).trim();
//                    log.info("YSnum:"+num+",YStexr:"+text);
                    log.info("YSnum:"+num+",YStexr:"+text);
                    if (num == 0) {
                        osdResult.setOSD2(text);
                    } else if (num == 1) {