Merge remote-tracking branch 'origin/1.3nsq' into 1.3nsq

pansen

2019-04-22 4d1c2ee860222138fc7932225ea6d91e7483646a

 QiaoJiaSystem/YoloServer/YoloDetectClientTest.cpp

@@ -75,12 +75,10 @@
    appPref.setIntData("yolo.port", 10003);
//    rpcClient(appPref.getStringData("yolo.proxy"), appPref.getStringData("yolo.ip"), appPref.getLongData("yolo.port"),"tcp"),

    Controllor *_Controllor = new Controllor(1, "/home/bsk/210235C23NF187000045$2019-02-28-23-07-30_209850_210049.mp4");
    Controllor *_Controllor = new Controllor(1, "/home/basic/geth264.h264");
    _Controllor->start();

    getchar();




    YoloRpcElement m_YoloRpcElement("YoloRpc");