From a89689b92b07cf1830ad8b46521eda92e7f927c0 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期三, 30 一月 2019 16:37:45 +0800
Subject: [PATCH] 修改bug
---
QiaoJiaSystem/StructureApp/AppPipeController.h | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/AppPipeController.h b/QiaoJiaSystem/StructureApp/AppPipeController.h
index 9e031af..51a47ed 100644
--- a/QiaoJiaSystem/StructureApp/AppPipeController.h
+++ b/QiaoJiaSystem/StructureApp/AppPipeController.h
@@ -27,14 +27,14 @@
* @param folderPath 浠诲姟鏍圭洰褰曪紝鐢ㄤ簬鍋氬叡浜唴瀛榠d
* @param json 鍙傛暟涓簉tsp娴佸湴鍧� sdk鏄惁鍚敤鐨勬爣璇�
*/
- // AppPipeController(std::string folderPath, const Json::Value &json);
- AppPipeController(std::string folderPath, const SdkRuleMap& ruleMap);
+ // 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);
+ AppPipeController(std::string camId, const SdkRuleMap &ruleMap, bool RecordVideoEnable);
virtual ~AppPipeController();
@@ -46,12 +46,14 @@
void setfdfsClient(FastFdsWithLock *p_fdfsClient);
- void setWeekRule(const std::map<int, std::vector<LActRuleWeekRecord>>& weekRuleMap);
+ void setWeekRule(const std::map<int, std::vector<LActRuleWeekRecord>> &weekRuleMap);
+
private:
void init();
+
private://Perimete
PerimeterElement perimeterElement;
- // TriggerElement peTriggerElement;
+ // TriggerElement peTriggerElement;
void initPerimeter();
@@ -72,12 +74,15 @@
private:
PerStaticElement perStaticElement;
+
void initPerStatic();
+
private://Perimete
PerimeterElement perHubElement;
- // TriggerElement peTriggerElement;
+ // TriggerElement peTriggerElement;
void initPerHub();
+
private:
ffmpeg::VideoCaptureElement videoCaptureElement;
YoloRpcElement yoloRpcElement;
@@ -108,8 +113,11 @@
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