From adb08adc83dfe9dc5d6170c2322952d77a93c510 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期三, 03 四月 2019 09:54:33 +0800
Subject: [PATCH] Merge branch 'yw.1.2' into yangwu1.3
---
QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.cpp | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.cpp b/QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.cpp
index be430a9..faa86f6 100644
--- a/QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.cpp
+++ b/QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.cpp
@@ -117,14 +117,14 @@
} else {
- auto lst = m_lDBTool->searchCamDevTableAll();
+ auto lst = m_lDBTool->searchCamDevTableByType(0);
appPref.setIntData("n_cut_max_duration", lst_dev.n_cut_max_duration);
appPref.setIntData("n_cut_min_duration", lst_dev.n_cut_min_duration);
if (lst.size() > 0) {
Json::Value json;
- int startCamNO = appPref.getIntData("CamStart") * appPref.getIntData("CamStep");
- int CamCount = appPref.getIntData("CamStep");
+ int startCamNO = appPref.getIntData("CamStartNO");
+ int CamCount = appPref.getIntData("CamEndNO") - appPref.getIntData("CamStartNO") + 1;
auto itor = lst.begin();
if (startCamNO >= lst.size()) {
--
Gitblit v1.8.0