From 4d1c2ee860222138fc7932225ea6d91e7483646a Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期一, 22 四月 2019 11:18:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.3nsq' into 1.3nsq
---
QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.cpp | 36 +++++++++++++++++++++++++++---------
1 files changed, 27 insertions(+), 9 deletions(-)
diff --git a/QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.cpp b/QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.cpp
index 6432932..9900ab5 100644
--- a/QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.cpp
+++ b/QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.cpp
@@ -102,7 +102,17 @@
//#todo 浣跨敤绛栫暐妯″紡?鍙戦�佺澶氫釜鎸囦护绱Н鍚庡彂閫�?
if (itor_json->isString() && reader.parse(itor_json->asString(), cfg_val)) {
if (itor_json.name() == "cam_edit" || itor_json.name() == "editSdkRule") {
- string cam_idx = cfg_val["str_cam_dev_id"].asString();
+ string cam_idx = "";
+ if(itor_json.name() == "cam_edit"){
+ if (pthis->m_GB28181_Enable){
+ cam_idx = cfg_val["equipCode"].asString();
+ }else{
+ cam_idx = cfg_val["str_cam_dev_id"].asString();
+ }
+ } else {
+ cam_idx = cfg_val["strCamId"].asString();
+ }
+
if (pthis->controllers.find(cam_idx) != pthis->controllers.end()) {
if (pthis->m_GB28181_Enable) {
auto lst = pthis->m_lDBTool->searchCamDevTableByType(1);
@@ -126,7 +136,13 @@
}
}
} else if (itor_json.name() == "cam_del") {
- string cam_idx = cfg_val["str_cam_dev_id"].asString();
+// string cam_idx = cfg_val["str_cam_dev_id"].asString();
+ string cam_idx = "";
+ if(cfg_val["equipCode"].asString().size()){
+ cam_idx = cfg_val["equipCode"].asString();
+ }else if(cfg_val["str_cam_dev_id"].asString().size()){
+ cam_idx = cfg_val["str_cam_dev_id"].asString();
+ }
pthis->removeCamera(cam_idx);
}
} else {
@@ -254,14 +270,16 @@
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;
+// if (rule.second.nSdkType == PerStaticSdk || rule.second.nSdkType == PerimeterSdk
+// || rule.second.nSdkType == KeepRightSdk || rule.second.nSdkType == KeepRightSdk) {
+ float temp = (float)1 - (float) (rule.second.nThreshold) / 100;
+ rule.second.fSensitivity = (temp * 50 + 50) / 100;
+// rule.second.fSensitivity = (temp * 25 + 75) / 100;
- } else if (rule.second.nSdkType != FaceSdk) {
- float temp = 1 - (float) (rule.second.nThreshold) / 100;
- rule.second.fSensitivity = (5 + 90 * temp) / 100;
- }
+// } else if (rule.second.nSdkType != FaceSdk) {
+// float temp = (float)1 - (float) (rule.second.nThreshold) / 100;
+// rule.second.fSensitivity = (temp * 90 + 5) / 100;
+// }
DBG("fSensitivity" << rule.second.fSensitivity);
}
appPref.setStringData(t_camIdex + "rtsp", rtsp_url);
--
Gitblit v1.8.0