Merge branch 'yw.1.2' into yangwu1.3

pansen

2019-04-03 adb08adc83dfe9dc5d6170c2322952d77a93c510

 QiaoJiaSystem/StructureApp/PerimeterElement.cpp

@@ -25,7 +25,7 @@
    m_bIsMask(true),
    m_bSetWH(false),
    pointArray(nullptr),
    m_rpcClient("RtspAnalysServer", "127.0.0.1",appPref.getIntData("RpcServerPort"),"tcp")
    m_rpcClient("RtspAnalysServer", "127.0.0.1",appPref.getIntData("RpcVTIMPort"),"tcp")
{

    pManagerEsDB = new EsDBTool(appPref.getStringData("ipAdd"), appPref.getIntData("ipPort"));