From cdfb8eb2a956d25d688033be735f4741b2ab58bd Mon Sep 17 00:00:00 2001 From: xuxiuxi <554325746@qq.com> Date: 星期五, 15 三月 2019 09:48:42 +0800 Subject: [PATCH] Merge branch 'yw.1.2.fixbug' of http://192.168.1.226:10010/r/development/c++ into yw.1.2.fixbug --- QiaoJiaSystem/StructureApp/AppPipeController.h | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/QiaoJiaSystem/StructureApp/AppPipeController.h b/QiaoJiaSystem/StructureApp/AppPipeController.h index e46de35..367af7a 100644 --- a/QiaoJiaSystem/StructureApp/AppPipeController.h +++ b/QiaoJiaSystem/StructureApp/AppPipeController.h @@ -109,17 +109,17 @@ FaceRpcElement faceRpcElement; FaceExtractElement faceExtractElement; ImageDrawElement imageDrawElement; - RecordVideoElement recordVideoElement; - NewRecordVideoElement newRecordVideoElement; +// RecordVideoElement recordVideoElement; +// NewRecordVideoElement newRecordVideoElement; PersonElement personElement; int m_index; std::string m_camId; std::string m_folderPath; - Json::Value m_json; - Json::Value m_json_Record; +// Json::Value m_json; +// Json::Value m_json_Record; +// Json::FastWriter m_fastWriter; - Json::FastWriter m_fastWriter; FastFdsWithLock *fdfsClient; bool bRecordVideoEnable; -- Gitblit v1.8.0