Merge branch '1+x' of http://111.33.136.149:3000/adc_pilot/modularization into 1+x

src/decition/common/common/car_status.h

@@ -212,9 +212,9 @@ namespace iv {
         //对于1+x车辆V2X信息，cxw
         unsigned char rsu_traffic_type=0;//路况信息
         unsigned char rsu_warning_type=0;//碰撞预警信息
-        float rsu_radiation_distance=0;//事件辐射范围
-        float rsu_trafficelimit_spd=200;  //200代表没有限速
-        float rsu_warnlimit_spd=200;  //200代表没有限速
+        int rsu_radiation_distance=0;//事件辐射范围
+        int rsu_trafficelimit_spd=200;  //200代表没有限速
+        int rsu_warnlimit_spd=200;  //200代表没有限速
         double rsu_gps_lat=0.0;
         double rsu_gps_lng=0.0;//中心点
         int iTrafficeLightColor = 2;    //0x0: 红色

src/decition/decition_brain_sf_1x/decition/brain.cpp

@@ -140,7 +140,7 @@ iv::decition::BrainDecition::BrainDecition()
 
     mpvbox = iv::modulecomm::RegisterRecv("vbox",iv::decition::ListenVbox);
 
-    mpv2r = iv::modulecomm::RegisterRecv("v2r",iv::decition::ListenV2r); //20211009,cxw
+    mpv2r = iv::modulecomm::RegisterRecv("v2r_send",iv::decition::ListenV2r); //20211009,cxw
 
     mpaVechicleState = iv::modulecomm::RegisterSend(gstrmembrainstate.data(),10000,10);
 

src/v2x/CommunicatePlatform/mainwindow.cpp

@@ -23,15 +23,15 @@ MainWindow::MainWindow(QWidget *parent) :
     //ShareMem: ui
     ModuleFun funUI =std::bind(&MainWindow::UpdateUI,this,std::placeholders::_1, \
                                    std::placeholders::_2,std::placeholders::_3,std::placeholders::_4,std::placeholders::_5);
-    mpMemUI = iv::modulecomm::RegisterRecvPlus("hcp2_hmi",funUI);
+    mpMemUI = iv::modulecomm::RegisterRecvPlus("hmi",funUI);
     //ShareMem: control
     ModuleFun funControl =std::bind(&MainWindow::UpdateControl,this,std::placeholders::_1, \
                                    std::placeholders::_2,std::placeholders::_3,std::placeholders::_4,std::placeholders::_5);
-    mpMemControl = iv::modulecomm::RegisterRecvPlus("hcp2_chassis",funControl);
+    mpMemControl = iv::modulecomm::RegisterRecvPlus("chassis",funControl);
     //ShareMem: state
     ModuleFun funState =std::bind(&MainWindow::UpdateState,this,std::placeholders::_1, \
                                    std::placeholders::_2,std::placeholders::_3,std::placeholders::_4,std::placeholders::_5);
-    mpMemState = iv::modulecomm::RegisterRecvPlus("hcp2_brainstate",funControl);
+    mpMemState = iv::modulecomm::RegisterRecvPlus("brainstate",funControl);
 }
 
 MainWindow::~MainWindow()