From 080afae264fe7ff89a54886f28dff208fe5a06c4 Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期二, 16 四月 2019 22:01:35 +0800
Subject: [PATCH] 整合代码
---
QiaoJiaSystem/VideoAnalysFromHC/main.cpp | 47 +++++++++++++++++++++++++----------------------
1 files changed, 25 insertions(+), 22 deletions(-)
diff --git a/QiaoJiaSystem/VideoAnalysFromHC/main.cpp b/QiaoJiaSystem/VideoAnalysFromHC/main.cpp
index 5103ad8..d5a83dd 100644
--- a/QiaoJiaSystem/VideoAnalysFromHC/main.cpp
+++ b/QiaoJiaSystem/VideoAnalysFromHC/main.cpp
@@ -77,24 +77,22 @@
DBG("hava GB28181");
#endif
- if (argc < 4) {
+ if (argc < 10) {
assert("t_value.size()");
}
- int arg1 = atoi(argv[1]);
-
- int gindx = abs(arg1) % 2;
- int GB28181_Enable = arg1 < 0 ? gindx : -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]));
+ appPref.setIntData("GB28181_Enable", atoi(argv[1]));
+ appPref.setIntData("gpu.index", atoi(argv[2]));
+ appPref.setIntData("CamStartNO", atoi(argv[3]));
+ appPref.setIntData("CamEndNO", atoi(argv[4]));
+ appPref.setIntData("RpcVptPort", atoi(argv[5]));
+ appPref.setIntData("RpcFDPort", atoi(argv[6]));
+ appPref.setIntData("RpcFEPort", atoi(argv[7]));
+ appPref.setIntData("RpcFSPort", atoi(argv[8]));
+ appPref.setIntData("RpcVTIMPort", atoi(argv[9]));//瑙﹀彂褰曞儚
+
+ appPref.setIntData("show.image", 0);
//#todo get from config File
// appPref.setStringData("ipAdd", "192.168.1.185");
@@ -104,18 +102,23 @@
appPref.setIntData("ipPort", appConfig.getIntProperty("ES_PORT"));
//yolo server
- appPref.setStringData("yolo.proxy", "yoloServer");
- //#todo
- appPref.setStringData("yolo.ip", "");
- appPref.setIntData("yolo.port", 10003);
-// rpcClient(appPref.getStringData("yolo.proxy"), appPref.getStringData("yolo.ip"), appPref.getLongData("yolo.port"),"tcp"),
+// appPref.setStringData("yolo.proxy", "yoloServer");
+// //#todo
+// appPref.setStringData("yolo.ip", "");
+// appPref.setIntData("yolo.port", appPref.getIntData("RpcYOLOPort"));
+//// rpcClient(appPref.getStringData("yolo.proxy"), appPref.getStringData("yolo.ip"), appPref.getLongData("yolo.port"),"tcp"),
+//vpt server
+ appPref.setStringData("vpt.proxy", "vptServer");
+ //#todo
+ appPref.setStringData("vpt.ip", "");
+ appPref.setIntData("vpt.port", appPref.getIntData("RpcVptPort"));
//face detect server
appPref.setStringData("faceDete.proxy", "faceServer");
//#todo
appPref.setStringData("faceDete.ip", "");
- appPref.setIntData("faceDete.port", 10002);
+ appPref.setIntData("faceDete.port", appPref.getIntData("RpcFDPort"));
//rpcClient(appPref.getStringData("faceDete.proxy"), appPref.getStringData("faceDete.ip"), appPref.getLongData("faceDete.port"),"tcp"),
// rpcClient("faceServer","",10002,"tcp"),
@@ -124,7 +127,7 @@
appPref.setStringData("faceExte.proxy", "faceExtractServer");
//#todo
appPref.setStringData("faceExte.ip", "");
- appPref.setIntData("faceExte.port", 10008);
+ appPref.setIntData("faceExte.port", appPref.getIntData("RpcFEPort"));
//rpcClient(appPref.getStringData("faceExte.proxy"), appPref.getStringData("faceExte.ip"), appPref.getLongData("faceExte.port"),"tcp"),
// "faceExtractServer", "", 10008, "tcp"),//浜鸿劯鐗瑰緛鎻愬彇 淇敼鎴愮偣瀵圭偣閫氳
@@ -132,7 +135,7 @@
//face search server
appPref.setStringData("faceSear.proxy", "faceCmServer");
appPref.setStringData("faceSear.ip", "");
- appPref.setIntData("faceSear.port", 10004);
+ appPref.setIntData("faceSear.port", appPref.getIntData("RpcFSPort"));
//rpcClient(appPref.getStringData("faceSear.proxy"), appPref.getStringData("faceSear.ip"), appPref.getLongData("faceSear.port"),"tcp"),
// faceSearchRpcClient("faceCmServer", "", 10004, "tcp")
--
Gitblit v1.8.0