From 3df04e32e4190bfe8a74998f19fedbbfa9747f29 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 04 九月 2024 05:49:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/api/YS/YSApi.java | 2 ++
1 files changed, 2 insertions(+), 0 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 a68216d..6ae2f35 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
@@ -94,9 +94,11 @@
//鐪佷唤
String name = new String(stOSDInfo.stNameOSD.szOSDText, StandardCharsets.UTF_8);
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) {
--
Gitblit v1.8.0