|
@@ -5,6 +5,7 @@
|
|
|
#include <QStringList>
|
|
|
#include <math.h>
|
|
|
#include <iomanip>
|
|
|
+#include <thread>
|
|
|
|
|
|
#include "modulecomm.h"
|
|
|
#include "rawpic.pb.h"
|
|
@@ -19,6 +20,9 @@ extern std::string gstrid;
|
|
|
extern std::string gstrplateNumber;
|
|
|
extern std::string gvehicleType;
|
|
|
|
|
|
+extern double gspeedWantAvg; // m/s
|
|
|
+extern double gwaitTime; // s
|
|
|
+
|
|
|
extern char stryamlpath[256];
|
|
|
|
|
|
extern uint8_t gShift_Status;//3 p 4 r 5 n 6 d
|
|
@@ -524,6 +528,8 @@ std::string DataExchangeClient::uploadVehicleInfo(void)
|
|
|
request.set_sensorstatuscamright(sensorStatusCamRight);
|
|
|
request.set_isarrived(isArrived);
|
|
|
request.set_platenumber(plateNumber);
|
|
|
+ request.set_usestatusfeedback(org::jeecg::defsDetails::grpc::UseStatus::ENABLING);
|
|
|
+ request.set_remainpathlength(500.0);
|
|
|
request.set_classfeedback(vehicleType);
|
|
|
|
|
|
// Container for the data we expect from the server.
|
|
@@ -569,6 +575,9 @@ std::string DataExchangeClient::uploadPath(void)
|
|
|
request.add_pathpoints();
|
|
|
request.mutable_pathpoints(i)->operator =(pathPoints.at(i));
|
|
|
}
|
|
|
+ request.set_arrivedtime(500.0/gspeedWantAvg);
|
|
|
+ request.set_waittime(gwaitTime);
|
|
|
+ request.set_totalpathlength(500.0);
|
|
|
|
|
|
// Container for the data we expect from the server.
|
|
|
Empty reply;
|