From 4d25380fe077f82b45f00e83ecb6d93e76c95554 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 29 八月 2024 16:27:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/api/DH/module/LoginModule.java | 80 +++++++++++++++++++++++++++------------
1 files changed, 55 insertions(+), 25 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 3b81c95..6064fcb 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
@@ -2,20 +2,24 @@
import com.sun.jna.Native;
import com.sun.jna.Pointer;
+import com.sun.jna.ptr.IntByReference;
import com.ycl.api.DH.lib.NetSDKLib;
import com.ycl.api.DH.lib.NetSDKLib.LLong;
import com.ycl.api.DH.lib.NetSDKLib.NET_IN_LOGIN_WITH_HIGHLEVEL_SECURITY;
import com.ycl.api.DH.lib.NetSDKLib.NET_OUT_LOGIN_WITH_HIGHLEVEL_SECURITY;
import com.ycl.api.DH.lib.ToolKits;
-import com.ycl.api.DH.lib.structure.NET_CFG_GBMODE_INFO;
-import com.ycl.api.DH.lib.structure.NET_GBMODE_CUSTOMTITLE_INFO;
-import com.ycl.api.DH.lib.structure.NET_TITLE_OSD_INFO;
+import com.ycl.api.DH.lib.structure.*;
+import com.ycl.platform.domain.result.OSDResult;
+import com.ycl.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
import java.io.File;
import java.io.UnsupportedEncodingException;
import java.nio.charset.StandardCharsets;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.util.Arrays;
+import java.util.Date;
import static com.ycl.api.DH.lib.NetSDKLib.NET_EM_OSD_BLEND_TYPE.NET_EM_OSD_BLEND_TYPE_MAIN;
import static com.ycl.api.DH.lib.enumeration.NET_EM_CFG_OPERATE_TYPE.NET_EM_CFG_CUSTOMTITLE;
@@ -159,43 +163,69 @@
return bRet;
}
- public static String getOsdTime() {
+ public static OSDResult getOsd() {
+ OSDResult osdResult = new OSDResult();
NetSDKLib.NET_TIME deviceTime = new NetSDKLib.NET_TIME();
-
if (!netsdk.CLIENT_QueryDeviceTime(m_hLoginHandle, deviceTime, 3000)) {
- System.err.println("CLIENT_QueryDeviceTime Failed!" + ToolKits.getErrorCodePrint());
+ log.error("CLIENT_QueryDeviceTime Failed!" + ToolKits.getErrorCodePrint());
return null;
}
- NetSDKLib.NET_OSD_CUSTOM_TITLE custom_title = new NetSDKLib.NET_OSD_CUSTOM_TITLE();
+ Date checkTime = new Date();
+ osdResult.setCheckTime(checkTime);
String date = deviceTime.toStringTime();
date = date.replace("/", "-");
- log.info("鎴愬姛鑾峰彇妫�娴媜sd鏃堕棿" + date);
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ try {
+ Date time = simpleDateFormat.parse(date);
+ osdResult.setOsdTime(time);
+ } catch (ParseException e) {
+ log.error("鏃堕棿瑙ｆ瀽澶辫触");
+ }
+ NET_CFG_GBMODE_INFO reserve = new NET_CFG_GBMODE_INFO();
+
NET_CFG_GBMODE_INFO osdInfo = new NET_CFG_GBMODE_INFO();
osdInfo.write();
- Pointer pointer = osdInfo.getPointer();
- boolean b = netsdk.CLIENT_GetConfig(m_hLoginHandle, NET_EM_CFG_CUSTOMTITLE, 0, custom_title.getPointer(), 1024, 3000, null);
-// log.info("osd缁撴灉,鑷畾涔夋爣棰樹俊鎭湁鏁堜釜鏁帮細{}锛屾槸鍚﹀彔鍔犲埌棰勮鏄剧ず{}锛屾槸鍚﹀彔鍔犲埌涓荤爜娴佽棰戠紪鐮亄}" ,osdInfo.nCustomTitleNum,osdInfo.bPreviewBlend,osdInfo.bEncodeBlend);
- if(!b){
- log.info("璋冪敤澶辫触");
- }else {
+ boolean b = netsdk.CLIENT_GetConfig(m_hLoginHandle, NET_EM_CFG_GBMODE, 0, osdInfo.getPointer(), osdInfo.size(), 3000, reserve.getPointer());
+ if (!b) {
+ log.error("CLIENT_GetConfig Failed!" + ToolKits.getErrorCodePrint());
+ return null;
+ } else {
osdInfo.read();
- log.info("osd缁撴灉,鑷畾涔夋爣棰樹俊鎭湁鏁堜釜鏁帮細{}锛屾槸鍚﹀彔鍔犲埌棰勮鏄剧ず{}锛屾槸鍚﹀彔鍔犲埌涓荤爜娴佽棰戠紪鐮亄}" ,osdInfo.nCustomTitleNum,osdInfo.bPreviewBlend,osdInfo.bEncodeBlend);
NET_GBMODE_CUSTOMTITLE_INFO[] stuCustomTitle = osdInfo.stuCustomTitle;
for (NET_GBMODE_CUSTOMTITLE_INFO title : stuCustomTitle) {
- NET_TITLE_OSD_INFO[] stuOSD = title.stuOSD;
- for (NET_TITLE_OSD_INFO osd : stuOSD) {
- String osdStr = null;
- log.info("----->"+ Arrays.toString(osd.szText));
- try {
- osdStr = new String(osd.szText, "GBK");
- } catch (UnsupportedEncodingException e) {
+ String position = new String(title.szPositon, StandardCharsets.UTF_8).trim();
+ 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);
+ if (!StringUtils.isEmpty(osdStr)) {
+ osdResult.setOSD4(osdStr);
+ }
}
- log.info("osd浜岀骇鏂囨湰" + osd+osdStr);
+ }else if("RightDown".equals(position)){
+ NET_TITLE_OSD_INFO[] stuOSD = title.stuOSD;
+ int num = 0;
+ for (NET_TITLE_OSD_INFO osd : stuOSD) {
+ String osdStr = null;
+ osdStr = new String(osd.szText, StandardCharsets.UTF_8);
+ if (!StringUtils.isEmpty(osdStr)) {
+ if(num ==0){
+ osdResult.setOSD1(osdStr);
+ }else if(num ==1){
+ osdResult.setOSD2(osdStr);
+ }else if(num ==2){
+ osdResult.setOSD3(osdStr);
+ }else if(num ==3){
+ osdResult.setName(osdStr);
+ }
+ }
+ num++;
+ }
}
}
}
-
- return date;
+ return osdResult;
}
}
--
Gitblit v1.8.0