From 4806b676dbbab4675e5ee43b4018f2cd9d43797f Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期一, 23 十月 2023 17:15:09 +0800
Subject: [PATCH] 1. 将sdk动态链接库dll集成到项目内,提升部署便捷性； 2. 增加设备断线重连回调方法，打印相关日志； 3. 删除多余依赖，减小jar包体积； 4. 处理SDK日志打印；
---
ard-work/src/main/java/com/ruoyi/device/dhsdk/lib/structure/CFG_MOTION_INFO.java | 250 +++++++++++++++++++++++++-------------------------
1 files changed, 125 insertions(+), 125 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/device/dhsdk/lib/structure/CFG_MOTION_INFO.java b/ard-work/src/main/java/com/ruoyi/device/dhsdk/lib/structure/CFG_MOTION_INFO.java
index de8d18f..ca7f877 100644
--- a/ard-work/src/main/java/com/ruoyi/device/dhsdk/lib/structure/CFG_MOTION_INFO.java
+++ b/ard-work/src/main/java/com/ruoyi/device/dhsdk/lib/structure/CFG_MOTION_INFO.java
@@ -1,125 +1,125 @@
-package com.ruoyi.device.dhsdk.lib.structure;
-/**
- * @author 47081
- * @desc
- * @version 1.0.0
- * @date 2021/4/9
- */
-import com.ruoyi.device.dhsdk.lib.NetSDKLib;
-import com.sun.jna.ptr.IntByReference;
-
-import java.util.Arrays;
-
-import static com.ruoyi.device.dhsdk.lib.NetSDKLib.MAX_REC_TSECT;
-import static com.ruoyi.device.dhsdk.lib.constant.SDKStructureFieldLenth.*;
-
-/**
- * @author 47081
- * @description 鍔ㄦ�佺洃娴嬫姤璀﹂厤缃�,瀵瑰簲鎺ュ彛 {@link
- * com.netsdk.lib.NetSDKLib#CLIENT_GetNewDevConfig(NetSDKLib.LLong, String, int, byte[], int,
- * IntByReference, int)}鍜寋@link NetSDKLib#CLIENT_SetNewDevConfig(NetSDKLib.LLong, String, int,
- * byte[], int, IntByReference, IntByReference, int)}
- * @date 2021/4/9
- * @version 1.0
- */
-public class CFG_MOTION_INFO extends NetSDKLib.SdkStructure {
- /** 鎶ヨ閫氶亾鍙�(0寮�濮�), nVersion=1鏃讹紝姝ゅ瓧娈垫棤鏁� */
- public int nChannelID;
- /** 浣胯兘寮�鍏� */
- public int bEnable;
- /** 涓�浠ｅ姩妫�鐏垫晱搴�1锝�6 */
- public int nSenseLevel;
- /** 涓�浠ｅ姩鎬佹娴嬪尯鍩熺殑琛屾暟 */
- public int nMotionRow;
- /** 涓�浠ｅ姩鎬佹娴嬪尯鍩熺殑鍒楁暟 */
- public int nMotionCol;
- /** 涓�浠ｆ娴嬪尯鍩燂紝鏈�澶�32*32鍧楀尯鍩� */
- public BYTE_32[] byRegion = new BYTE_32[MAX_MOTION_ROW];
- /** 鎶ヨ鑱斿姩 */
- public NetSDKLib.CFG_ALARM_MSG_HANDLE stuEventHandler=new NetSDKLib.CFG_ALARM_MSG_HANDLE();
- /** 浜嬩欢鍝嶅簲鏃堕棿娈碉紝鏃堕棿娈佃幏鍙栧拰璁剧疆浠ユ鎴愬憳涓哄噯锛屽拷鐣� stuEventHandler 涓殑stuTimeSection */
- public NetSDKLib.CFG_TIME_SECTION[] stuTimeSection =
- new NetSDKLib.CFG_TIME_SECTION[WEEK_DAY_NUM * MAX_REC_TSECT];
- /** 0, 1, 鐢辫兘鍔涢泦纭畾, 鍙, 绛変簬1鏃朵互涓嬪瓧娈垫湁鏁� */
- public int nVersion;
- /** 鍙锛屽喅瀹歯SenseLevel鏄惁鏈夋晥 */
- public int bSenseLevelEn;
- /** 鍙锛岄潰绉崰鐢ㄦ瘮浣胯兘锛� 鍐冲畾nVolumeRatio鏄惁鏈夋晥 */
- public int bVRatioEn;
- /** 涓�浠ｅ姩妫�鐨勯潰绉崰鐢ㄦ瘮,1-100 */
- public int nVolumeRatio;
- /** 鍙锛岀伒鏁忓害浣胯兘锛屽喅瀹歯SubRatio鍊兼槸鍚︽湁鏁� */
- public int bSRatioEn;
- /** 涓�浠ｅ姩妫�鐨勬畫宸槇鍊�, 1-100 */
- public int nSubRatio;
- /** 姝ゅ瓧娈靛強浠ヤ笅涓や釜瀛楁宸插簾寮� */
- public int abWindow;
- /** 瑙嗛绐楀彛涓暟 */
- @Deprecated public int nWindowCount;
- /** 瑙嗛绐楀彛鏁扮粍 */
- @Deprecated
- public CFG_MOTION_WINDOW[] stuWindows = new CFG_MOTION_WINDOW[MAX_MOTION_WINDOW];
- /** 鍙锛� 1锛歯RegionCount锛宻tuRegion鏈夋晥 0锛歯MotionRow锛宯MotionCol锛宐yRegion鏈夋晥 */
- public int abDetectRegion;
- /** 涓変唬鍔ㄦ�佹娴嬪尯鍩熶釜鏁� */
- public int nRegionCount;
- /** 涓変唬鍔ㄦ�佹娴嬪尯鍩� */
- public CFG_DETECT_REGION[] stuRegion =
- new CFG_DETECT_REGION[MAX_MOTION_WINDOW];
- /** 鍓嶇鍔ㄦ�佹娴嬭仈鍔� */
- public NetSDKLib.CFG_ALARM_MSG_HANDLE stuRemoteEventHandler=new NetSDKLib.CFG_ALARM_MSG_HANDLE();
- /** 鍓嶇鍔ㄦ�佹娴嬭仈鍔�, 浜嬩欢鍝嶅簲鏃堕棿娈碉紝鏃堕棿娈佃幏鍙栧拰璁剧疆浠ユ鎴愬憳涓哄噯锛屽拷鐣� stuRemoteEventHandler涓殑stuTimeSection */
- public NetSDKLib.CFG_TIME_SECTION[] stuRemoteTimeSection =
- new NetSDKLib.CFG_TIME_SECTION[WEEK_DAY_NUM * MAX_REC_TSECT];
-
- @Override
- public String toString() {
- return "CFG_MOTION_INFO{" +
- "nChannelID=" + nChannelID +
- ", bEnable=" + bEnable +
- ", nSenseLevel=" + nSenseLevel +
- ", nMotionRow=" + nMotionRow +
- ", nMotionCol=" + nMotionCol +
- ", byRegion=" + Arrays.toString(byRegion) +
- ", stuEventHandler=" + stuEventHandler +
- ", stuTimeSection=" + Arrays.toString(stuTimeSection) +
- ", nVersion=" + nVersion +
- ", bSenseLevelEn=" + bSenseLevelEn +
- ", bVRatioEn=" + bVRatioEn +
- ", nVolumeRatio=" + nVolumeRatio +
- ", bSRatioEn=" + bSRatioEn +
- ", nSubRatio=" + nSubRatio +
- ", abWindow=" + abWindow +
- ", nWindowCount=" + nWindowCount +
- ", stuWindows=" + Arrays.toString(stuWindows) +
- ", abDetectRegion=" + abDetectRegion +
- ", nRegionCount=" + nRegionCount +
- ", stuRegion=" + Arrays.toString(stuRegion) +
- ", stuRemoteEventHandler=" + stuRemoteEventHandler +
- ", stuRemoteTimeSection=" + Arrays.toString(stuRemoteTimeSection) +
- '}';
- }
- public CFG_MOTION_INFO(){
- for(int i=0;i<byRegion.length;i++){
- byRegion[i]=new BYTE_32();
- }
-
-
- for(int i=0;i<stuTimeSection.length;i++){
- stuTimeSection[i]=new NetSDKLib.CFG_TIME_SECTION();
- }
-
- for(int i=0;i<stuWindows.length;i++){
- stuWindows[i]=new CFG_MOTION_WINDOW();
- }
-
- for(int i=0;i<stuRegion.length;i++){
- stuRegion[i]= new CFG_DETECT_REGION();
- }
- for(int i=0;i<stuRemoteTimeSection.length;i++){
- stuRemoteTimeSection[i]=new NetSDKLib.CFG_TIME_SECTION();
- }
-
- }
-
-}
+package com.ruoyi.device.dhsdk.lib.structure;
+/**
+ * @author 47081
+ * @desc
+ * @version 1.0.0
+ * @date 2021/4/9
+ */
+import com.ruoyi.device.dhsdk.lib.NetSDKLib;
+import com.sun.jna.ptr.IntByReference;
+
+import java.util.Arrays;
+
+import static com.ruoyi.device.dhsdk.lib.NetSDKLib.MAX_REC_TSECT;
+import static com.ruoyi.device.dhsdk.lib.constant.SDKStructureFieldLenth.*;
+
+/**
+ * @author 47081
+ * @description 鍔ㄦ�佺洃娴嬫姤璀﹂厤缃�,瀵瑰簲鎺ュ彛 {@link
+ * com.ruoyi.device.dhsdk.lib.NetSDKLib#CLIENT_GetNewDevConfig(NetSDKLib.LLong, String, int, byte[], int,
+ * IntByReference, int)}鍜寋@link NetSDKLib#CLIENT_SetNewDevConfig(NetSDKLib.LLong, String, int,
+ * byte[], int, IntByReference, IntByReference, int)}
+ * @date 2021/4/9
+ * @version 1.0
+ */
+public class CFG_MOTION_INFO extends NetSDKLib.SdkStructure {
+ /** 鎶ヨ閫氶亾鍙�(0寮�濮�), nVersion=1鏃讹紝姝ゅ瓧娈垫棤鏁� */
+ public int nChannelID;
+ /** 浣胯兘寮�鍏� */
+ public int bEnable;
+ /** 涓�浠ｅ姩妫�鐏垫晱搴�1锝�6 */
+ public int nSenseLevel;
+ /** 涓�浠ｅ姩鎬佹娴嬪尯鍩熺殑琛屾暟 */
+ public int nMotionRow;
+ /** 涓�浠ｅ姩鎬佹娴嬪尯鍩熺殑鍒楁暟 */
+ public int nMotionCol;
+ /** 涓�浠ｆ娴嬪尯鍩燂紝鏈�澶�32*32鍧楀尯鍩� */
+ public BYTE_32[] byRegion = new BYTE_32[MAX_MOTION_ROW];
+ /** 鎶ヨ鑱斿姩 */
+ public NetSDKLib.CFG_ALARM_MSG_HANDLE stuEventHandler=new NetSDKLib.CFG_ALARM_MSG_HANDLE();
+ /** 浜嬩欢鍝嶅簲鏃堕棿娈碉紝鏃堕棿娈佃幏鍙栧拰璁剧疆浠ユ鎴愬憳涓哄噯锛屽拷鐣� stuEventHandler 涓殑stuTimeSection */
+ public NetSDKLib.CFG_TIME_SECTION[] stuTimeSection =
+ new NetSDKLib.CFG_TIME_SECTION[WEEK_DAY_NUM * MAX_REC_TSECT];
+ /** 0, 1, 鐢辫兘鍔涢泦纭畾, 鍙, 绛変簬1鏃朵互涓嬪瓧娈垫湁鏁� */
+ public int nVersion;
+ /** 鍙锛屽喅瀹歯SenseLevel鏄惁鏈夋晥 */
+ public int bSenseLevelEn;
+ /** 鍙锛岄潰绉崰鐢ㄦ瘮浣胯兘锛� 鍐冲畾nVolumeRatio鏄惁鏈夋晥 */
+ public int bVRatioEn;
+ /** 涓�浠ｅ姩妫�鐨勯潰绉崰鐢ㄦ瘮,1-100 */
+ public int nVolumeRatio;
+ /** 鍙锛岀伒鏁忓害浣胯兘锛屽喅瀹歯SubRatio鍊兼槸鍚︽湁鏁� */
+ public int bSRatioEn;
+ /** 涓�浠ｅ姩妫�鐨勬畫宸槇鍊�, 1-100 */
+ public int nSubRatio;
+ /** 姝ゅ瓧娈靛強浠ヤ笅涓や釜瀛楁宸插簾寮� */
+ public int abWindow;
+ /** 瑙嗛绐楀彛涓暟 */
+ @Deprecated public int nWindowCount;
+ /** 瑙嗛绐楀彛鏁扮粍 */
+ @Deprecated
+ public CFG_MOTION_WINDOW[] stuWindows = new CFG_MOTION_WINDOW[MAX_MOTION_WINDOW];
+ /** 鍙锛� 1锛歯RegionCount锛宻tuRegion鏈夋晥 0锛歯MotionRow锛宯MotionCol锛宐yRegion鏈夋晥 */
+ public int abDetectRegion;
+ /** 涓変唬鍔ㄦ�佹娴嬪尯鍩熶釜鏁� */
+ public int nRegionCount;
+ /** 涓変唬鍔ㄦ�佹娴嬪尯鍩� */
+ public CFG_DETECT_REGION[] stuRegion =
+ new CFG_DETECT_REGION[MAX_MOTION_WINDOW];
+ /** 鍓嶇鍔ㄦ�佹娴嬭仈鍔� */
+ public NetSDKLib.CFG_ALARM_MSG_HANDLE stuRemoteEventHandler=new NetSDKLib.CFG_ALARM_MSG_HANDLE();
+ /** 鍓嶇鍔ㄦ�佹娴嬭仈鍔�, 浜嬩欢鍝嶅簲鏃堕棿娈碉紝鏃堕棿娈佃幏鍙栧拰璁剧疆浠ユ鎴愬憳涓哄噯锛屽拷鐣� stuRemoteEventHandler涓殑stuTimeSection */
+ public NetSDKLib.CFG_TIME_SECTION[] stuRemoteTimeSection =
+ new NetSDKLib.CFG_TIME_SECTION[WEEK_DAY_NUM * MAX_REC_TSECT];
+
+ @Override
+ public String toString() {
+ return "CFG_MOTION_INFO{" +
+ "nChannelID=" + nChannelID +
+ ", bEnable=" + bEnable +
+ ", nSenseLevel=" + nSenseLevel +
+ ", nMotionRow=" + nMotionRow +
+ ", nMotionCol=" + nMotionCol +
+ ", byRegion=" + Arrays.toString(byRegion) +
+ ", stuEventHandler=" + stuEventHandler +
+ ", stuTimeSection=" + Arrays.toString(stuTimeSection) +
+ ", nVersion=" + nVersion +
+ ", bSenseLevelEn=" + bSenseLevelEn +
+ ", bVRatioEn=" + bVRatioEn +
+ ", nVolumeRatio=" + nVolumeRatio +
+ ", bSRatioEn=" + bSRatioEn +
+ ", nSubRatio=" + nSubRatio +
+ ", abWindow=" + abWindow +
+ ", nWindowCount=" + nWindowCount +
+ ", stuWindows=" + Arrays.toString(stuWindows) +
+ ", abDetectRegion=" + abDetectRegion +
+ ", nRegionCount=" + nRegionCount +
+ ", stuRegion=" + Arrays.toString(stuRegion) +
+ ", stuRemoteEventHandler=" + stuRemoteEventHandler +
+ ", stuRemoteTimeSection=" + Arrays.toString(stuRemoteTimeSection) +
+ '}';
+ }
+ public CFG_MOTION_INFO(){
+ for(int i=0;i<byRegion.length;i++){
+ byRegion[i]=new BYTE_32();
+ }
+
+
+ for(int i=0;i<stuTimeSection.length;i++){
+ stuTimeSection[i]=new NetSDKLib.CFG_TIME_SECTION();
+ }
+
+ for(int i=0;i<stuWindows.length;i++){
+ stuWindows[i]=new CFG_MOTION_WINDOW();
+ }
+
+ for(int i=0;i<stuRegion.length;i++){
+ stuRegion[i]= new CFG_DETECT_REGION();
+ }
+ for(int i=0;i<stuRemoteTimeSection.length;i++){
+ stuRemoteTimeSection[i]=new NetSDKLib.CFG_TIME_SECTION();
+ }
+
+ }
+
+}
--
Gitblit v1.9.3