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 | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/QiaoJiaSystem/VideoAnalysFromHC/main.cpp b/QiaoJiaSystem/VideoAnalysFromHC/main.cpp
index 3a39a22..39abc9a 100644
--- a/QiaoJiaSystem/VideoAnalysFromHC/main.cpp
+++ b/QiaoJiaSystem/VideoAnalysFromHC/main.cpp
@@ -77,7 +77,18 @@
DBG("hava GB28181");
#endif
- appPref.setLongData("gpu.index", 0);
+ 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
@@ -126,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;
--
Gitblit v1.8.0