Merge branch 'master' into Develop

pansen

2019-01-04 a9e9e90b0c0a8fa7f0b78b29101a3dc13a021a5d

 QiaoJiaSystem/StructureApp/FaceRpcElement.cpp

@@ -32,7 +32,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()));