From ec826d21dbae7d8248f5c2e86c5898259e9b0d8c Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期日, 01 九月 2024 17:56:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/api/DH/module/LoginModule.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/api/DH/module/LoginModule.java b/ycl-server/src/main/java/com/ycl/api/DH/module/LoginModule.java
index 038de80..694047d 100644
--- a/ycl-server/src/main/java/com/ycl/api/DH/module/LoginModule.java
+++ b/ycl-server/src/main/java/com/ycl/api/DH/module/LoginModule.java
@@ -130,7 +130,6 @@
// 鐧婚檰鍙ユ焺
LLong m_hLoginHandle = new LLong(0);
m_hLoginHandle = netsdk.CLIENT_LoginWithHighLevelSecurity(pstInParam, pstOutParam);
- log.info("澶у崕鐧诲綍"+m_hLoginHandle);
if (m_hLoginHandle.longValue() == 0) {
// System.err.printf("Login Device[%s] Port[%d]Failed. %s\n", m_strIp, m_nPort, ToolKits.getErrorCodePrint());
} else {
@@ -187,7 +186,7 @@
NET_TITLE_OSD_INFO[] stuOSD = title.stuOSD;
for (NET_TITLE_OSD_INFO osd : stuOSD) {
String osdStr = null;
- osdStr = new String(osd.szText, StandardCharsets.UTF_8);
+ osdStr = new String(osd.szText, StandardCharsets.UTF_8).trim();
if (!StringUtils.isEmpty(osdStr)) {
osdResult.setOSD4(osdStr);
}
@@ -197,7 +196,7 @@
int num = 0;
for (NET_TITLE_OSD_INFO osd : stuOSD) {
String osdStr = null;
- osdStr = new String(osd.szText, StandardCharsets.UTF_8);
+ osdStr = new String(osd.szText, StandardCharsets.UTF_8).trim();
if (!StringUtils.isEmpty(osdStr)) {
if(num ==0){
osdResult.setOSD1(osdStr);
@@ -207,6 +206,8 @@
osdResult.setOSD3(osdStr);
}else if(num ==3){
osdResult.setName(osdStr);
+ }else if(num ==4){
+ osdResult.setName2(osdStr);
}
}
num++;
--
Gitblit v1.8.0