From 0436e5443295395025f89f0d091aab1e9551d1a4 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期四, 10 一月 2019 20:26:31 +0800
Subject: [PATCH] Merge branch 'ywv1.2' of ssh://192.168.1.226:29418/development/c++ into ywv1.2
---
QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.h | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.h b/QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.h
index 890e317..21db01e 100644
--- a/QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.h
+++ b/QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.h
@@ -21,7 +21,7 @@
virtual ~RtspAnalysElement();
- int addCamera(const std::string &, const std::string &);
+ int addCamera(const std::string &, const std::map<int, SdkRule>& sdkRuleMap);
int removeCamera(const std::string &);
@@ -40,7 +40,7 @@
static std::vector<int> chnString2Vec(std::string str_list);
- void setDataByType(int type,Json::Value& json,int camId);
+ void setDataByType(Json::Value& json,const SdkRule& rule);
private:
LDBTool *m_lDBTool;
@@ -50,6 +50,7 @@
int maxCount;
FastFdsWithLock fdfsClient;
+ std::map<int, SdkRule> sdkRuleMap;
};
--
Gitblit v1.8.0