From bb4c01a00c8203fdadf38aca9290227f6682655f Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 02 九月 2024 17:55:33 +0800
Subject: [PATCH] 宇视OSD打通，OSD整体打通
---
ycl-server/src/main/java/com/ycl/api/YS/lib/NetDEVSDKLib.java | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/api/YS/lib/NetDEVSDKLib.java b/ycl-server/src/main/java/com/ycl/api/YS/lib/NetDEVSDKLib.java
index a14bc35..8ac6b23 100644
--- a/ycl-server/src/main/java/com/ycl/api/YS/lib/NetDEVSDKLib.java
+++ b/ycl-server/src/main/java/com/ycl/api/YS/lib/NetDEVSDKLib.java
@@ -4,7 +4,6 @@
import com.sun.jna.Library;
import com.sun.jna.Native;
import com.sun.jna.Pointer;
-
import com.sun.jna.Structure;
import com.sun.jna.ptr.IntByReference;
import com.sun.jna.ptr.LongByReference;
@@ -130,7 +129,7 @@
* @brief 璁惧鐧诲綍淇℃伅
* @attention
*/
- @Structure.FieldOrder({"byRes", "dwDeviceType" ,"dwLoginProto","dwPort","szIPAddr","szPassword","szUserName"})
+ @Structure.FieldOrder({"szIPAddr", "dwPort" ,"szUserName","szPassword","dwLoginProto","dwDeviceType","byRes"})
public class NETDEV_DEVICE_LOGIN_INFO_S extends Structure
{
public byte[] szIPAddr = new byte[NETDEV_LEN_260]; /* IP鍦板潃/鍩熷悕 */
@@ -147,7 +146,7 @@
* @brief 瀹夊叏鐧诲綍淇℃伅
* @attention
*/
- @Structure.FieldOrder({"byRes", "dwSELogCount","dwSELogTime"})
+ @Structure.FieldOrder({"dwSELogCount", "dwSELogTime","byRes"})
public class NETDEV_SELOG_INFO_S extends Structure {
public int dwSELogCount; /* 瀹夊叏鐧诲綍娆℃暟 */
public int dwSELogTime; /* 瀹夊叏鐧诲綍鏃堕棿 */
@@ -4962,6 +4961,8 @@
* @brief 瑙嗛閫氶亾璇︾粏淇℃伅 缁撴瀯浣撳畾涔� Structure definition
* @attention 鏃� None
*/
+ @Structure.FieldOrder({"dwChannelID","bPtzSupported","enStatus","dwStreamNum","enChannelType","enVideoFormat","enAddressType", "szIPAddr","dwPort",
+ "szChnName","allowDistribution","dwDeviceType","szManufacturer","szDeviceModel","udwAccessProtocol","pstExtendedInformation","byRes"})
public class NETDEV_VIDEO_CHL_DETAIL_INFO_EX_S extends Structure {
public int dwChannelID; /* 閫氶亾ID Channel ID */
public int bPtzSupported; /* 鏄惁鏀寔浜戝彴 Whether ptz is supported */
@@ -5232,6 +5233,7 @@
* @brief 瓒呮椂鏃堕棿 缁撴瀯浣撳畾涔� Timeout structure definition
* @attention
*/
+ @Structure.FieldOrder({"dwRevTimeOut", "dwFileReportTimeOut","byRes"})
public class NETDEV_REV_TIMEOUT_S extends Structure {
public int dwRevTimeOut; /* 璁剧疆鎺ユ敹瓒呮椂鏃堕棿 Set timeout for receiving */
public int dwFileReportTimeOut; /* 璁剧疆鏂囦欢鎿嶄綔瓒呮椂鏃堕棿 Set timeout for file operation */
@@ -5988,7 +5990,7 @@
* @brief OSD鏃堕棿閰嶇疆淇℃伅 OSD time configuration information
* @attention 鏃� None
*/
- @Structure.FieldOrder({"bEnableFlag", "bWeekEnableFlag","stAreaScope","udwDateFormat","udwTimeFormat"})
+ @Structure.FieldOrder({"bEnableFlag", "bWeekEnableFlag","stAreaScope","udwTimeFormat","udwDateFormat"})
public class NETDEV_OSD_TIME_S extends Structure {
public int bEnableFlag; /** 鏃堕棿OSD浣胯兘, BOOL_TRUE涓轰娇鑳�,BOOL_FALSE涓洪潪浣胯兘 * Enable time OSD, BOOL_TRUE means enable and BOOL_FALSE means disable */
public int bWeekEnableFlag; /** 鏄惁鏄剧ず鏄熸湡(棰勭暀) * Display week or not (reserved) */
@@ -6005,7 +6007,7 @@
* @brief OSD瀛楃鍙犲姞淇℃伅 OSD text overlay information
* @attention
*/
- @Structure.FieldOrder({"bEnableFlag", "byRes","stAreaScope","szOSDText"})
+ @Structure.FieldOrder({"bEnableFlag", "stAreaScope","szOSDText","byRes"})
public class NETDEV_OSD_TEXT_OVERLAY_S extends Structure {
public int bEnableFlag; /** OSD瀛楃鍙犲姞浣胯兘, BOOL_TRUE涓轰娇鑳�,BOOL_FALSE涓洪潪浣胯兘 * Enable OSD text overlay, BOOL_TRUE means enable and BOOL_FALSE means disable */
public NETDEV_AREA_SCOPE_S stAreaScope; /** OSD瀛楃鍙犲姞鍖哄煙鍧愭爣 * OSD text overlay area coordinates */
@@ -6020,7 +6022,7 @@
* @brief 閫氶亾OSD鐨勫熀鏈睘鎬т俊鎭� Basic channel OSD information
* @attention
*/
- @Structure.FieldOrder({"astTextOverlay", "stNameOSD","stTimeOSD","wTextNum"})
+ @Structure.FieldOrder({"stTimeOSD", "stNameOSD","wTextNum","astTextOverlay"})
public class NETDEV_VIDEO_OSD_CFG_S extends Structure {
public NETDEV_OSD_TIME_S stTimeOSD; /* 閫氶亾鐨勬椂闂碠SD淇℃伅 Information of channel time OSD */
public NETDEV_OSD_TEXT_OVERLAY_S stNameOSD; /* 閫氶亾鐨勫悕绉癘SD淇℃伅 Information of channel name OSD */
@@ -7177,6 +7179,7 @@
* @brief 鏃堕棿閰嶇疆 缁撴瀯浣撳畾涔� Time configuration structure definition
* @attention
*/
+ @Structure.FieldOrder({"dwMonth", "dwWeekInMonth" ,"dwDayInWeek","dwHour"})
public class NETDEV_TIME_DST_S extends Structure{
public int dwMonth; /* 鏈�(1~12) Month(1~12)*/
public int dwWeekInMonth; /* 姣忔湀鐨勭N鍛紙1~5锛� 1 for the first week and 5 for the last week in the month */
@@ -7188,6 +7191,7 @@
* @brief 鏃堕棿閰嶇疆 缁撴瀯浣撳畾涔� Time configuration structure definition
* @attention
*/
+ @Structure.FieldOrder({"stBeginTime", "stEndTime" ,"dwOffsetTime"})
public class NETDEV_TIME_DST_CFG_S extends Structure{
public NETDEV_TIME_DST_S stBeginTime; /* 澶忎护鏃跺紑濮嬫椂闂� 鍙傝鏋氫妇#NETDEV_TIME_DST_S DST begin time see enumeration NETDEV_TIME_DST_S */
public NETDEV_TIME_DST_S stEndTime; /* 澶忎护鏃剁粨鏉熸椂闂� 鍙傝鏋氫妇#NETDEV_TIME_DST_S DST end time see enumeration NETDEV_TIME_DST_S */
@@ -7198,6 +7202,7 @@
* @brief 鏃堕棿鍙傛暟 缁撴瀯浣撳畾涔� Time parameter Structure definition
* @attention 鏃� None
*/
+ @Structure.FieldOrder({"dwYear", "dwMonth" ,"dwDay","dwHour","dwMinute","dwSecond"})
public class NETDEV_TIME_S extends Structure{
public int dwYear; /* 骞� Year */
public int dwMonth; /* 鏈� Month */
@@ -7211,6 +7216,7 @@
* @brief 鏃堕棿閰嶇疆 缁撴瀯浣撳畾涔� Time configuration structure definition
* @attention
*/
+ @Structure.FieldOrder({"dwTimeZone", "stTime" ,"bEnableDST","stTimeDSTCfg","udwDateFormat","udwHourFormat","byRes"})
public class NETDEV_TIME_CFG_S extends Structure{
public int dwTimeZone; /* 鏃跺尯 鍙傝鏋氫妇# NETDEV_TIME_ZONE_E Time zone, see enumeration #NETDEV_TIME_ZONE_E */
public NETDEV_TIME_S stTime; /* 鏃堕棿 Time */
@@ -10904,6 +10910,7 @@
* @return TRUE琛ㄧず鎴愬姛,鍏朵粬琛ㄧず澶辫触 TRUE means success, and any other value means failure.
* @note
*/
+
public boolean NETDEV_SetConnectTime(int dwWaitTime, int dwTrytimes);
/**
--
Gitblit v1.8.0