From 07fb2c16c75734d8c127585353249f529ea1262c Mon Sep 17 00:00:00 2001
From: pans <pansen626@sina.com>
Date: 星期四, 14 三月 2019 17:39:25 +0800
Subject: [PATCH] Merge branch 'yw.1.2.fixbug' of ssh://192.168.1.226:29418/development/c++ into yw.1.2.fixbug
---
QiaoJiaSystem/VideoAnalysFromHC/main.cpp | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/QiaoJiaSystem/VideoAnalysFromHC/main.cpp b/QiaoJiaSystem/VideoAnalysFromHC/main.cpp
index 87b89d5..e70d72b 100644
--- a/QiaoJiaSystem/VideoAnalysFromHC/main.cpp
+++ b/QiaoJiaSystem/VideoAnalysFromHC/main.cpp
@@ -84,7 +84,7 @@
int arg1 = atoi(argv[1]);
int gindx = abs(arg1) % 2;
- int GB28181_Enable = arg1 < 0 ? gindx : -1;
+ int GB28181_Enable = arg1 < 0 ? 1 : 0;
DBG(gindx);
appPref.setIntData("GB28181_Enable", GB28181_Enable);
@@ -137,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