From fd6b130ed52e1412ccb1ff8bf7891a90a6f96d31 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期四, 28 二月 2019 20:22:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yw.1.2.fixbug' into yw.1.2
---
QiaoJiaSystem/DataManagerServer/http_configserver.cpp | 1 +
QiaoJiaSystem/VideoToImageMulth/RtspCaptureElement.h | 2 +-
QiaoJiaSystem/VideoToImageMulth/RtspImageRedis.h | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/QiaoJiaSystem/DataManagerServer/http_configserver.cpp b/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
index 7521a07..d53886a 100644
--- a/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
+++ b/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
@@ -1062,6 +1062,7 @@
rec.str_username = QString::fromStdString(value["str_username"].asString());
rec.str_password = QString::fromStdString(value["str_password"].asString());
rec.str_brand = QString::fromStdString(value["str_brand"].asString());
+ rec.str_reserved = QString::fromStdString(value["str_reserved"].asString());
type = value["n_type"].asInt();
// rec_sdk_old = db_c.searchCamSdkTableByCamId(rec.str_cam_dev_id);
diff --git a/QiaoJiaSystem/VideoToImageMulth/RtspCaptureElement.h b/QiaoJiaSystem/VideoToImageMulth/RtspCaptureElement.h
index e52ea77..144b561 100644
--- a/QiaoJiaSystem/VideoToImageMulth/RtspCaptureElement.h
+++ b/QiaoJiaSystem/VideoToImageMulth/RtspCaptureElement.h
@@ -41,7 +41,7 @@
std::string m_path;
// Redis鐨勫伐鍏风被
- HiredisTool m_redisTool;
+// HiredisTool m_redisTool;
//瀵逛繚瀛樺埌Redis鐨勫浘鐗囪繘琛岃鏁�
std::atomic<int> m_picCount{0};
diff --git a/QiaoJiaSystem/VideoToImageMulth/RtspImageRedis.h b/QiaoJiaSystem/VideoToImageMulth/RtspImageRedis.h
index 12d0197..716b5cc 100644
--- a/QiaoJiaSystem/VideoToImageMulth/RtspImageRedis.h
+++ b/QiaoJiaSystem/VideoToImageMulth/RtspImageRedis.h
@@ -47,7 +47,7 @@
std::string m_camId;
//姣忓彴鎽勫儚鏈轰繚瀛樺埌Redis鐨勫浘鐗囨暟閲忕殑鏈�澶у��
- const int M_CAM_PIC_MAX_COUNT = 25;
+ const int M_CAM_PIC_MAX_COUNT = 3;
};
#endif // VIDEOCAPTUREELEMENT_H
--
Gitblit v1.8.0