change driver/driver_ota_server.

src/driver/driver_ota_server/driver_ota_server.pro

@@ -14,10 +14,10 @@ DEFINES += QT_DEPRECATED_WARNINGS
 #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
 
 SOURCES += \
+    ../../include/msgtype/ota.pb.cc \
     ../driver_ota_client/md5.cpp \
     ../driver_ota_client/md5file.cpp \
     ../driver_ota_client/ota.grpc.pb.cc \
-    ../driver_ota_client/ota.pb.cc \
     dialogadd.cpp \
     dialogaddvehicle.cpp \
     main.cpp \
@@ -25,11 +25,11 @@ SOURCES += \
     otaserver.cpp
 
 HEADERS += \
+    ../../include/msgtype/ota.pb.h \
     ../driver_ota_client/md5.h \
     ../driver_ota_client/md5file.h \
     ../driver_ota_client/md5global.h \
     ../driver_ota_client/ota.grpc.pb.h \
-    ../driver_ota_client/ota.pb.h \
     dialogadd.h \
     dialogaddvehicle.h \
     mainwindow.h \
@@ -68,6 +68,9 @@ else: unix:!android: target.path = /opt/$${TARGET}/bin
 }
 
 SUBDIRS += \
+    ../driver_ota_client/driver_ota_client.pro \
     ../driver_ota_client/driver_ota_client.pro
 
 
+INCLUDEPATH += $$PWD/../driver_ota_client
+

src/driver/driver_ota_server/otaserver.cpp

@@ -10,7 +10,7 @@ void OTAServiceImpl::log(char *str)
     gw->updatelog(strlog);
 }
 
-Status OTAServiceImpl::query(grpc::ServerContext *context, const iv::queryreq *request, iv::queryReply *response)
+Status OTAServiceImpl::query(grpc::ServerContext *context, const iv::ota::queryreq *request, iv::ota::queryReply *response)
 {
     (void)context;
     char strlog[1000];
@@ -62,7 +62,7 @@ Status OTAServiceImpl::query(grpc::ServerContext *context, const iv::queryreq *r
     return Status::OK;
 }
 
-Status OTAServiceImpl::downfile(grpc::ServerContext *context, const iv::Filereq *request, iv::FileReply *response)
+Status OTAServiceImpl::downfile(grpc::ServerContext *context, const iv::ota::Filereq *request, iv::ota::FileReply *response)
 {
     (void)context;
     char strlog[1000];

src/driver/driver_ota_server/otaserver.h

@@ -15,6 +15,8 @@
 
 #include "ota.grpc.pb.h"
 
+#include "ota.pb.h"
+
 #include "md5file.h"
 
 
@@ -29,9 +31,9 @@ public:
 
     void log(char * str);
 
-    Status query(grpc::ServerContext *context, const iv::queryreq *request, iv::queryReply *response);
+    Status query(grpc::ServerContext *context, const iv::ota::queryreq *request, iv::ota::queryReply *response);
 
-    Status downfile(grpc::ServerContext *context, const iv::Filereq *request, iv::FileReply *response);
+    Status downfile(grpc::ServerContext *context, const iv::ota::Filereq *request, iv::ota::FileReply *response);
 
     void SetVehicleFile(std::vector<iv::vehiclefile> xvectorvf);
 

src/tool/map_lanetoxodr/main.cpp

@@ -7,7 +7,7 @@
 
 #ifndef ANDROID
 
-#include "ivbacktrace.h"
+//#include "ivbacktrace.h"
 
 #endif
 
@@ -57,8 +57,7 @@ int main(int argc, char *argv[])
 
 #ifndef ANDROID
 
-#include "ivbacktrace.h"
-    RegisterIVBackTrace();
+//    RegisterIVBackTrace();
 #endif
     QApplication a(argc, argv);