add car status

src/driver/driver_cloud_grpc_client_BS/VehicleUpload.proto

@@ -47,6 +47,10 @@ message GPSPoint{
 enum UseStatus{
     DEACTIVATING = 0;//停用中
     ENABLING = 1;//启用中
+    IN_THE_MISSION = 2;//ÈÎÎñ;ÖÐ
+    REMOTE_CTRL = 3;//È˹¤½Ó¹Ü״̬
+    BACK_TO_WAIT_STATION = 4;//»Øµ½´ýÃüµã;ÖÐ
+    BACK_TO_MAINTAIN_STATION = 5;//»Øµ½³äµçµã;ÖÐ
 }
 
 enum VehicleClass{

src/driver/driver_cloud_grpc_client_BS/fsm_unit.cpp

@@ -298,7 +298,7 @@ void FSMUnit::refreshFSMStatus_Slot(void)
         {
             waitingStationArrived = false;
         }
-        emit useStatusChanged(0);
+        emit useStatusChanged(1);
         emit setAllowPlan(true);
         break;
     case 1: ///< 1任务中
@@ -310,7 +310,7 @@ void FSMUnit::refreshFSMStatus_Slot(void)
         {
             remoteCtrlCMD = iv::brain::RemoteCtrlCMD::REMOTE_CTRL_RESERVED;
         }
-        emit useStatusChanged(1);
+        emit useStatusChanged(2);
         emit setAllowPlan(false);
         break;
     case 2: ///< 2人工接管
@@ -318,7 +318,7 @@ void FSMUnit::refreshFSMStatus_Slot(void)
         {
             remoteCtrlCMD = iv::brain::RemoteCtrlCMD::REMOTE_CTRL_RESERVED;
         }
-        emit useStatusChanged(2);
+        emit useStatusChanged(3);
         emit setAllowPlan(false);
         break;
     case 3: ///< 3停工停车
@@ -330,7 +330,7 @@ void FSMUnit::refreshFSMStatus_Slot(void)
         {
             maintainStationArrived = false;
         }
-        emit useStatusChanged(3);
+        emit useStatusChanged(0);
         emit setAllowPlan(false);
         break;
     case 4: ///< 4返程

src/driver/driver_cloud_grpc_client_BS/fsm_unit.h

@@ -100,7 +100,7 @@ private:
 
 signals:
     void refreshFSMStatus(void);
-    void useStatusChanged(unsigned int status);
+    void useStatusChanged(int status);
     void setAllowPlan(bool isAllow);
     void sendPathPlanRequest(double latitude,double longitude);
 

src/driver/driver_cloud_grpc_client_BS/vehicle_upload.cpp

@@ -956,12 +956,29 @@ void DataExchangeClient::destination_Refreshed_Timeout(void)
     std::cout<<"path plan timeout."<<std::endl;
 }
 
-void DataExchangeClient::useStatusChanged_Slot(unsigned int status)
+void DataExchangeClient::useStatusChanged_Slot(int status)
 {
-    if(status == 3)
+    switch(status)
+    {
+    case 0:
         useStatus = org::jeecg::defsDetails::grpc::UseStatus::DEACTIVATING;
-    else
+        break;
+    case 1:
         useStatus = org::jeecg::defsDetails::grpc::UseStatus::ENABLING;
-
-    FSMStatus = status; ///< 0:待命停车 1:任务中 2:人工接管 3:停工停车 4:返程 5:返库
+        break;
+    case 2:
+        useStatus = org::jeecg::defsDetails::grpc::UseStatus::IN_THE_MISSION;
+        break;
+    case 3:
+        useStatus = org::jeecg::defsDetails::grpc::UseStatus::REMOTE_CTRL;
+        break;
+    case 4:
+        useStatus = org::jeecg::defsDetails::grpc::UseStatus::BACK_TO_WAIT_STATION;
+        break;
+    case 5:
+        useStatus = org::jeecg::defsDetails::grpc::UseStatus::BACK_TO_MAINTAIN_STATION;
+        break;
+    default:
+        break;
+    }
 }

src/driver/driver_cloud_grpc_client_BS/vehicle_upload.h

@@ -188,7 +188,7 @@ signals:
 
 public slots:
     void patrolPOI_Recieved_Slot(std::string pathID);
-    void useStatusChanged_Slot(unsigned int status);
+    void useStatusChanged_Slot(int status);
 
 private slots:
     void destination_Recieved_Slot(void);