From 4f70d72daca6818a8a7ba36d794b0cd7f985cbcc Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期四, 10 一月 2019 18:23:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ywv1.2' into ywv1.2
---
QiaoJiaSystem/StructureApp/AppPipeController.cpp | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/AppPipeController.cpp b/QiaoJiaSystem/StructureApp/AppPipeController.cpp
index 2d89d86..135ce98 100644
--- a/QiaoJiaSystem/StructureApp/AppPipeController.cpp
+++ b/QiaoJiaSystem/StructureApp/AppPipeController.cpp
@@ -167,7 +167,7 @@
if (bRecordVideoEnable) {
- DBG("strNewTime="<<strNewTime<<" camId="<<m_camId);
+// DBG("strNewTime="<<strNewTime<<" camId="<<m_camId);
newRecordVideoElement.pushImgBuf(strNewTime, imageTemp);
newRecordVideoElement.setSdkTrigger(faceRpcElement.getTriggerState() ||//TODO
yoloRpcElement.getTrigger() ||
--
Gitblit v1.8.0