From 4d1c2ee860222138fc7932225ea6d91e7483646a Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期一, 22 四月 2019 11:18:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.3nsq' into 1.3nsq
---
QiaoJiaSystem/StructureApp/main.cpp | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/main.cpp b/QiaoJiaSystem/StructureApp/main.cpp
index 7d62bc9..454701c 100644
--- a/QiaoJiaSystem/StructureApp/main.cpp
+++ b/QiaoJiaSystem/StructureApp/main.cpp
@@ -21,13 +21,18 @@
appPref.setIntData("gpu.index", 0);
appPref.setIntData("show.image", 0);
- //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"),
+// //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"),
+//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");
--
Gitblit v1.8.0