From 9186da86847cf954341d1bf58b0c4079a3ab5ac5 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期五, 22 二月 2019 16:46:43 +0800
Subject: [PATCH] 回滚改bug。
---
QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.cpp | 110 +++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 99 insertions(+), 11 deletions(-)
diff --git a/QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.cpp b/QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.cpp
index f64710f..0058a02 100644
--- a/QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.cpp
+++ b/QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.cpp
@@ -75,29 +75,117 @@
appPref.setIntData("n_cut_min_duration", lst_dev.n_cut_min_duration);
if (lst.size() > 0) {
Json::Value json;
- for (auto item : lst) {
- std::string t_camIdex = item.str_cam_dev_id.toStdString();
- std::string rtsp_url = rtspAddrBuild(item.str_ip.toStdString(), 554, item.str_username.toStdString(),
- item.str_password.toStdString(), item.str_brand.toStdString());
- SdkRuleMap ruleMap = m_lDBTool->searchSdkRuleByCamId(item.str_cam_dev_id);
+ int startCamNO = appPref.getIntData("CamStart") * appPref.getIntData("CamStep");
+ int CamCount = appPref.getIntData("CamStep");
+ auto itor = lst.begin();
+
+ if(startCamNO >= lst.size())
+ {
+ ERR("startCamNO > lst.size()");
+ return;
+ }
+
+ for(int i=0; i < startCamNO; i++){
+ itor++;
+ }
+
+ for (int i = 0; i < CamCount; i++) {
+ if (itor == lst.end())
+ {
+ ERR("itor == lst.end()");
+ return;
+ }
+ std::string t_camIdex = itor->str_cam_dev_id.toStdString();
+ std::string rtsp_url = rtspAddrBuild(itor->str_ip.toStdString(), 554, itor->str_username.toStdString(),
+ itor->str_password.toStdString(), itor->str_brand.toStdString());
+ SdkRuleMap ruleMap = m_lDBTool->searchSdkRuleByCamId(itor->str_cam_dev_id);
for (auto &rule:ruleMap) {
- if (rule.second.nThreshold < 5 || rule.second.nThreshold > 95) {
- rule.second.nThreshold = 75;
+
+ rule.second.strAddr = itor->str_addr;
+ rule.second.weekRuleVec = m_lDBTool->searchCameraWeekRuleByCamId(itor->str_cam_dev_id, rule.first);
+
+ if(rule.second.nSdkType == PerStaticSdk)
+ {
+ float temp=1-(float)(rule.second.nThreshold)/100;
+ rule.second.fSensitivity=(75+25*temp)/100;
+
}
- rule.second.fSensitivity = (float) (rule.second.nThreshold) / 100;
+ else if(rule.second.nSdkType != FaceSdk)
+ {
+ float temp=1-(float)(rule.second.nThreshold)/100;
+ rule.second.fSensitivity=(5+90*temp)/100;
+ }
+// if (rule.second.nThreshold < 5 )
+// {
+// rule.second.fSensitivity=0.95;
+// }
+// else if(rule.second.nThreshold > 95)
+// {
+// rule.second.fSensitivity=0.05;
+// }
+// else
+// {
+// rule.second.fSensitivity = 1-(float) (rule.second.nThreshold) / 100;
+// }
+
DBG("fSensitivity" << rule.second.fSensitivity);
- rule.second.strAddr = item.str_addr;
- rule.second.weekRuleVec = m_lDBTool->searchCameraWeekRuleByCamId(item.str_cam_dev_id, rule.first);
}
appPref.setStringData(t_camIdex + "rtsp", rtsp_url);
// appPref.setStringData(t_camIdex+"addr", item.str_addr.toStdString());
json["rtsp"] = rtsp_url;
// json["addr"] = item.str_addr.toStdString();
- INFO("cam add is " << item.str_addr.toStdString());
+ INFO("cam add is " << itor->str_addr.toStdString());
addCamera(t_camIdex, ruleMap);
+ itor++;
}
+
+// for (auto item : lst) {
+// std::string t_camIdex = item.str_cam_dev_id.toStdString();
+// std::string rtsp_url = rtspAddrBuild(item.str_ip.toStdString(), 554, item.str_username.toStdString(),
+// item.str_password.toStdString(), item.str_brand.toStdString());
+// SdkRuleMap ruleMap = m_lDBTool->searchSdkRuleByCamId(item.str_cam_dev_id);
+// for (auto &rule:ruleMap) {
+//
+// rule.second.strAddr = item.str_addr;
+// rule.second.weekRuleVec = m_lDBTool->searchCameraWeekRuleByCamId(item.str_cam_dev_id, rule.first);
+//
+// if(rule.second.nSdkType == PerStaticSdk)
+// {
+// float temp=1-(float)(rule.second.nThreshold)/100;
+// rule.second.fSensitivity=(75+25*temp)/100;
+//
+// }
+// else if(rule.second.nSdkType != FaceSdk)
+// {
+// float temp=1-(float)(rule.second.nThreshold)/100;
+// rule.second.fSensitivity=(5+90*temp)/100;
+// }
+//// if (rule.second.nThreshold < 5 )
+//// {
+//// rule.second.fSensitivity=0.95;
+//// }
+//// else if(rule.second.nThreshold > 95)
+//// {
+//// rule.second.fSensitivity=0.05;
+//// }
+//// else
+//// {
+//// rule.second.fSensitivity = 1-(float) (rule.second.nThreshold) / 100;
+//// }
+//
+// DBG("fSensitivity" << rule.second.fSensitivity);
+// }
+// appPref.setStringData(t_camIdex + "rtsp", rtsp_url);
+// // appPref.setStringData(t_camIdex+"addr", item.str_addr.toStdString());
+// json["rtsp"] = rtsp_url;
+// // json["addr"] = item.str_addr.toStdString();
+//
+// INFO("cam add is " << item.str_addr.toStdString());
+//
+// addCamera(t_camIdex, ruleMap);
+// }
} else {
ERR("searchCamDevTableAll size is 0");
}
--
Gitblit v1.8.0