change map_lanetoxodr.

src/tool/map_lanetoxodr/cdamain.cpp

@@ -15,6 +15,8 @@
 
 #include "cdaproc.h"
 
+QString gstrAppPath;
+
 static char gstr_inputpath[256];
 static char gstr_outputpath[256];
 
@@ -104,6 +106,12 @@ int main(int argc, char *argv[])
     snprintf(gstr_inputpath,255," ");
     snprintf(gstr_outputpath,255," ");
 
+    std::cout<<"app path."<<a.applicationDirPath().toLatin1().data()<<std::endl;
+
+    gstrAppPath = a.applicationDirPath();
+
+//    ServiceExcelAPI.IsLoad();
+
     int nRtn = GetOptLong(argc,argv);
     if(nRtn == 1)  //show help,so exit.
     {

src/tool/map_lanetoxodr/excelapi.cpp

@@ -3,13 +3,17 @@
 #include <QLibrary>
 #include <iostream>
 
+extern QString gstrAppPath;
 ExcelAPI::ExcelAPI()
 {
     std::cout<<"Load Excel API"<<std::endl;
+
 #ifdef Q_OS_WIN
     QLibrary xlib("./plugin/libxlnt.dll");
 #else
-    QLibrary xlib("./plugin/libxlnt.so.1.5.0");
+    QString strxlntpath = gstrAppPath + "/plugin/libxlnt.so.1.5.0";
+    QLibrary xlib(strxlntpath);
+//    QLibrary xlib("./plugin/libxlnt.so.1.5.0");
 #endif
     if(!xlib.load())
     {
@@ -20,7 +24,9 @@ ExcelAPI::ExcelAPI()
 #ifdef Q_OS_WIN
     QLibrary qlib("./plugin/ivxlnt.dll");
 #else
-    QLibrary qlib("./plugin/libivxlnt.so");
+    QString strivxlntpath = gstrAppPath + "/plugin/libivxlnt.so";
+    QLibrary qlib(strivxlntpath);
+ //   QLibrary qlib("./plugin/libivxlnt.so");
 #endif
     if(qlib.load())
     {

src/tool/map_lanetoxodr/excelapi.h

@@ -4,6 +4,8 @@
 
 #include <string>
 
+#include <QString>
+
 typedef void * (*OpenxlsxFunction)(std::string strfilepath);
 typedef int (*getcellvalueFunction)(void * pxlsxhanle,unsigned int column,unsigned int row,std::string & strvalue);
 typedef void  (*ClosexlsxFunction)(void * pxlsxhanle);

src/ui/ADCIntelligentShow_grpc/adcintelligentshow.cpp

@@ -1486,4 +1486,5 @@ void ADCIntelligentShow::onOTAVehInfoUpdate()
 void ADCIntelligentShow::UpdateFusion(iv::fusion::fusionobjectarray &xfusion)
 {
     mpivmapview->setfusion(xfusion);
+    mnTimeLidar = QDateTime::currentMSecsSinceEpoch();
 }