From 5bf0020b189b2bc8c64737c2af4ea77c3e8f5612 Mon Sep 17 00:00:00 2001
From: xuxiuxi <554325746@qq.com>
Date: 星期五, 08 三月 2019 22:24:27 +0800
Subject: [PATCH] Merge branch 'yw.1.2.fixbug' of http://192.168.1.226:10010/r/development/c++ into yw.1.2.fixbug
---
QiaoJiaSystem/VideoAnalysFromHC/main.cpp | 41 +++++++++++++++++++++++++++++++++++------
1 files changed, 35 insertions(+), 6 deletions(-)
diff --git a/QiaoJiaSystem/VideoAnalysFromHC/main.cpp b/QiaoJiaSystem/VideoAnalysFromHC/main.cpp
index 98df593..39abc9a 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,10 +66,35 @@
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
- appPref.setLongData("gpu.index", 0);
+#ifndef GB28181
+ DBG("no GB28181");
+#else
+ DBG("hava GB28181");
+#endif
+
+ if (argc < 4) {
+ assert("t_value.size()");
+ }
+
+ int arg1 = atoi(argv[1]);
+
+ int gindx = abs(arg1) % 2;
+ int GB28181_Enable = arg1 < 0 ? 1 : -1;
+ DBG(gindx);
+ appPref.setIntData("GB28181_Enable", GB28181_Enable);
+
+ appPref.setLongData("gpu.index", gindx);
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");
@@ -109,10 +137,10 @@
// faceSearchRpcClient("faceCmServer", "", 10004, "tcp")
//loopRecord server
- appPref.setStringData("loopRecord.proxy", "LoopRecordVideoServer");
- //#todo
- appPref.setStringData("loopRecord.ip", "");
- appPref.setIntData("loopRecord.port", 10010);
+// appPref.setStringData("loopRecord.proxy", "LoopRecordVideoServer");
+// //#todo
+// appPref.setStringData("loopRecord.ip", "");
+// appPref.setIntData("loopRecord.port", 10010);
//rpcClient(appPref.getStringData("loopRecord.proxy"), appPref.getStringData("loopRecord.ip"), appPref.getLongData("loopRecord.port"),"tcp"),
LDBTool _dbTool;
@@ -123,11 +151,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()) {
+
case 0: {
DBG("case 0");
sleep(5);
--
Gitblit v1.8.0