From ed223aee5fe5f3b222488549597976f34c679c3d Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期二, 05 三月 2019 14:00:47 +0800
Subject: [PATCH] 代码格式化及部分bug修改
---
QiaoJiaSystem/VideoAnalysFromHC/main.cpp | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/QiaoJiaSystem/VideoAnalysFromHC/main.cpp b/QiaoJiaSystem/VideoAnalysFromHC/main.cpp
index cfb0eba..3a39a22 100644
--- a/QiaoJiaSystem/VideoAnalysFromHC/main.cpp
+++ b/QiaoJiaSystem/VideoAnalysFromHC/main.cpp
@@ -42,8 +42,8 @@
static void startRtspAnalysElement(LDBTool *_dbTool) {
RtspAnalysElement rtspAnalysElement(_dbTool);
- NewEncodeVideoManager newEncodeVideoManager;
- newEncodeVideoManager.start();
+// NewEncodeVideoManager newEncodeVideoManager;
+// newEncodeVideoManager.start();
while (1) {
sleep(1 * 60 * 60 * 12);
}
@@ -66,10 +66,24 @@
int main(int argc, char **argv) {
SAVE_APP_ARGS
+ std::cout << __DATE__ << " " << __TIME__ << std::endl;
+#ifdef GLOG
ENABLEGLOG(GET_STR_CONFIG("logPath").c_str());
+#endif
+
+#ifndef GB28181
+ DBG("no GB28181");
+#else
+ DBG("hava GB28181");
+#endif
appPref.setLongData("gpu.index", 0);
appPref.setIntData("show.image", 0);
+
+ //todo
+ appPref.setIntData("CamStart", atoi(argv[1]));
+ appPref.setIntData("CamStep", atoi(argv[2]));
+ appPref.setIntData("RpcServerPort", atoi(argv[3]));
//#todo get from config File
// appPref.setStringData("ipAdd", "192.168.1.185");
@@ -126,11 +140,11 @@
appPref.setStringData("fxDevID", rec.dev_id.toStdString());
appPref.setStringData("fxDevNAME", rec.dev_name.toStdString());
appPref.setStringData("user.loop.absolute.path", appConfig.getStringProperty("cutPath"));
-
+ appPref.setStringData("clusterID", appConfig.getStringProperty("clusterID"));
bool loopRet = true;
while (loopRet) {
- switch (_dbTool.searchDevTypeFromConfigTable()) {
+ switch (_dbTool.searchDevTypeFromConfigTable()) {
case 0: {
DBG("case 0");
--
Gitblit v1.8.0