From b14531e3b850fe6d2fa916ba7b88b3e2bd2ff30a Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 11 九月 2024 16:47:48 +0800
Subject: [PATCH] OSD加标签
---
ycl-server/src/main/java/com/ycl/api/YS/YSApi.java | 28 +++++++++++++---------------
1 files changed, 13 insertions(+), 15 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 e36f651..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
@@ -3,21 +3,15 @@
import com.sun.jna.Pointer;
import com.sun.jna.ptr.IntByReference;
-import com.ycl.api.DH.lib.ToolKits;
-import com.ycl.api.DH.utils.DHApi;
import com.ycl.api.YS.lib.NetDEVSDKLib;
import com.ycl.api.YS.login.Login;
-import com.ycl.api.YS.util.Common;
import com.ycl.platform.domain.result.OSDResult;
-import com.ycl.utils.StringUtils;
+import enumeration.DeviceType;
import lombok.extern.slf4j.Slf4j;
-import javax.swing.*;
-import javax.swing.table.DefaultTableModel;
import java.nio.charset.StandardCharsets;
-import java.text.ParseException;
import java.text.SimpleDateFormat;
-import java.util.Vector;
+import java.util.Date;
import static com.ycl.api.YS.lib.NetDEVSDKLib.NETDEV_LOGIN_PROTO_E.NETDEV_LOGIN_PROTO_ONVIF;
@@ -25,7 +19,6 @@
public class YSApi {
public static OSDResult getOsd(String ip, String userName, String password) {
- log.info("ip:{},鐢ㄦ埛:{}锛屽瘑鐮�:{}", ip, userName, password);
//鐧诲綍
NetDEVSDKLib.NETDEV_DEVICE_LOGIN_INFO_S stDevLoginInfo = new NetDEVSDKLib.NETDEV_DEVICE_LOGIN_INFO_S();
NetDEVSDKLib.NETDEV_SELOG_INFO_S stSELogInfo = new NetDEVSDKLib.NETDEV_SELOG_INFO_S();
@@ -44,15 +37,17 @@
NetDEVSDKLib.NETDEV_VIDEO_CHL_DETAIL_INFO_EX_S[] stVideoChlList = (NetDEVSDKLib.NETDEV_VIDEO_CHL_DETAIL_INFO_EX_S[]) new NetDEVSDKLib.NETDEV_VIDEO_CHL_DETAIL_INFO_EX_S().toArray(nMaxChlCount);
boolean bRe = YSInit.netdevsdk.NETDEV_QueryVideoChlDetailListEx(lpUserID, dwChlCount, stVideoChlList);
if (!bRe) {
- log.error("error code" + YSInit.netdevsdk.NETDEV_GetLastError());
+// log.error("error code" + YSInit.netdevsdk.NETDEV_GetLastError());
return null;
}
//鑾峰彇鏃堕棿
NetDEVSDKLib.NETDEV_TIME_CFG_S stTimeCfg = new NetDEVSDKLib.NETDEV_TIME_CFG_S();
stTimeCfg.write();
boolean bRetime = NetDemo.netdevsdk.NETDEV_GetSystemTimeCfg(lpUserID, stTimeCfg);
+ Date checkTime = new Date();
+ osdResult.setCheckTime(checkTime);
if (!bRetime) {
- log.error("error code" + YSInit.netdevsdk.NETDEV_GetLastError());
+// log.error("error code" + YSInit.netdevsdk.NETDEV_GetLastError());
return null;
} else {
stTimeCfg.read();
@@ -82,7 +77,7 @@
try {
osdResult.setOsdTime(format.parse(strTime));
} catch (Exception e) {
- log.error(ip + "鏃堕棿瑙ｆ瀽鏈夎");
+// log.error(ip + "鏃堕棿瑙ｆ瀽鏈夎");
}
}
//鑾峰彇osd
@@ -92,16 +87,18 @@
boolean bRet = YSInit.netdevsdk.NETDEV_GetDevConfig(lpUserID, stVideoChlList[0].dwChannelID, NetDEVSDKLib.NETDEV_CONFIG_COMMAND_E.NETDEV_GET_OSDCFG, stOSDInfo.getPointer(), 616, dwBytesReturned);
if (!bRet) {
- log.error("error code" + YSInit.netdevsdk.NETDEV_GetLastError());
+// log.error("error code" + YSInit.netdevsdk.NETDEV_GetLastError());
return null;
}
stOSDInfo.read();
//鐪佷唤
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) {
@@ -115,11 +112,12 @@
}
//鐧诲嚭
YSInit.netdevsdk.NETDEV_Logout(lpUserID);
+ osdResult.setDeviceBrand(DeviceType.YS.getType());
return osdResult;
} else {
- log.error("error code" + YSInit.netdevsdk.NETDEV_GetLastError());
+// log.error("ip:"+ip+",error code" + YSInit.netdevsdk.NETDEV_GetLastError());
+ return null;
}
- return null;
}
public static void demo() {
--
Gitblit v1.8.0