From 8a87e4226aa802d6a0e3566c66824fedf68e77da Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期二, 24 十月 2023 16:30:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ard-work/src/main/java/com/ruoyi/device/dhsdk/lib/structure/customize/DEV_EVENT_CROSSLINE_INFO.java |  316 ++++++++++++++++++++++++++--------------------------
 1 files changed, 158 insertions(+), 158 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/device/dhsdk/lib/structure/customize/DEV_EVENT_CROSSLINE_INFO.java b/ard-work/src/main/java/com/ruoyi/device/dhsdk/lib/structure/customize/DEV_EVENT_CROSSLINE_INFO.java
index 9f0ac94..617d1e4 100644
--- a/ard-work/src/main/java/com/ruoyi/device/dhsdk/lib/structure/customize/DEV_EVENT_CROSSLINE_INFO.java
+++ b/ard-work/src/main/java/com/ruoyi/device/dhsdk/lib/structure/customize/DEV_EVENT_CROSSLINE_INFO.java
@@ -1,158 +1,158 @@
-package com.netsdk.lib.structure.customize;
-
-import com.ruoyi.device.dhsdk.lib.NetSDKLib;
-
-import static com.ruoyi.device.dhsdk.lib.NetSDKLib.*;
-
-/**
- * 鑸瑰彧缁婄嚎鍏ヤ镜浜嬩欢缁撴瀯浣�
- * <p>
- * ERR210428143 姘撮潰棰勮浜嬩欢 涓撶敤缁撴瀯浣�
- * <p>
- * 娉ㄦ剰: 鍏朵粬椤圭洰涓嶈浣跨敤, 閫氱敤鐨勫仠杞︽娴嬩簨浠剁粨鏋勪綋瑙�:
- * {@link NetSDKLib.DEV_EVENT_CROSSLINE_INFO}
- *
- * @author 47040
- * @since Created in 2021/5/13 19:03
- */
-public class DEV_EVENT_CROSSLINE_INFO extends SdkStructure {
-
-    /**
-     * 閫氶亾鍙�
-     */
-    public int nChannelID;
-    /**
-     * 浜嬩欢鍚嶇О
-     */
-    public byte[] szName = new byte[128];
-    /**
-     * 瀛楄妭瀵归綈
-     */
-    public byte[] bReserved1 = new byte[4];
-    /**
-     * 鏃堕棿鎴�(鍗曚綅鏄绉�)
-     */
-    public double PTS;
-    /**
-     * 浜嬩欢鍙戠敓鐨勬椂闂�
-     */
-    public NET_TIME_EX UTC;
-    /**
-     * 浜嬩欢ID
-     */
-    public int nEventID;
-    /**
-     * 妫�娴嬪埌鐨勭墿浣�
-     */
-    public NET_MSG_OBJECT stuObject;
-    /**
-     * 浜嬩欢瀵瑰簲鏂囦欢淇℃伅
-     */
-    public NET_EVENT_FILE_INFO stuFileInfo;
-    /**
-     * 瑙勫垯妫�娴嬬嚎
-     */
-    public NET_POINT[] DetectLine = (NET_POINT[]) new NET_POINT().toArray(NET_MAX_DETECT_LINE_NUM);
-    /**
-     * 瑙勫垯妫�娴嬬嚎椤剁偣鏁�
-     */
-    public int nDetectLineNum;
-    /**
-     * 鐗╀綋杩愬姩杞ㄨ抗
-     */
-    public NET_POINT[] TrackLine = (NET_POINT[]) new NET_POINT().toArray(NET_MAX_TRACK_LINE_NUM);
-    /**
-     * 鐗╀綋杩愬姩杞ㄨ抗椤剁偣鏁�
-     */
-    public int nTrackLineNum;
-    /**
-     * 浜嬩欢鍔ㄤ綔,0琛ㄧず鑴夊啿浜嬩欢,1琛ㄧず鎸佺画鎬т簨浠跺紑濮�,2琛ㄧず鎸佺画鎬т簨浠剁粨鏉�;
-     */
-    public byte bEventAction;
-    /**
-     * 琛ㄧず鍏ヤ镜鏂瑰悜, 0-鐢卞乏鑷冲彸, 1-鐢卞彸鑷冲乏
-     */
-    public byte bDirection;
-    /**
-     * 瀛楄妭瀵归綈
-     */
-    public byte[] byReserved = new byte[1];
-    /**
-     * 鍥剧墖鐨勫簭鍙�, 鍚屼竴鏃堕棿鍐�(绮剧‘鍒扮)鍙兘鏈夊寮犲浘鐗�, 浠�0寮�濮�
-     */
-    public byte byImageIndex;
-    /**
-     * 鎶撳浘鏍囧織(鎸変綅),鍏蜂綋瑙�  NET_RESERVED_COMMON,
-     * 0浣�:"*",1浣�:"Timing",2浣�:"Manual",
-     * 3浣�:"Marked",4浣�:"Event",5浣�:"Mosaic",6浣�:"Cutout"
-     */
-    public int dwSnapFlagMask;
-    /**
-     * 浜嬩欢婧愯澶囦笂鐨刬ndex,-1琛ㄧず鏁版嵁鏃犳晥,-1琛ㄧず鏁版嵁鏃犳晥
-     */
-    public int nSourceIndex;
-    /**
-     * 浜嬩欢婧愯澶囧敮涓�鏍囪瘑,瀛楁涓嶅瓨鍦ㄦ垨鑰呬负绌鸿〃绀烘湰鍦拌澶�
-     */
-    public byte[] szSourceDevice = new byte[MAX_PATH];
-    /**
-     * 浜嬩欢瑙﹀彂绱娆℃暟, 绫诲瀷涓簎nsigned int
-     */
-    public int nOccurrenceCount;
-    /**
-     * 鏅鸿兘浜嬩欢鍏叡淇℃伅
-     */
-    public EVENT_INTELLI_COMM_INFO stuIntelliCommInfo;
-    /**
-     * 鎵╁睍淇℃伅
-     */
-    public NET_EXTENSION_INFO stuExtensionInfo;
-    /**
-     * 鍏ㄦ櫙骞胯鍥�
-     */
-    public SCENE_IMAGE_INFO_EX stuSceneImage;
-    /**
-     * 妫�娴嬪埌浜虹殑鏁伴噺
-     */
-    public int nObjetcHumansNum;
-    /**
-     * 妫�娴嬬殑鍒颁汉
-     */
-    public NET_VAOBJECT_NUMMAN[] stuObjetcHumans = (NET_VAOBJECT_NUMMAN[]) new NET_VAOBJECT_NUMMAN().toArray(100);
-    /**
-     * 瑙勫垯缂栧彿,鐢ㄤ簬鏍囩ず鍝釜瑙勫垯瑙﹀彂鐨勪簨浠讹紝缂虹渷鏃堕粯璁や负0
-     */
-    public int nRuleID;
-    /**
-     * 浜嬩欢绾у埆 {@link EM_EVENT_LEVEL}
-     */
-    public int emEventType;
-    /**
-     * 鐑垚鍍忔í鍚戣鍦鸿,鍗曚綅搴�,瀹為檯瑙掑害涔樹互100 (ERR210428143 涓撶敤, 鍏朵粬椤圭洰涓嶈浣跨敤)
-     */
-    public int nThermoHFOV;
-    /**
-     * 鐑垚鍍忕旱鍚戣鍦鸿,鍗曚綅搴�,瀹為檯瑙掑害涔樹互100 (ERR210428143 涓撶敤, 鍏朵粬椤圭洰涓嶈浣跨敤)
-     */
-    public int nThermoVFOV;
-    /**
-     * 鑸归珮 (ERR210428143 涓撶敤, 鍏朵粬椤圭洰涓嶈浣跨敤)
-     */
-    public int nBoatHeight;
-    /**
-     * 鑸归暱 (ERR210428143 涓撶敤, 鍏朵粬椤圭洰涓嶈浣跨敤)
-     */
-    public int nBoatLength;
-    /**
-     * 鑸归�� (ERR210428143 涓撶敤, 鍏朵粬椤圭洰涓嶈浣跨敤)
-     */
-    public int nBoatSpeed;
-    /**
-     * 鑸硅窛 (ERR210428143 涓撶敤, 鍏朵粬椤圭洰涓嶈浣跨敤)
-     */
-    public int nBoatDistance;
-    /**
-     * 瀛楄妭瀵归綈
-     */
-    public byte[] byReserved1 = new byte[480];
-}
+package com.ruoyi.device.dhsdk.lib.structure.customize;
+
+import com.ruoyi.device.dhsdk.lib.NetSDKLib;
+
+import static com.ruoyi.device.dhsdk.lib.NetSDKLib.*;
+
+/**
+ * 鑸瑰彧缁婄嚎鍏ヤ镜浜嬩欢缁撴瀯浣�
+ * <p>
+ * ERR210428143 姘撮潰棰勮浜嬩欢 涓撶敤缁撴瀯浣�
+ * <p>
+ * 娉ㄦ剰: 鍏朵粬椤圭洰涓嶈浣跨敤, 閫氱敤鐨勫仠杞︽娴嬩簨浠剁粨鏋勪綋瑙�:
+ * {@link NetSDKLib.DEV_EVENT_CROSSLINE_INFO}
+ *
+ * @author 47040
+ * @since Created in 2021/5/13 19:03
+ */
+public class DEV_EVENT_CROSSLINE_INFO extends SdkStructure {
+
+    /**
+     * 閫氶亾鍙�
+     */
+    public int nChannelID;
+    /**
+     * 浜嬩欢鍚嶇О
+     */
+    public byte[] szName = new byte[128];
+    /**
+     * 瀛楄妭瀵归綈
+     */
+    public byte[] bReserved1 = new byte[4];
+    /**
+     * 鏃堕棿鎴�(鍗曚綅鏄绉�)
+     */
+    public double PTS;
+    /**
+     * 浜嬩欢鍙戠敓鐨勬椂闂�
+     */
+    public NET_TIME_EX UTC;
+    /**
+     * 浜嬩欢ID
+     */
+    public int nEventID;
+    /**
+     * 妫�娴嬪埌鐨勭墿浣�
+     */
+    public NET_MSG_OBJECT stuObject;
+    /**
+     * 浜嬩欢瀵瑰簲鏂囦欢淇℃伅
+     */
+    public NET_EVENT_FILE_INFO stuFileInfo;
+    /**
+     * 瑙勫垯妫�娴嬬嚎
+     */
+    public NET_POINT[] DetectLine = (NET_POINT[]) new NET_POINT().toArray(NET_MAX_DETECT_LINE_NUM);
+    /**
+     * 瑙勫垯妫�娴嬬嚎椤剁偣鏁�
+     */
+    public int nDetectLineNum;
+    /**
+     * 鐗╀綋杩愬姩杞ㄨ抗
+     */
+    public NET_POINT[] TrackLine = (NET_POINT[]) new NET_POINT().toArray(NET_MAX_TRACK_LINE_NUM);
+    /**
+     * 鐗╀綋杩愬姩杞ㄨ抗椤剁偣鏁�
+     */
+    public int nTrackLineNum;
+    /**
+     * 浜嬩欢鍔ㄤ綔,0琛ㄧず鑴夊啿浜嬩欢,1琛ㄧず鎸佺画鎬т簨浠跺紑濮�,2琛ㄧず鎸佺画鎬т簨浠剁粨鏉�;
+     */
+    public byte bEventAction;
+    /**
+     * 琛ㄧず鍏ヤ镜鏂瑰悜, 0-鐢卞乏鑷冲彸, 1-鐢卞彸鑷冲乏
+     */
+    public byte bDirection;
+    /**
+     * 瀛楄妭瀵归綈
+     */
+    public byte[] byReserved = new byte[1];
+    /**
+     * 鍥剧墖鐨勫簭鍙�, 鍚屼竴鏃堕棿鍐�(绮剧‘鍒扮)鍙兘鏈夊寮犲浘鐗�, 浠�0寮�濮�
+     */
+    public byte byImageIndex;
+    /**
+     * 鎶撳浘鏍囧織(鎸変綅),鍏蜂綋瑙�  NET_RESERVED_COMMON,
+     * 0浣�:"*",1浣�:"Timing",2浣�:"Manual",
+     * 3浣�:"Marked",4浣�:"Event",5浣�:"Mosaic",6浣�:"Cutout"
+     */
+    public int dwSnapFlagMask;
+    /**
+     * 浜嬩欢婧愯澶囦笂鐨刬ndex,-1琛ㄧず鏁版嵁鏃犳晥,-1琛ㄧず鏁版嵁鏃犳晥
+     */
+    public int nSourceIndex;
+    /**
+     * 浜嬩欢婧愯澶囧敮涓�鏍囪瘑,瀛楁涓嶅瓨鍦ㄦ垨鑰呬负绌鸿〃绀烘湰鍦拌澶�
+     */
+    public byte[] szSourceDevice = new byte[MAX_PATH];
+    /**
+     * 浜嬩欢瑙﹀彂绱娆℃暟, 绫诲瀷涓簎nsigned int
+     */
+    public int nOccurrenceCount;
+    /**
+     * 鏅鸿兘浜嬩欢鍏叡淇℃伅
+     */
+    public EVENT_INTELLI_COMM_INFO stuIntelliCommInfo;
+    /**
+     * 鎵╁睍淇℃伅
+     */
+    public NET_EXTENSION_INFO stuExtensionInfo;
+    /**
+     * 鍏ㄦ櫙骞胯鍥�
+     */
+    public SCENE_IMAGE_INFO_EX stuSceneImage;
+    /**
+     * 妫�娴嬪埌浜虹殑鏁伴噺
+     */
+    public int nObjetcHumansNum;
+    /**
+     * 妫�娴嬬殑鍒颁汉
+     */
+    public NET_VAOBJECT_NUMMAN[] stuObjetcHumans = (NET_VAOBJECT_NUMMAN[]) new NET_VAOBJECT_NUMMAN().toArray(100);
+    /**
+     * 瑙勫垯缂栧彿,鐢ㄤ簬鏍囩ず鍝釜瑙勫垯瑙﹀彂鐨勪簨浠讹紝缂虹渷鏃堕粯璁や负0
+     */
+    public int nRuleID;
+    /**
+     * 浜嬩欢绾у埆 {@link EM_EVENT_LEVEL}
+     */
+    public int emEventType;
+    /**
+     * 鐑垚鍍忔í鍚戣鍦鸿,鍗曚綅搴�,瀹為檯瑙掑害涔樹互100 (ERR210428143 涓撶敤, 鍏朵粬椤圭洰涓嶈浣跨敤)
+     */
+    public int nThermoHFOV;
+    /**
+     * 鐑垚鍍忕旱鍚戣鍦鸿,鍗曚綅搴�,瀹為檯瑙掑害涔樹互100 (ERR210428143 涓撶敤, 鍏朵粬椤圭洰涓嶈浣跨敤)
+     */
+    public int nThermoVFOV;
+    /**
+     * 鑸归珮 (ERR210428143 涓撶敤, 鍏朵粬椤圭洰涓嶈浣跨敤)
+     */
+    public int nBoatHeight;
+    /**
+     * 鑸归暱 (ERR210428143 涓撶敤, 鍏朵粬椤圭洰涓嶈浣跨敤)
+     */
+    public int nBoatLength;
+    /**
+     * 鑸归�� (ERR210428143 涓撶敤, 鍏朵粬椤圭洰涓嶈浣跨敤)
+     */
+    public int nBoatSpeed;
+    /**
+     * 鑸硅窛 (ERR210428143 涓撶敤, 鍏朵粬椤圭洰涓嶈浣跨敤)
+     */
+    public int nBoatDistance;
+    /**
+     * 瀛楄妭瀵归綈
+     */
+    public byte[] byReserved1 = new byte[480];
+}

--
Gitblit v1.9.3