From 6151028a8e0e63ed6967faa7c23ff56b076879df Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期五, 05 四月 2019 11:22:03 +0800
Subject: [PATCH] 解决GB28181推多路流问题
---
QiaoJiaSystem/RapidStructureApp/TriggerElement.cpp | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/QiaoJiaSystem/RapidStructureApp/TriggerElement.cpp b/QiaoJiaSystem/RapidStructureApp/TriggerElement.cpp
index b2b89af..11233ce 100644
--- a/QiaoJiaSystem/RapidStructureApp/TriggerElement.cpp
+++ b/QiaoJiaSystem/RapidStructureApp/TriggerElement.cpp
@@ -70,7 +70,7 @@
}
bool TriggerElement::getTriggerState() const {
- return state;
+ return triggerState;
}
void TriggerElement::threadInitial() {
@@ -78,7 +78,13 @@
lastDown = 0;
triggerType = DOWN;
}
+void TriggerElement::resetTriggerState()
+{
+ //state=false;
+ triggerState=false;
+ triggerTimes=0;
+}
void TriggerElement::timerFunc() {
--
Gitblit v1.8.0