From 9814ba539d1d34d1a75b52e5ea015ad0d5929848 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期三, 20 十二月 2023 10:17:19 +0800
Subject: [PATCH] 增加火点检测子类型烟雾检测
---
src/main/java/com/ard/utils/sdk/hiksdk/service/impl/FMSGCallBack.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ard/utils/sdk/hiksdk/service/impl/FMSGCallBack.java b/src/main/java/com/ard/utils/sdk/hiksdk/service/impl/FMSGCallBack.java
index 8a9a3bd..b784e5f 100644
--- a/src/main/java/com/ard/utils/sdk/hiksdk/service/impl/FMSGCallBack.java
+++ b/src/main/java/com/ard/utils/sdk/hiksdk/service/impl/FMSGCallBack.java
@@ -174,7 +174,7 @@
alarmType = "鍊掑湴妫�娴嬩簨浠舵姤璀�";
//endregion
break;
- case 35: //region 鍊掑湴妫�娴�
+ case 35: //region 浜烘暟鍙樺寲浜嬩欢鎶ヨ
alarmType = "浜烘暟鍙樺寲浜嬩欢鎶ヨ";
//endregion
break;
@@ -627,6 +627,17 @@
Pointer pFireDecAlarm = struFireDecAlarm.getPointer();
pFireDecAlarm.write(0, pAlarmInfo.getByteArray(0, struFireDecAlarm.size()), 0, struFireDecAlarm.size());
struFireDecAlarm.read();
+ switch (struFireDecAlarm.byAlarmSubType) {
+ case 0:
+ alarmType = "鐏偣妫�娴嬫姤璀�";
+ break;
+ case 1:
+ alarmType = "鐑熼浘妫�娴嬫姤璀�";
+ break;
+ case 2:
+ alarmType = "鐑熺伀鎶ヨ ";
+ break;
+ }
//String sFireDecAlarmInfo = "缁濆鏃堕棿锛�" + struFireDecAlarm.dwAbsTime + ",鎶ヨ瀛愮被鍨嬶細" + struFireDecAlarm.byAlarmSubType + ",鐏偣鏈�楂樻俯搴� :" +
// struFireDecAlarm.wFireMaxTemperature + ",鐏偣鐩爣璺濈锛�" + struFireDecAlarm.wTargetDistance;
//System.out.println(sFireDecAlarmInfo);
@@ -638,7 +649,6 @@
alarmTime = DateUtils.parseTime(struFireDecAlarm.dwAbsTime);//鎶ヨ鏃堕棿
if (camera != null) {
alarmName = "鐏劙妫�娴嬩俊鎭笂鎶�";
- alarmType = "鐏劙妫�娴嬩簨浠舵姤璀�";
switch (camera.getGdType()) {
case "3":
superBrainEventHandler(camera, chanNo, alarmName, alarmType, alarmTime, picUrl, facePicUrl);
--
Gitblit v1.9.3