Merge branch 'yw.1.2' into yangwu1.3

pansen

2019-04-03 adb08adc83dfe9dc5d6170c2322952d77a93c510

 QiaoJiaSystem/StructureApp/PerimeterElement.h

@@ -17,7 +17,7 @@
class PerimeterElement : public basic::PipeElement
{
public:
    PerimeterElement():m_rpcClient("RtspAnalysServer", "127.0.0.1",appPref.getIntData("RpcServerPort"),"tcp"){}
    PerimeterElement():m_rpcClient("RtspAnalysServer", "127.0.0.1",appPref.getIntData("RpcVTIMPort"),"tcp"){}
    PerimeterElement(const SdkRule& rule);
public:
    ~PerimeterElement();