Преглед изворни кода

fix(grpc_BS):add vehicle_type upload

孙嘉城 пре 3 година
родитељ
комит
fcf03d0fd2

+ 1 - 0
src/driver/driver_cloud_grpc_client_BS/driver_cloud_grpc_client_BS.yaml

@@ -10,6 +10,7 @@ uploadmapinterval : 1000
 
 id : 1234567890123456789H
 plateNumber : 津A123456
+vehicleType : 0 #0 跑腿 1 导览 2 清扫
 
 pic_front:
   msgname: picfront

+ 6 - 0
src/driver/driver_cloud_grpc_client_BS/main.cpp

@@ -47,6 +47,7 @@ std::string gstrcontrolInterval = "100";
 std::string gstruploadMapInterval = "1000";
 std::string gstrid = "1234567890123456789H";
 std::string gstrplateNumber = "津A123456";
+std::string gvehicleType = "0"; //0 delevery 1 guid 2 clear
 
 char stryamlpath[256];
 
@@ -122,6 +123,11 @@ void dec_yaml(const char * stryamlpath)
         gstrplateNumber = config["plateNumber"].as<std::string>();
         std::cout<<"plateNumber:"<<gstrplateNumber<<std::endl;
     }
+    if(config["vehicleType"])
+    {
+        gvehicleType = config["vehicleType"].as<std::string>();
+        std::cout<<"vehicleType:"<<gstrplateNumber<<std::endl;
+    }
 
     return;
 }

+ 9 - 0
src/driver/driver_cloud_grpc_client_BS/vehicle_upload.cpp

@@ -17,6 +17,7 @@ extern std::string gstruploadPort;
 extern std::string gstruploadInterval;
 extern std::string gstrid;
 extern std::string gstrplateNumber;
+extern std::string gvehicleType;
 
 extern char stryamlpath[256];
 
@@ -523,6 +524,7 @@ std::string DataExchangeClient::uploadVehicleInfo(void)
     request.set_sensorstatuscamright(sensorStatusCamRight);
     request.set_isarrived(isArrived);
     request.set_platenumber(plateNumber);
+    request.set_classfeedback(vehicleType);
 
     // Container for the data we expect from the server.
     ResponseMessage reply;
@@ -665,6 +667,13 @@ void DataExchangeClient::updateData(uint64_t timeInterval_ms)
 
     plateNumber = gstrplateNumber;
 
+    if(std::atoi(gvehicleType.c_str()) == 0)
+        vehicleType = org::jeecg::defsDetails::grpc::VehicleClass::RUN_ERRANDS;
+    if(std::atoi(gvehicleType.c_str()) == 1)
+        vehicleType = org::jeecg::defsDetails::grpc::VehicleClass::GUIDE;
+    if(std::atoi(gvehicleType.c_str()) == 2)
+        vehicleType = org::jeecg::defsDetails::grpc::VehicleClass::CLEAN;
+
 //    modeFeedback = CtrlMode::CMD_REMOTE; //mode Feedback
 }
 

+ 2 - 0
src/driver/driver_cloud_grpc_client_BS/vehicle_upload.h

@@ -158,6 +158,8 @@ private:
 
     std::string plateNumber;
 
+    org::jeecg::defsDetails::grpc::VehicleClass vehicleType = org::jeecg::defsDetails::grpc::VehicleClass::RUN_ERRANDS;
+
     org::jeecg::defsDetails::grpc::CtrlMode modeFeedback = org::jeecg::defsDetails::grpc::CtrlMode::CMD_EMERGENCY_STOP; //mode Feedback
 
     org::jeecg::defsDetails::grpc::GPSPoint destinationPosition;