From 5cf652629fb40796cd2e0ab17c3617ed52365473 Mon Sep 17 00:00:00 2001 From: pans <pans@454eff88-639b-444f-9e54-f578c98de674> Date: 星期五, 18 八月 2017 10:32:05 +0800 Subject: [PATCH] capnp client fix bug --- VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFuncServer.cpp | 39 +++++++-------------------------------- 1 files changed, 7 insertions(+), 32 deletions(-) diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFuncServer.cpp b/VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFuncServer.cpp index 3c77217..2b47182 100644 --- a/VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFuncServer.cpp +++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFuncServer.cpp @@ -10,34 +10,14 @@ #include <iostream> using namespace std; -//#todo 淇敼鏈嶅姟绾跨▼鏋勯�犲弬鏁颁紶鍏ユ柟寮� -RemoteServer<RtspFaceViewImpl> remoteServer("192.168.1.94", 8112); +AppConfig config("data/config.cfg"); +RemoteServer<RtspFaceViewImpl> remoteServer(config.getStringValue("local_ip"), config.getIntValue("local_port")); //RemoteServer<RtspFaceViewImpl> remoteServer("192.168.1.97", 8112); static RtspFaceDetectClient* rtspFaceDetectClient = nullptr; void startRemoteServer() { -; - AppConfig config; - config.loadConfig("data/config.cfg"); remoteServer.start(); -// //#todo 璋冪敤浣嶇疆绉诲姩 -// try -// { -// RtspFaceDetectClient rtspFaceDetectClient = RtspFaceDetectClient(); -// RtspFaceDetect::Client& rClient = rtspFaceDetectClient.getClient(); -// -// auto& waitScope = rtspFaceDetectClient.getWaitScope(); -// auto request = rClient.fireFaceCountListenerRequest(); -// auto sendAct = request.send(); -// sendAct.wait(waitScope); -// } -// catch (const kj::Exception& e) -// { -// cout << e.getDescription().cStr() << endl; -// return; -// } - //#end } RtspFaceDetectClient * getRtspFaceDetectClient() @@ -84,10 +64,8 @@ if (rpcClient == nullptr) { try { - //#todo ip test - //rpcClient = new capnp::EzRpcClient("192.168.1.89", 8111); - //client - rpcClient = new capnp::EzRpcClient("192.168.1.97", 8111); + // rpcClient = new capnp::EzRpcClient("192.168.1.97", 8111); + rpcClient = new capnp::EzRpcClient(config.getStringValue("server_ip"), config.getIntValue("server_port")); } catch (const kj::Exception& e) { @@ -103,8 +81,7 @@ { auto results = context.getResults(); remoteGetFaceList(context.getParams(), results); - context.setResults(results); - LOG_ERROR <<"getFaceList : !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"<< LOG_ENDL; + LOG_ERROR <<"getFaceList : !!!!!!!!!!!!!!!"<< LOG_ENDL; return kj::READY_NOW; } @@ -112,8 +89,7 @@ { auto results = context.getResults(); remoteGetFaceListImage(context.getParams(), results); - context.setResults(results); - LOG_ERROR <<"getFaceImages : !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"<< LOG_ENDL; + LOG_ERROR <<"getFaceImages : !!!!!!!!!!!!!!"<< LOG_ENDL; return kj::READY_NOW; } @@ -121,7 +97,6 @@ { auto results = context.getResults(); remoteSetFaceLabel(context.getParams(), results); - context.setResults(results); - LOG_ERROR <<"setFaceLabel : !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"<< LOG_ENDL; + LOG_ERROR <<"setFaceLabel : !!!!!!!!!!!!"<< LOG_ENDL; return kj::READY_NOW; } -- Gitblit v1.8.0