From 30d0bd43f53740554e8387fcd14bfab689eeca9c Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期五, 25 一月 2019 21:03:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ywv1.2_布控feature' into ywv1.2_布控feature
---
QiaoJiaSystem/StructureApp/AppPipeController.h | 31 ++++++++++++++++++++++++-------
1 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/AppPipeController.h b/QiaoJiaSystem/StructureApp/AppPipeController.h
index 58f3e55..9e031af 100644
--- a/QiaoJiaSystem/StructureApp/AppPipeController.h
+++ b/QiaoJiaSystem/StructureApp/AppPipeController.h
@@ -15,8 +15,10 @@
#include "PerimeterElement.h"
#include "JudgmentRetrogradeTool.h"
#include "NewRecordVideoElement.h"
+#include "PersonElement.h"
+#include "PerStaticElement.h"
#include <jsoncpp/json/json.h>
-
+#include "DBStruct.h"
class AppPipeController : public PipeController {
public:
@@ -25,11 +27,14 @@
* @param folderPath 浠诲姟鏍圭洰褰曪紝鐢ㄤ簬鍋氬叡浜唴瀛榠d
* @param json 鍙傛暟涓簉tsp娴佸湴鍧� sdk鏄惁鍚敤鐨勬爣璇�
*/
- AppPipeController(std::string folderPath, const Json::Value &json);
+ // AppPipeController(std::string folderPath, const Json::Value &json);
+ AppPipeController(std::string folderPath, const SdkRuleMap& ruleMap);
- AppPipeController(int index, const Json::Value &json, bool RecordVideoEnable = false);
+ // AppPipeController(int index, const Json::Value &json, bool RecordVideoEnable = false);
- AppPipeController(std::string camId, const Json::Value &json, bool RecordVideoEnable);
+ // AppPipeController(std::string camId, const Json::Value &json, bool RecordVideoEnable);
+
+ AppPipeController(std::string camId, const SdkRuleMap& ruleMap, bool RecordVideoEnable);
virtual ~AppPipeController();
@@ -41,9 +46,9 @@
void setfdfsClient(FastFdsWithLock *p_fdfsClient);
+ void setWeekRule(const std::map<int, std::vector<LActRuleWeekRecord>>& weekRuleMap);
private:
void init();
-
private://Perimete
PerimeterElement perimeterElement;
// TriggerElement peTriggerElement;
@@ -63,8 +68,16 @@
// TriggerElement leftTriggerElement;
// TriggerElement rightTriggerElement;
- void intKeepRight();
+ void initKeepRight();
+private:
+ PerStaticElement perStaticElement;
+ void initPerStatic();
+private://Perimete
+ PerimeterElement perHubElement;
+ // TriggerElement peTriggerElement;
+
+ void initPerHub();
private:
ffmpeg::VideoCaptureElement videoCaptureElement;
YoloRpcElement yoloRpcElement;
@@ -73,6 +86,7 @@
ImageDrawElement imageDrawElement;
RecordVideoElement recordVideoElement;
NewRecordVideoElement newRecordVideoElement;
+ PersonElement personElement;
int m_index;
std::string m_camId;
@@ -91,8 +105,11 @@
QDateTime m_dt;
+ std::map<int, std::vector<LActRuleWeekRecord>> m_weekRuleMap;
+ SdkRuleMap m_sdkRuleMap;
+ std::string m_localIp;
std::string getFullFileName();
-
+ std::mutex mutex;
};
#endif // APPPIPECONTROLLER_H
--
Gitblit v1.8.0