From b5413f1f00fcf13104b07807e2046372764ef8dc Mon Sep 17 00:00:00 2001
From: miyanhui <dennismi1024@gmail.com>
Date: 星期一, 18 二月 2019 10:12:41 +0800
Subject: [PATCH] 合并代码解决冲突
---
QiaoJiaSystem/VideoAnalysFromHC/main.cpp | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/QiaoJiaSystem/VideoAnalysFromHC/main.cpp b/QiaoJiaSystem/VideoAnalysFromHC/main.cpp
index aad133b..3a46ebf 100644
--- a/QiaoJiaSystem/VideoAnalysFromHC/main.cpp
+++ b/QiaoJiaSystem/VideoAnalysFromHC/main.cpp
@@ -66,14 +66,18 @@
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);
+ appPref.setLongData("gpu.index", 1);
appPref.setIntData("show.image", 0);
+ //todo
+ appPref.setIntData("CamStart", atoi(argv[1]));
+ appPref.setIntData("CamStep", atoi(argv[2]));
+
//#todo get from config File
// appPref.setStringData("ipAdd", "192.168.1.185");
// appPref.setIntData("ipPort", 9200);
--
Gitblit v1.8.0