From 64efb660b2c119c00432434c0f651f8996483f18 Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期五, 21 二月 2025 15:51:13 +0800 Subject: [PATCH] OSD大华数据格式+数据中心重点标签统计数 --- ycl-server/src/main/java/com/ycl/api/YS/lib/NetDEVSDKLib.java | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 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 aa36f49..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 @@ -1,5 +1,6 @@ package com.ycl.api.YS.lib; + import com.sun.jna.Library; import com.sun.jna.Native; import com.sun.jna.Pointer; @@ -128,6 +129,7 @@ * @brief 璁惧鐧诲綍淇℃伅 * @attention */ + @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鍦板潃/鍩熷悕 */ @@ -144,6 +146,7 @@ * @brief 瀹夊叏鐧诲綍淇℃伅 * @attention */ + @Structure.FieldOrder({"dwSELogCount", "dwSELogTime","byRes"}) public class NETDEV_SELOG_INFO_S extends Structure { public int dwSELogCount; /* 瀹夊叏鐧诲綍娆℃暟 */ public int dwSELogTime; /* 瀹夊叏鐧诲綍鏃堕棿 */ @@ -4958,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 */ @@ -5228,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 */ @@ -5974,6 +5980,7 @@ * @brief 鍖哄煙 Area * @attention 鏃� None */ + @Structure.FieldOrder({"dwLocateX", "dwLocateY"}) public class NETDEV_AREA_SCOPE_S extends Structure { public int dwLocateX; /** 椤剁偣x鍧愭爣鍊糩0,10000] * Coordinates of top point x [0,10000] */ public int dwLocateY; /** 椤剁偣y鍧愭爣鍊糩0,10000] * Coordinates of top point y [0,10000] */ @@ -5983,29 +5990,39 @@ * @brief OSD鏃堕棿閰嶇疆淇℃伅 OSD time configuration information * @attention 鏃� None */ + @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) */ public NETDEV_AREA_SCOPE_S stAreaScope; /** 鍖哄煙鍧愭爣 * Area coordinates */ public int udwTimeFormat; /** 鏃堕棿OSD鏃堕棿鏍煎紡,璇﹁ NETDEV_OSD_TIME_FORMAT_CAP_E * Time OSD format, see NETDEV_OSD_TIME_FORMAT_E */ public int udwDateFormat; /** 鏃ユ湡OSD鏃堕棿鏍煎紡,璇﹁ NETDEV_OSD_DATE_FORMAT_CAP_E * Date OSD format, see NETDEV_OSD_TIME_FORMAT_E */ + public NETDEV_OSD_TIME_S() { + // 鍒濆鍖栦唬鐮� + } + } /** * @brief OSD瀛楃鍙犲姞淇℃伅 OSD text overlay information * @attention */ + @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 */ public byte[] szOSDText=new byte[NETDEV_OSD_TEXT_MAX_LEN]; /** OSD瀛楃鍙犲姞鍚嶇О瀛楃涓� * OSD text overlay name strings */ public byte[] byRes=new byte[4]; /* 淇濈暀瀛楁 Reserved */ + public NETDEV_OSD_TEXT_OVERLAY_S() { + // 鍒濆鍖栦唬鐮� + } } /** * @brief 閫氶亾OSD鐨勫熀鏈睘鎬т俊鎭� Basic channel OSD information * @attention */ + @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 */ @@ -7162,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 */ @@ -7173,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 */ @@ -7183,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 */ @@ -7196,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 */ @@ -10889,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