From e2edaf30f4bf2213fe55c9817980001a1ea23e9f Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期三, 19 二月 2025 09:26:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ycl-server/src/main/java/com/ycl/api/YS/YSApi.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/api/YS/YSApi.java b/ycl-server/src/main/java/com/ycl/api/YS/YSApi.java
index 6843e77..16b1386 100644
--- a/ycl-server/src/main/java/com/ycl/api/YS/YSApi.java
+++ b/ycl-server/src/main/java/com/ycl/api/YS/YSApi.java
@@ -6,6 +6,7 @@
import com.ycl.api.YS.lib.NetDEVSDKLib;
import com.ycl.api.YS.login.Login;
import com.ycl.platform.domain.result.OSDResult;
+import enumeration.DeviceType;
import lombok.extern.slf4j.Slf4j;
import java.nio.charset.StandardCharsets;
@@ -91,11 +92,13 @@
}
stOSDInfo.read();
//鐪佷唤
- String name = new String(stOSDInfo.stNameOSD.szOSDText, StandardCharsets.UTF_8);
+ String name = new String(stOSDInfo.stNameOSD.szOSDText, StandardCharsets.UTF_8).trim();
osdResult.setOSD1(name);
+// log.info("name"+name);
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("num:"+num+",texr:"+text);
if (num == 0) {
osdResult.setOSD2(text);
} else if (num == 1) {
@@ -109,6 +112,7 @@
}
//鐧诲嚭
YSInit.netdevsdk.NETDEV_Logout(lpUserID);
+ osdResult.setDeviceBrand(DeviceType.YS.getType());
return osdResult;
} else {
// log.error("ip:"+ip+",error code" + YSInit.netdevsdk.NETDEV_GetLastError());
--
Gitblit v1.8.0