From ae0c129c499e7e166399f2e3e2ccca93a076a669 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 03 九月 2024 10:05:36 +0800
Subject: [PATCH] osd等待时间配置,安全资源手动打分

---
 ycl-server/src/main/java/com/ycl/api/DH/module/LoginModule.java |    8 +++++---
 1 files changed, 5 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 136a3d5..ca4fb44 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
@@ -74,7 +74,7 @@
         netsdk.CLIENT_SetAutoReconnect(haveReConnect, null);
 
         //璁剧疆鐧诲綍瓒呮椂鏃堕棿鍜屽皾璇曟鏁帮紝鍙��
-        int waitTime = 5000; //鐧诲綍璇锋眰鍝嶅簲瓒呮椂鏃堕棿璁剧疆涓�5S
+        int waitTime = 3000; //鐧诲綍璇锋眰鍝嶅簲瓒呮椂鏃堕棿璁剧疆涓�5S
         int tryTimes = 1;    //鐧诲綍鏃跺皾璇曞缓绔嬮摼鎺�1娆�
         netsdk.CLIENT_SetConnectTime(waitTime, tryTimes);
 
@@ -82,7 +82,7 @@
         // 璁剧疆鏇村缃戠粶鍙傛暟锛孨ET_PARAM鐨刵Waittime锛宯ConnectTryNum鎴愬憳涓嶤LIENT_SetConnectTime
         // 鎺ュ彛璁剧疆鐨勭櫥褰曡澶囪秴鏃舵椂闂村拰灏濊瘯娆℃暟鎰忎箟鐩稿悓,鍙��
         NetSDKLib.NET_PARAM netParam = new NetSDKLib.NET_PARAM();
-        netParam.nConnectTime = 10000;      // 鐧诲綍鏃跺皾璇曞缓绔嬮摼鎺ョ殑瓒呮椂鏃堕棿
+        netParam.nConnectTime = 3000;      // 鐧诲綍鏃跺皾璇曞缓绔嬮摼鎺ョ殑瓒呮椂鏃堕棿
         netParam.nGetConnInfoTime = 3000;   // 璁剧疆瀛愯繛鎺ョ殑瓒呮椂鏃堕棿
         netParam.nGetDevInfoTime = 3000;//鑾峰彇璁惧淇℃伅瓒呮椂鏃堕棿锛屼负0榛樿1000ms
         netsdk.CLIENT_SetNetworkParam(netParam);
@@ -181,12 +181,13 @@
             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();
+                String position = new String(title.szPositon, StandardCharsets.UTF_8);
                 if("LeftDown".equals(position)) {
                     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).trim();
+                        log.info("TEXT锛�"+osdStr);
                         if (!StringUtils.isEmpty(osdStr)) {
                             osdResult.setOSD4(osdStr);
                         }
@@ -197,6 +198,7 @@
                     for (NET_TITLE_OSD_INFO osd : stuOSD) {
                         String osdStr = null;
                         osdStr = new String(osd.szText, StandardCharsets.UTF_8).trim();
+                        log.info("TEXT锛�"+osdStr);
                         if (!StringUtils.isEmpty(osdStr)) {
                             if(num ==0){
                                 osdResult.setOSD1(osdStr);

--
Gitblit v1.8.0