Merge remote-tracking branch 'origin/ywv1.2' into ywv1.2

pansen

2019-01-10 4f70d72daca6818a8a7ba36d794b0cd7f985cbcc

 QiaoJiaSystem/StructureApp/AppPipeController.cpp

@@ -167,7 +167,7 @@


            if (bRecordVideoEnable) {
                DBG("strNewTime="<<strNewTime<<" camId="<<m_camId);
//                DBG("strNewTime="<<strNewTime<<" camId="<<m_camId);
                newRecordVideoElement.pushImgBuf(strNewTime, imageTemp);
                newRecordVideoElement.setSdkTrigger(faceRpcElement.getTriggerState() ||//TODO
                                                    yoloRpcElement.getTrigger() ||