From 2cf69b4bbe56fc379c7f433037e043d0dba42493 Mon Sep 17 00:00:00 2001
From: miyanhui <dennismi1024@gmail.com>
Date: 星期五, 15 二月 2019 15:58:59 +0800
Subject: [PATCH] Merge branch 'ywv1.2' of http://192.168.1.226:10010/r/development/c++ into ywv1.2
---
QiaoJiaSystem/VideoAnalysFromHC/main.cpp | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/QiaoJiaSystem/VideoAnalysFromHC/main.cpp b/QiaoJiaSystem/VideoAnalysFromHC/main.cpp
index 98df593..0f695e3 100644
--- a/QiaoJiaSystem/VideoAnalysFromHC/main.cpp
+++ b/QiaoJiaSystem/VideoAnalysFromHC/main.cpp
@@ -9,6 +9,7 @@
#include "DBManageClass.h"
#include "RtspAnalysElement.h"
#include <basic/debug/Debug.h>
+#include "StructureApp/NewEncodeVideoManager.h"
//#include "PerimeterAlarmManager.h"
//#include "KeepRightManager.h"
//"192.168.1.4", 8000, "admin", "basic123"
@@ -41,6 +42,8 @@
static void startRtspAnalysElement(LDBTool *_dbTool) {
RtspAnalysElement rtspAnalysElement(_dbTool);
+// NewEncodeVideoManager newEncodeVideoManager;
+// newEncodeVideoManager.start();
while (1) {
sleep(1 * 60 * 60 * 12);
}
@@ -63,9 +66,12 @@
int main(int argc, char **argv) {
SAVE_APP_ARGS
- ENABLEGLOG(GET_STR_CONFIG("logPath").c_str());
+ std::cout<<__DATE__<<" "<<__TIME__<<std::endl;
+#ifdef GLOG
+ ENABLEGLOG(GET_STR_CONFIG("logPath").c_str());
+#endif
- appPref.setLongData("gpu.index", 0);
+ appPref.setLongData("gpu.index", 1);
appPref.setIntData("show.image", 0);
//#todo get from config File
@@ -123,11 +129,12 @@
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");
sleep(5);
--
Gitblit v1.8.0