From 6540a2a9d69432c4cc475e3b32eae11e9e0ace73 Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期四, 11 四月 2019 20:28:10 +0800
Subject: [PATCH] 1.srs的分辨率在config.json配置 2.单播推流控制，国标摄像机差一个关闭测试 3. 底库字段添加
---
QiaoJiaSystem/DataManagerServer/vss/controller/CamDevController.h | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/QiaoJiaSystem/DataManagerServer/vss/controller/CamDevController.h b/QiaoJiaSystem/DataManagerServer/vss/controller/CamDevController.h
index 52ae28c..22aa644 100755
--- a/QiaoJiaSystem/DataManagerServer/vss/controller/CamDevController.h
+++ b/QiaoJiaSystem/DataManagerServer/vss/controller/CamDevController.h
@@ -321,6 +321,8 @@
Json::Value typeJsonValue = requestJsonValue[CamDev_type];
if (typeJsonValue.type() != Json::ValueType::nullValue) {
camDevBuilder.addtype((typeJsonValue.asString()));
+ } else {
+ camDevBuilder.addtype("1");
}
responseJsonValue["message"] = "鏌ヨ鎴愬姛锛�";
responseJsonValue["success"] = "true";
@@ -402,6 +404,8 @@
Json::Value typeJsonValue = requestJsonValue[CamDev_type];
if (typeJsonValue.type() != Json::ValueType::nullValue) {
camDevBuilder.addtype((typeJsonValue.asString()));
+ } else {
+ camDevBuilder.addtype("1");
}
responseJsonValue["message"] = "鏌ヨ鎴愬姛锛�";
responseJsonValue["success"] = "true";
--
Gitblit v1.8.0