fix(grpc_BS,gitignore):add 4 camera pic when auto mode. add deploy/* and *.qmake.stash to ignore file

.gitignore

@@ -233,6 +233,7 @@ src/common/modulecomm/systemdef.pri
 # Qt-Creator build
 build-*-Debug
 build-*-Release
+*.qmake.stash
 
 # vscode
 *.vscode
@@ -241,3 +242,6 @@ build-*-Release
 src/common/makeprotointerface/makeprotointerface
 src/common/ivprotoif/*
 include/ivprotoif.h
+
+# deploy
+deploy/*

src/driver/driver_cloud_grpc_client_BS/vehicle_control.cpp

@@ -142,10 +142,10 @@ void VehicleControlClient::updateControlData(void)
     std::cout<<"throttle:"<<throttleCMD<<std::endl;
     std::cout<<"brake:"<<brakeCMD<<std::endl;
 #endif
-//    std::cout<<"\n"<<"shift:"<<shiftCMD<<std::endl;
-//    std::cout<<"steeringWheelAngle:"<<steeringWheelAngleCMD<<std::endl;
-//    std::cout<<"throttle:"<<throttleCMD<<std::endl;
-//    std::cout<<"brake:"<<brakeCMD<<"\n"<<std::endl;
+    std::cout<<"\n"<<"shift:"<<shiftCMD<<std::endl;
+    std::cout<<"steeringWheelAngle:"<<steeringWheelAngleCMD<<std::endl;
+    std::cout<<"throttle:"<<throttleCMD<<std::endl;
+    std::cout<<"brake:"<<brakeCMD<<"\n"<<std::endl;
 
     iv::remotectrl xmsg;
     if(modeCMD == CtrlMode::CMD_REMOTE || modeCMD == CtrlMode::CMD_CLOUD_PLATFORM)
@@ -285,7 +285,7 @@ void VehicleChangeCtrlModeClient::run()
         if(abs(xTime.elapsed() - lastTime)>=interval)
         {
             std::string reply = changeCtrlMode();
-            std::cout<< reply <<std::endl;
+//            std::cout<< reply <<std::endl;
             updateCtrolMode();
             lastTime = xTime.elapsed();
         }

src/driver/driver_cloud_grpc_client_BS/vehicle_upload.cpp

@@ -226,7 +226,10 @@ void DataExchangeClient::ListenFrontPicMsg(const char * strdata,const unsigned i
 
     gMutex_ImageFront.lock();
     cameraImageFront.clear();
-    if(gShift_Status == 6)cameraImageFront.append(xdata.picdata().data(),xdata.picdata().size());
+    if(statusFeedback == VehicleStatus::STATUS_REMOTE && gShift_Status == 6)
+        cameraImageFront.append(xdata.picdata().data(),xdata.picdata().size());
+    else if(statusFeedback == VehicleStatus::STATUS_AUTO || statusFeedback == VehicleStatus::STATUS_EMERGENCY_STOP)
+        cameraImageFront.append(xdata.picdata().data(),xdata.picdata().size());
     gMutex_ImageFront.unlock();
 }
 
@@ -241,7 +244,10 @@ void DataExchangeClient::ListenRearPicMsg(const char * strdata,const unsigned in
 
     gMutex_ImageRear.lock();
     cameraImageRear.clear();
-    if(gShift_Status == 4)cameraImageRear.append(xdata.picdata().data(),xdata.picdata().size());
+    if(statusFeedback == VehicleStatus::STATUS_REMOTE && gShift_Status == 4)
+        cameraImageRear.append(xdata.picdata().data(),xdata.picdata().size());
+    else if(statusFeedback == VehicleStatus::STATUS_AUTO || statusFeedback == VehicleStatus::STATUS_EMERGENCY_STOP)
+        cameraImageRear.append(xdata.picdata().data(),xdata.picdata().size());
     gMutex_ImageRear.unlock();
 }
 
@@ -256,7 +262,10 @@ void DataExchangeClient::ListenLeftPicMsg(const char * strdata,const unsigned in
 
     gMutex_ImageLeft.lock();
     cameraImageLeft.clear();
-    if(gShift_Status == 5)cameraImageLeft.append(xdata.picdata().data(),xdata.picdata().size());
+    if(statusFeedback == VehicleStatus::STATUS_REMOTE && gShift_Status == 5)
+        cameraImageLeft.append(xdata.picdata().data(),xdata.picdata().size());
+    else if(statusFeedback == VehicleStatus::STATUS_AUTO || statusFeedback == VehicleStatus::STATUS_EMERGENCY_STOP)
+        cameraImageLeft.append(xdata.picdata().data(),xdata.picdata().size());
     gMutex_ImageLeft.unlock();
 }
 
@@ -271,7 +280,10 @@ void DataExchangeClient::ListenRightPicMsg(const char * strdata,const unsigned i
 
     gMutex_ImageRight.lock();
     cameraImageRight.clear();
-    if(gShift_Status == 5)cameraImageRight.append(xdata.picdata().data(),xdata.picdata().size());
+    if(statusFeedback == VehicleStatus::STATUS_REMOTE && gShift_Status == 5)
+        cameraImageRight.append(xdata.picdata().data(),xdata.picdata().size());
+    else if(statusFeedback == VehicleStatus::STATUS_AUTO || statusFeedback == VehicleStatus::STATUS_EMERGENCY_STOP)
+        cameraImageRight.append(xdata.picdata().data(),xdata.picdata().size());
     gMutex_ImageRight.unlock();
 }
 
@@ -623,7 +635,7 @@ void DataExchangeClient::run()
         {
             updateData(abs(xTime.elapsed() - lastTime));
             std::string reply = uploadVehicleInfo();
-            std::cout<< reply <<std::endl;
+//            std::cout<< reply <<std::endl;
 //            std::cout<<std::setprecision(12)<<destinationPosition.latitude()<<","<<destinationPosition.longitude()<<std::endl;
             lastTime = xTime.elapsed();
         }