From 049e00dc49439d82f72d5f7c1b6cae6b9023686e Mon Sep 17 00:00:00 2001 From: chenshijun <csj_sky@126.com> Date: 星期二, 16 四月 2019 18:34:37 +0800 Subject: [PATCH] 解决修改参数和推流画面跳跃问题 --- QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.cpp | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.cpp b/QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.cpp index c54cf32..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 { -- Gitblit v1.8.0