Merge branch 'master' of http://111.33.136.149:3000/adc_pilot/modularization

src/driver/driver_h264_rtspclient/main.cpp

@@ -218,7 +218,7 @@ int main(int argc, char *argv[])
     std::string strrearmsgname  =  xp.GetParam("rearmsg","h264rear");
     std::string strleftmsgname  =  xp.GetParam("leftmsg","h264left");
     std::string strrightmsgname  =  xp.GetParam("rightmsg","h264right");
-    std::string strvin  =  xp.GetParam("VIN","AAAAAAAAAAAAAAAAA");
+    std::string strvin  =  xp.GetParam("VIN","AAAAAAAAAAAAAAVTD");
     std::string strpass  =  xp.GetParam("pass","hello");
     int nwidth = xp.GetParam("width",1920);
     int nheigth = xp.GetParam("height",1080);

src/tool/map_lanetoxodr/ndsdataproc.cpp

@@ -101,7 +101,7 @@ int NDSDataProc::ProcNDSData(std::string strlinepath,std::string strvehiclepath,
         //         QList<QByteArray> badata = baline[i].split('\t');
         QStringList badata = x.split(QRegExp("[,]"));
 
-        if(badata.size()>=75)
+        if(badata.size()>=15)
         {
             iv::nds_vehicle xvehicle;
             xvehicle.localtime = badata[1].toLongLong();