From c6976365d5bfb39a32db8b541b1fe3ceb30c7826 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 14 二月 2025 10:03:17 +0800
Subject: [PATCH] Merge branch 'dev'
---
ycl-server/src/main/java/com/ycl/api/DH/module/LoginModule.java | 29 ++++++++++-------------------
1 files changed, 10 insertions(+), 19 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 d38155f..eb030f7 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
@@ -197,19 +197,10 @@
// log.error("CLIENT_GetConfig Failed!" + ToolKits.getErrorCodePrint());
return null;
} else {
-
osdInfo.read();
NET_GBMODE_CUSTOMTITLE_INFO[] stuCustomTitle = osdInfo.stuCustomTitle;
for (NET_GBMODE_CUSTOMTITLE_INFO title : stuCustomTitle) {
String position = new String(title.szPositon, StandardCharsets.UTF_8).trim();
- NET_TITLE_OSD_INFO[] stuOSD1 = title.stuOSD;
- for (NET_TITLE_OSD_INFO osd : stuOSD1) {
- String osdStr = null;
- osdStr = new String(osd.szText, StandardCharsets.UTF_8).trim();
- if (!StringUtils.isEmpty(osdStr)) {
- osdResult.setOSD4(osdStr);
- }
- }
if ("LeftDown".equals(position)) {
NET_TITLE_OSD_INFO[] stuOSD = title.stuOSD;
for (NET_TITLE_OSD_INFO osd : stuOSD) {
@@ -274,16 +265,16 @@
if(StringUtils.isNotEmpty(name) && name.contains("|")){
String[] osdNames = name.split("\\|");
//鍓旈櫎鎺夌┖涓�
- List<String> nonEmptyList = new ArrayList<>();
- for (String osd : osdNames) {
- if (StringUtils.isNotEmpty(osd)) {
- nonEmptyList.add(osd);
- }
- }
- result.setOSD1(nonEmptyList.get(0));
- result.setOSD2(nonEmptyList.get(1));
- result.setOSD3(nonEmptyList.get(2));
- result.setName(nonEmptyList.get(3));
+// List<String> nonEmptyList = new ArrayList<>();
+// for (String osd : osdNames) {
+// if (StringUtils.isNotEmpty(osd)) {
+// nonEmptyList.add(osd);
+// }
+// }
+ result.setOSD1(osdNames[0]);
+ result.setOSD2(osdNames[1]);
+ result.setOSD3(osdNames[2]);
+ result.setName(osdNames[3]);
}
}
}else {
--
Gitblit v1.8.0