From 10f65333417f064377b01a89064d2ce716603a07 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 30 八月 2024 20:19:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/api/YS/lib/NetDEVSDKLib.java | 15 +++++++++++++++
1 files changed, 15 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..a14bc35 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,8 +1,10 @@
package com.ycl.api.YS.lib;
+
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;
@@ -128,6 +130,7 @@
* @brief 璁惧鐧诲綍淇℃伅
* @attention
*/
+ @Structure.FieldOrder({"byRes", "dwDeviceType" ,"dwLoginProto","dwPort","szIPAddr","szPassword","szUserName"})
public class NETDEV_DEVICE_LOGIN_INFO_S extends Structure
{
public byte[] szIPAddr = new byte[NETDEV_LEN_260]; /* IP鍦板潃/鍩熷悕 */
@@ -144,6 +147,7 @@
* @brief 瀹夊叏鐧诲綍淇℃伅
* @attention
*/
+ @Structure.FieldOrder({"byRes", "dwSELogCount","dwSELogTime"})
public class NETDEV_SELOG_INFO_S extends Structure {
public int dwSELogCount; /* 瀹夊叏鐧诲綍娆℃暟 */
public int dwSELogTime; /* 瀹夊叏鐧诲綍鏃堕棿 */
@@ -5974,6 +5978,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 +5988,39 @@
* @brief OSD鏃堕棿閰嶇疆淇℃伅 OSD time configuration information
* @attention 鏃� None
*/
+ @Structure.FieldOrder({"bEnableFlag", "bWeekEnableFlag","stAreaScope","udwDateFormat","udwTimeFormat"})
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", "byRes","stAreaScope","szOSDText"})
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({"astTextOverlay", "stNameOSD","stTimeOSD","wTextNum"})
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 */
--
Gitblit v1.8.0