From 009196fe371aaec7b7e2d38fff5d8d7bb672b233 Mon Sep 17 00:00:00 2001 From: chd Date: Wed, 16 Nov 2022 16:25:54 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E6=95=B0=E6=8D=AE=E8=A7=A3?= =?UTF-8?q?=E6=9E=90=E5=A4=84=E7=90=86=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: chd --- .gitignore | 7 ++++++- src/main/java/com/hkversion/AlarmDataParse.java | 1 + src/main/java/com/yzx/pojo/AlarmDataInfo.java | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 5ff6309..4292844 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,10 @@ target/ .idea/jarRepositories.xml .idea/compiler.xml .idea/libraries/ +.idea/encodings.xml +.idea/misc.xml +.idea/vcs.xml +.idea/workspace.xml *.iws *.iml *.ipr @@ -35,4 +39,5 @@ build/ .vscode/ ### Mac OS ### -.DS_Store \ No newline at end of file +.DS_Store +/.idea/ diff --git a/src/main/java/com/hkversion/AlarmDataParse.java b/src/main/java/com/hkversion/AlarmDataParse.java index 9ceb9d6..8c35732 100644 --- a/src/main/java/com/hkversion/AlarmDataParse.java +++ b/src/main/java/com/hkversion/AlarmDataParse.java @@ -397,6 +397,7 @@ public class AlarmDataParse { info.setDwMinor(Integer.toHexString(strACSInfo.dwMinor)); info.setSerialNumber(new String(pAlarmer.sSerialNumber).trim()); info.setSerialNo(strACSInfo.struAcsEventInfo.dwSerialNo); + info.setPicTransType(strACSInfo.byPicTransType); //温度信息（如果设备支持测温功能，人脸温度信息从NET_DVR_ACS_EVENT_INFO_EXTEND_V20结构体获取） if (strACSInfo.byAcsEventInfoExtendV20 == 1) { HCNetSDK.NET_DVR_ACS_EVENT_INFO_EXTEND_V20 strAcsInfoExV20 = new HCNetSDK.NET_DVR_ACS_EVENT_INFO_EXTEND_V20(); diff --git a/src/main/java/com/yzx/pojo/AlarmDataInfo.java b/src/main/java/com/yzx/pojo/AlarmDataInfo.java index d84d749..fde2fc5 100644 --- a/src/main/java/com/yzx/pojo/AlarmDataInfo.java +++ b/src/main/java/com/yzx/pojo/AlarmDataInfo.java @@ -15,4 +15,5 @@ public class AlarmDataInfo { private byte[] pic; private String serialNumber; private int serialNo; + private int picTransType; }