From f76e6f73d57015a04272f05a48c27bfd42b14015 Mon Sep 17 00:00:00 2001
From: miyanhui <dennismi1024@gmail.com>
Date: 星期三, 13 二月 2019 17:33:27 +0800
Subject: [PATCH] Merge branch 'ywv1.2' of http://192.168.1.226:10010/r/development/c++ into ywv1.2
---
QiaoJiaSystem/StructureApp/AppPipeController.h | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/AppPipeController.h b/QiaoJiaSystem/StructureApp/AppPipeController.h
index e617143..9dda290 100644
--- a/QiaoJiaSystem/StructureApp/AppPipeController.h
+++ b/QiaoJiaSystem/StructureApp/AppPipeController.h
@@ -19,7 +19,7 @@
#include "PerStaticElement.h"
#include <jsoncpp/json/json.h>
#include "DBStruct.h"
-
+#include <RtspAnalysServer.h>
class AppPipeController : public PipeController {
public:
/***
@@ -60,7 +60,7 @@
//TriggerElement crowdTriggerElement;
void initCrowd();
-
+ void RecordVideo();
private://KeepRight
JudgmentRetrogradeTool leftJudgment;
JudgmentRetrogradeTool rightJudgment;
@@ -109,7 +109,10 @@
SdkRuleMap m_sdkRuleMap;
std::string m_localIp;
std::string getFullFileName();
-
+ std::mutex mutex;
+ bool m_bSetWH;
+ HiredisTool m_hiredisTool;
+ IceRpcClient<RtspAnalys::RtspAnalysServerPrx> rpcClient;
};
#endif // APPPIPECONTROLLER_H
--
Gitblit v1.8.0