From ed223aee5fe5f3b222488549597976f34c679c3d Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期二, 05 三月 2019 14:00:47 +0800
Subject: [PATCH] 代码格式化及部分bug修改
---
QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.h | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.h b/QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.h
index 890e317..d943d1c 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 &);
@@ -36,11 +36,11 @@
private:
void init();
- std::string resetFdfs(std::string ip = "", unsigned int port = 0, std::string content = "");
+// std::string resetFdfs(std::string ip = "", unsigned int port = 0, std::string content = "");
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