From e8a4f9014fbea4159ea15642226c6793d57d13ee Mon Sep 17 00:00:00 2001 From: Administrator <1144154118@qq.com> Date: 星期二, 22 八月 2023 11:05:44 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ard-work/src/main/java/com/ruoyi/device/hiksdk/util/hikSdkUtil/HCNetSDK.java | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ard-work/src/main/java/com/ruoyi/device/hiksdk/util/hikSdkUtil/HCNetSDK.java b/ard-work/src/main/java/com/ruoyi/device/hiksdk/util/hikSdkUtil/HCNetSDK.java index 2959708..a07c6d0 100644 --- a/ard-work/src/main/java/com/ruoyi/device/hiksdk/util/hikSdkUtil/HCNetSDK.java +++ b/ard-work/src/main/java/com/ruoyi/device/hiksdk/util/hikSdkUtil/HCNetSDK.java @@ -2252,7 +2252,8 @@ public static class NET_DVR_IPCHANINFO extends HIKSDKStructure {/* IP閫氶亾鍖归厤鍙傛暟 */ public byte byEnable; /* 璇ラ�氶亾鏄惁鍚敤 */ public byte byIPID; /* IP璁惧ID 鍙栧��1- MAX_IP_DEVICE */ - public byte byChannel; /* 閫氶亾鍙� */ + public byte byChannel; /* 閫氶亾鍙� */ + public byte byIPIDHigh; public byte[] byres = new byte[33]; /* 淇濈暀 */ @@ -10242,7 +10243,14 @@ boolean NET_DVR_InquiryRecordTimeSpan(int lUserID, int dwChannel, NET_DVR_RECORD_TIME_SPAN_INQUIRY lpInquiry, NET_DVR_RECORD_TIME_SPAN lpResult); boolean NET_DVR_StartGetDevState(NET_DVR_CHECK_DEV_STATE pParams); - + //寮哄埗I甯у弬鏁扮粨鏋勪綋銆� + public static class NET_DVR_I_FRAME extends HIKSDKStructure{ + public int dwSize; + public byte[] sStreamID = new byte[32]; //娴両Ds SDK 涓 STREAM_ID_LEN杩涜浜嗗畾涔夛紝璧嬪��32 + public int dwChannel;//閫氶亾鍙� + public byte byStreamType; //鐮佹祦绫诲瀷锛�0-涓荤爜娴侊紝1-瀛愮爜娴侊紝2-鐮佹祦3锛�3-铏氭嫙鐮佹祦锛屼互姝ょ被鎺� + public byte[] byRes = new byte[63]; //淇濈暀锛岀疆涓�0 鎸夌収SDK瑕佹眰杩涜瀵瑰簲璧嬪�� + } //gps鐩稿叧缁撴瀯瀹氫箟 public static class TimeSegParam extends HIKSDKStructure { //GPS鏁版嵁鏌ユ壘璧峰鏃堕棿 -- Gitblit v1.9.3