From edb7c9ae9cd72601bcb58d3e1a3d9bf9250f0100 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期二, 29 一月 2019 09:44:54 +0800
Subject: [PATCH] 添加布控等级。对比暂未添加本字段。
---
QiaoJiaSystem/StructureApp/AppPipeController.h | 37 +++++++++++++++++++++++++++++++------
1 files changed, 31 insertions(+), 6 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/AppPipeController.h b/QiaoJiaSystem/StructureApp/AppPipeController.h
index 58f3e55..51a47ed 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,12 +46,14 @@
void setfdfsClient(FastFdsWithLock *p_fdfsClient);
+ void setWeekRule(const std::map<int, std::vector<LActRuleWeekRecord>> &weekRuleMap);
+
private:
void init();
private://Perimete
PerimeterElement perimeterElement;
- // TriggerElement peTriggerElement;
+ // TriggerElement peTriggerElement;
void initPerimeter();
@@ -63,7 +70,18 @@
// 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;
@@ -73,6 +91,7 @@
ImageDrawElement imageDrawElement;
RecordVideoElement recordVideoElement;
NewRecordVideoElement newRecordVideoElement;
+ PersonElement personElement;
int m_index;
std::string m_camId;
@@ -91,8 +110,14 @@
QDateTime m_dt;
+ std::map<int, std::vector<LActRuleWeekRecord>> m_weekRuleMap;
+ SdkRuleMap m_sdkRuleMap;
+ std::string m_localIp;
+
std::string getFullFileName();
+ std::mutex mutex;
+ bool m_bSetWH;
};
#endif // APPPIPECONTROLLER_H
--
Gitblit v1.8.0