From 753128ce82ff3ce8c9617768b88378f785a6088b Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期三, 19 十二月 2018 21:19:14 +0800
Subject: [PATCH] merge Dev into Current
---
QiaoJiaSystem/StructureApp/FaceRpcElement.cpp | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/FaceRpcElement.cpp b/QiaoJiaSystem/StructureApp/FaceRpcElement.cpp
index 1525512..d1ed983 100644
--- a/QiaoJiaSystem/StructureApp/FaceRpcElement.cpp
+++ b/QiaoJiaSystem/StructureApp/FaceRpcElement.cpp
@@ -33,7 +33,7 @@
FaceRpcElement::FaceRpcElement(string shareMemoryName) :
//#todo
rpcClient(appPref.getStringData("faceDete.proxy"), appPref.getStringData("faceDete.ip"),
- appPref.getIntData("faceDete.port"), "tcp"), m_triggerElement(0, 50),
+ appPref.getIntData("faceDete.port"), "tcp"), m_triggerElement(0, 0),
// rpcClient("faceServer","",10002,"tcp"),
sharedMemory(nullptr), trackingTrigger(nullptr) {
sharedMemory = new QSharedMemory(QString(shareMemoryName.c_str()));
--
Gitblit v1.8.0