change rtspview.pro

src/tool/rtspview/rtspview.pro

@@ -60,8 +60,13 @@ unix:LIBS +=  -lavcodec -lavformat -lavutil
 win32:LIBS += -LD:\ffmpegwin\bin
 win32:LIBS += -lavcodec-58 -lavformat-58 -lavutil-56  -lwsock32 -lws2_32
 
-INCLUDEPATH += /usr/include/opencv4
 
-LIBS += -lopencv_highgui -lopencv_core -lopencv_imgproc -lopencv_imgcodecs -lopencv_video  -lopencv_videoio -lpthread #-lopencv_shape
+!include(../../../include/ivopencv.pri ) {
+    error( "Couldn't find the ivopencv.pri file!" )
+}
+
+
+unix: INCLUDEPATH += /usr/include/opencv4
+unix: LIBS += -lopencv_highgui -lopencv_core -lopencv_imgproc -lopencv_imgcodecs -lopencv_video  -lopencv_videoio -lpthread #-lopencv_shape
 
 

src/ui/ADCIntelligentShow_grpc/ADCIntelligentShow_grpc.pro

@@ -30,12 +30,15 @@ SOURCES += \
     ../../driver/driver_grpc_client/ivgrpc.pb.cc \
     ../../include/msgtype/brainstate.pb.cc \
     ../../include/msgtype/decition.pb.cc \
+    ../../include/msgtype/fusionobject.pb.cc \
+    ../../include/msgtype/fusionobjectarray.pb.cc \
     ../../include/msgtype/gps.pb.cc \
     ../../include/msgtype/gpsimu.pb.cc \
     ../../include/msgtype/hmi.pb.cc \
     ../../include/msgtype/imu.pb.cc \
     ../../include/msgtype/radarobject.pb.cc \
     ../../include/msgtype/radarobjectarray.pb.cc \
+    ../../include/msgtype/vehinfo.pb.cc \
     dialogsetting.cpp \
     ivmapview.cpp \
     ivview.cpp \
@@ -50,12 +53,15 @@ HEADERS += \
         ../../driver/driver_grpc_client/ivgrpc.pb.h \
         ../../include/msgtype/brainstate.pb.h \
         ../../include/msgtype/decition.pb.h \
+        ../../include/msgtype/fusionobject.pb.h \
+        ../../include/msgtype/fusionobjectarray.pb.h \
         ../../include/msgtype/gps.pb.h \
         ../../include/msgtype/gpsimu.pb.h \
         ../../include/msgtype/hmi.pb.h \
         ../../include/msgtype/imu.pb.h \
         ../../include/msgtype/radarobject.pb.h \
         ../../include/msgtype/radarobjectarray.pb.h \
+        ../../include/msgtype/vehinfo.pb.h \
         adcintelligentshow.h \
         dialogsetting.h \
         ivmapview.h \