fix(grpc_BS):add some introduction and proto cpp files

src/driver/driver_cloud_grpc_client_BS/VehicleControl.proto

@@ -72,9 +72,9 @@ message MapPoint{
 
 message UploadMapReply {
     string id = 1;
-    bool isNeedMap = 2;
-    string patrolPathID = 3;
-    repeated MapPoint mapPoints = 4;
+    bool isNeedMap = 2; //是否需要路径规划
+    string patrolPathID = 3; //对应巡逻路径的ID
+    repeated MapPoint mapPoints = 4; //需要经过的POI点
 }
 
 message CtrlRequest {

src/driver/driver_cloud_grpc_client_BS/VehicleUpload.proto

@@ -102,7 +102,7 @@ message MapPoint{
 
 message UploadPathRequest{
     string id = 1; // 车辆 SIM 码
-    string patrolPathID = 2;
+    string patrolPathID = 2; //对应巡逻路径的ID
     repeated MapPoint pathPoints = 3;
 }
 

src/driver/driver_cloud_grpc_client_BS/driver_cloud_grpc_client_BS.pro

@@ -17,11 +17,20 @@ DEFINES += QT_DEPRECATED_WARNINGS
 #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
 
 SOURCES += \
-        ../../include/msgtype/cloud.pb.cc \
-    ../../include/msgtype/uploadmsg.pb.cc \
+        VehicleControl.grpc.pb.cc \
+        VehicleControl.pb.cc \
+        VehicleControl_service.grpc.pb.cc \
+        VehicleControl_service.pb.cc \
+        VehiclePatrol.grpc.pb.cc \
+        VehiclePatrol.pb.cc \
+        VehiclePatrol_service.grpc.pb.cc \
+        VehiclePatrol_service.pb.cc \
+        VehicleUpload.grpc.pb.cc \
+        VehicleUpload.pb.cc \
+        VehicleUpload_service.grpc.pb.cc \
+        VehicleUpload_service.pb.cc \
         main.cpp \
-        uploadmsg.grpc.pb.cc \
-    grpcclient.cpp
+        grpcclient.cpp
 
 # Default rules for deployment.
 qnx: target.path = /tmp/$${TARGET}/bin
@@ -51,9 +60,18 @@ else: unix:!android: target.path = /opt/$${TARGET}/bin
 
 
 HEADERS += \
-    ../../include/msgtype/cloud.pb.h \
-    ../../include/msgtype/uploadmsg.pb.h \
-    uploadmsg.grpc.pb.h \
-    uploadmsg.pb.h \
-    grpcclient.h
+        VehicleControl.grpc.pb.h \
+        VehicleControl.pb.h \
+        VehicleControl_service.grpc.pb.h \
+        VehicleControl_service.pb.h \
+        VehiclePatrol.grpc.pb.h \
+        VehiclePatrol.pb.h \
+        VehiclePatrol_service.grpc.pb.h \
+        VehiclePatrol_service.pb.h \
+        VehicleUpload.grpc.pb.h \
+        VehicleUpload.pb.h \
+        VehicleUpload_service.grpc.pb.h \
+        VehicleUpload_service.pb.h \
+        grpcclient.h
 
+#before compile in ubuntu20.04 : sudo apt install libyaml-cpp-dev libgrpc++-dev

src/driver/driver_cloud_grpc_client_BS/driver_cloud_grpc_client_BS.yaml

@@ -1,6 +1,11 @@
-server : 47.96.250.93
-port : 50051
-uploadinterval : 100
+server : 139.9.235.66
+upload_port : 10591
+patrol_port : 10592
+control_port : 20591
+
+uploadinterval : 100 //ms
+patrolinterval : 100
+controlinterval : 100
 
 ID : 1
 

src/driver/driver_cloud_grpc_client_BS/grpcclient.cpp

@@ -175,113 +175,41 @@ void grpcclient::dec_yaml(const char * stryamlpath)
         return;
     }
 
-    std::vector<std::string> vecmodulename;
-
-
     if(config["server"])
     {
         gstrserverip = config["server"].as<std::string>();
     }
-    if(config["port"])
+    if(config["uploadPort"])
     {
-        gstrserverport = config["port"].as<std::string>();
+        gstruploadPort = config["uploadPort"].as<std::string>();
     }
-    if(config["uploadinterval"])
+    if(config["patrolPort"])
     {
-        gstruploadinterval = config["uploadinterval"].as<std::string>();
+        gstrpatrolPort = config["patrolPort"].as<std::string>();
     }
-
-    if(config["VIN"])
+    if(config["controlPort"])
     {
-        gstrVIN = config["VIN"].as<std::string>();
+        gstrcontrolPort = config["controlPort"].as<std::string>();
     }
-
-    if(config["queryMD5"])
+    if(config["uploadInterval"])
     {
-        gstrqueryMD5 = config["queryMD5"].as<std::string>();
+        gstruploadInterval = config["uploadInterval"].as<std::string>();
     }
-    else
+    if(config["patrolInterval"])
     {
-        return;
+        gstrpatrolInterval = config["patrolInterval"].as<std::string>();
     }
 
-    if(config["ctrlMD5"])
+    if(config["id"])
     {
-        gstrctrlMD5 = config["ctrlMD5"].as<std::string>();
+        gstrid = config["id"].as<std::string>();
     }
-
-
-    std::string strmsgname;
-
-    if(config["uploadmessage"])
+    if(config["plateNumber"])
     {
-
-        for(YAML::const_iterator it= config["uploadmessage"].begin(); it != config["uploadmessage"].end();++it)
-        {
-            std::string strtitle = it->first.as<std::string>();
-            std::cout<<strtitle<<std::endl;
-
-            if(config["uploadmessage"][strtitle]["msgname"]&&config["uploadmessage"][strtitle]["buffersize"]&&config["uploadmessage"][strtitle]["buffercount"])
-            {
-                iv::msgunit xmu;
-                strmsgname = config["uploadmessage"][strtitle]["msgname"].as<std::string>();
-                strncpy(xmu.mstrmsgname,strmsgname.data(),255);
-                xmu.mnBufferSize = config["uploadmessage"][strtitle]["buffersize"].as<int>();
-                xmu.mnBufferCount = config["uploadmessage"][strtitle]["buffercount"].as<int>();
-                if(config["uploadmessage"][strtitle]["bimportant"])
-                {
-                   std::string strimportant =    config["uploadmessage"][strtitle]["bimportant"].as<std::string>();
-                   if(strimportant == "true")
-                   {
-                       xmu.mbImportant = true;
-                   }
-                }
-                if(config["uploadmessage"][strtitle]["keeptime"])
-                {
-                   std::string strkeep =    config["uploadmessage"][strtitle]["keeptime"].as<std::string>();
-                   xmu.mnkeeptime = atoi(strkeep.data());
-                }
-                mvectormsgunit.push_back(xmu);
-            }
-        }
-    }
-    else
-    {
-
-
-    }
-
-    if(!config["ctrlMD5"])
-    {
-       return;
-    }
-
-    if(config["ctrlmessage"])
-    {
-        std::string strnodename = "ctrlmessage";
-        for(YAML::const_iterator it= config[strnodename].begin(); it != config[strnodename].end();++it)
-        {
-            std::string strtitle = it->first.as<std::string>();
-            std::cout<<strtitle<<std::endl;
-
-            if(config[strnodename][strtitle]["msgname"]&&config[strnodename][strtitle]["buffersize"]&&config[strnodename][strtitle]["buffercount"])
-            {
-                iv::msgunit xmu;
-                strmsgname = config[strnodename][strtitle]["msgname"].as<std::string>();
-                strncpy(xmu.mstrmsgname,strmsgname.data(),255);
-                xmu.mnBufferSize = config[strnodename][strtitle]["buffersize"].as<int>();
-                xmu.mnBufferCount = config[strnodename][strtitle]["buffercount"].as<int>();
-                mvectorctrlmsgunit.push_back(xmu);
-            }
-        }
-    }
-    else
-    {
-
+        gstrplateNumber = config["plateNumber"].as<std::string>();
     }
 
     return;
-
 }
 
 void grpcclient::sharectrlmsg(iv::cloud::cloudmsg * pxmsg)

src/driver/driver_cloud_grpc_client_BS/grpcclient.h

@@ -19,16 +19,12 @@
 
 #include "modulecomm.h"
 
-#include "cloud.pb.h"
-
 #include <iostream>
 #include <memory>
 #include <string>
 
 #include <grpcpp/grpcpp.h>
 
-#include "uploadmsg.grpc.pb.h"
-
 
 namespace iv {
 struct msgunit
@@ -56,27 +52,23 @@ public:
     grpcclient(std::string stryamlpath);
 
 private:
-    std::string gstrserverip =  "0.0.0.0";//"123.57.212.138";
-    std::string gstrserverport = "50051";//"9000";
-    std::string gstruploadinterval = "1000";
+    std::string gstrserverip =  "139.9.235.66";//"123.57.212.138";
+    std::string gstruploadPort = "10591";//"9000";
+    std::string gstrpatrolPort = "10592";//"9000";
+    std::string gstrcontrolPort = "20591";//"9000";
+    std::string gstruploadInterval = "100";
+    std::string gstrpatrolInterval = "100";
+    std::string gstrcontrolInterval = "100";
+    std::string gstrid = "1";
+    std::string gstrplateNumber = "A00001";
     void * gpa;
     QMutex gMutexMsg;
     std::thread * guploadthread;
 
-
-
-
     std::vector<iv::msgunit> mvectormsgunit;
 
     std::vector<iv::msgunit> mvectorctrlmsgunit;
 
-
-    std::string gstrVIN = "AAAAAAAAAAAAAAAAA";
-    std::string gstrqueryMD5 = "5d41402abc4b2a76b9719d911017c591";//"5d41402abc4b2a76b9719d911017c592";
-    std::string gstrctrlMD5 = "5d41402abc4b2a76b9719d911017c591";
-
-
-
     int gindex = 0;
 public:
     void UpdateData(const char * strdata,const unsigned int nSize,const char * strmemname);