新设备品牌名,通道问题，

zxl

2025-04-07 23fc1a4a8de125d8bee6fc602e767a5310b89f3e

 ycl-server/src/main/java/com/ycl/api/DH/module/LoginModule.java

@@ -206,7 +206,7 @@
                    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("DHTEXTLeftDown："+osdStr);
                        if (!StringUtils.isEmpty(osdStr)) {
                            osdResult.setOSD4(osdStr);
                        }
@@ -217,7 +217,7 @@
                    for (NET_TITLE_OSD_INFO osd : stuOSD) {
                        String osdStr = null;
                        osdStr = new String(osd.szText, StandardCharsets.UTF_8).trim();
                        log.error("TEXT："+osdStr);
                        log.error("DHTEXTRightDown："+osdStr);
                        if (!StringUtils.isEmpty(osdStr)) {
                            if (osdStr.contains("|")) {
                                String[] osdNames = osdStr.split("\\|");
@@ -253,24 +253,46 @@
     * @param loginId
     * @return
     */
    public static OSDResult getOsdOld(String serialNumber, LLong loginId) {
    public static OSDResult getOsdOld(String moName,String serialNumber, LLong loginId) {
        OSDResult result = new OSDResult();
        NetSDKLib.NET_OSD_CUSTOM_TITLE osdInfo4 = new NetSDKLib.NET_OSD_CUSTOM_TITLE();
        osdInfo4.emOsdBlendType = NetSDKLib.NET_EM_OSD_BLEND_TYPE.NET_EM_OSD_BLEND_TYPE_MAIN;
        NetSDKLib.NET_OSD_CUSTOM_TITLE reserve4 = new NetSDKLib.NET_OSD_CUSTOM_TITLE();
        osdInfo4.write();
        boolean e = false;
        e = netsdk.CLIENT_GetConfig(loginId, NET_EM_CFG_CUSTOMTITLE, 0, osdInfo4.getPointer(), osdInfo4.size(), 3000, reserve4.getPointer());
        if (!e) {
            log.error("e为空,尝试另一个通道");
        if (moName.startsWith("DX_R2")){ //判断设备是否是DX_R2开头
            if (serialNumber.charAt(ApiConstants.SerialNumber_Channel) == ApiConstants.SerialNumber_All) {
            e = netsdk.CLIENT_GetConfig(loginId, NET_EM_CFG_CUSTOMTITLE, 0, osdInfo4.getPointer(), osdInfo4.size(), 3000, reserve4.getPointer());
                }
            else if (serialNumber.charAt(ApiConstants.SerialNumber_Channel) == ApiConstants.SerialNumber_Detail) {
            e = netsdk.CLIENT_GetConfig(loginId, NET_EM_CFG_CUSTOMTITLE, 1, osdInfo4.getPointer(), osdInfo4.size(), 3000, reserve4.getPointer());
            }
            if (!e) {
                log.error("e为空");
            }
        }else if(moName.startsWith("DX_RD")){ //判断设备是否是DX_RD开头
            if (serialNumber.charAt(ApiConstants.SerialNumber_Channel) == ApiConstants.SerialNumber_All) {
                e = netsdk.CLIENT_GetConfig(loginId, NET_EM_CFG_CUSTOMTITLE, 0, osdInfo4.getPointer(), osdInfo4.size(), 3000, reserve4.getPointer());
            }
            else if (serialNumber.charAt(ApiConstants.SerialNumber_Channel) == ApiConstants.SerialNumber_Detail) {
                e = netsdk.CLIENT_GetConfig(loginId, NET_EM_CFG_CUSTOMTITLE, 1, osdInfo4.getPointer(), osdInfo4.size(), 3000, reserve4.getPointer());
            }
            if (!e) {
                log.error("e为空");
            }
        }else {
            e = netsdk.CLIENT_GetConfig(loginId, NET_EM_CFG_CUSTOMTITLE, 0, osdInfo4.getPointer(), osdInfo4.size(), 3000, reserve4.getPointer());
            if (!e) {
                log.error("e为空,尝试另一个通道");
                e = netsdk.CLIENT_GetConfig(loginId, NET_EM_CFG_CUSTOMTITLE, 1, osdInfo4.getPointer(), osdInfo4.size(), 3000, reserve4.getPointer());
            }
        }
        if (e) {
            osdInfo4.read();
            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.error("name:{}", name);
                log.error("DHname:{}", name);
                if (StringUtils.isNotEmpty(name) && name.contains("|")) {
                    String[] osdNames = name.split("\\|");
                    //剔除掉空串
@@ -280,15 +302,30 @@
//                            nonEmptyList.add(osd);
//                        }
//                    }
                    result.setOSD1(osdNames[0]);
                    result.setOSD2(osdNames[1]);
                    result.setOSD3(osdNames[2]);
                    result.setName(osdNames[3]);
                    for (int i = 0; i < osdNames.length; i++) {
                        if (i == 0) {
                            result.setOSD1(osdNames[i]);
                        }
                        if (i == 1) {
                            result.setOSD2(osdNames[i]);
                        }
                        if (i == 2) {
                            result.setOSD3(osdNames[i]);
                        }
                        if (i == 3) {
                            result.setName(osdNames[i]);
                        }
                    }


                }
            }


        } else {
            log.error(serialNumber, "利旧osd为空");
        }

        return result;
    }