change RemoteCtrl. add sh/tagv1.0/autodeploylib.sh.

sh/tagv1.0/autodeploylib.sh

@@ -0,0 +1,58 @@
+PRO_DIR=`pwd`
+CONFIG_IVSysMan="IVSysMan.xml"
+
+
+cd ../../ 
+
+
+
+
+
+
+lib_name=(
+	libmodulecomm.so
+	libndt_cpu.so
+#	libndt_gpu.so
+	libxmlparam.so
+	libivfault.so
+	libivlog.so
+	libivbacktrace.so
+	libivexit.so
+)
+
+
+
+for x in ${lib_name[@]}
+do
+#	echo "link lib $x"
+#	patchelf --set-rpath '$ORIGIN' ./bin/$x
+	echo "deploylib $x"
+	cp ./bin/${x} ./
+	./deploylib.sh $x
+	rm ${x}
+done
+
+
+xlib=`ls ./deploy/app/lib/lib*`  
+for fileName in $xlib
+  do
+     patchelf --set-rpath '$ORIGIN' $fileName
+  done
+
+   
+
+#echo "creat IVSysMan.xml"
+#cp ./sh/tju64/xml/$CONFIG_IVSysMan ./deploy/app/IVSysMan.xml
+#cp ./other/ADS_decision.xml ./deploy/app/ADS_decision.xml
+#sed -i "s|xxxxxx|$PRO_DIR/|g" ./deploy/app/IVSysMan.xml
+
+#cp ./bin/*.so ./deploy/app/lib/
+
+#cp ./sh/tju64/xml/*  ./deploy/app/
+
+
+
+echo ""
+echo "***************"
+echo "***  done!  ***"
+echo "***************"

src/tool/RemoteCtrl/RemoteCtrl.pro

@@ -33,6 +33,7 @@ SOURCES += \
     ../../include/msgtype/imu.pb.cc \
     ../../include/msgtype/rawpic.pb.cc \
     ../../include/msgtype/remotectrl.pb.cc \
+    ../../include/msgtype/uploadmsg.pb.cc \
     dialogbigpic.cpp \
     ivpicview.cpp \
     ivview.cpp \
@@ -43,7 +44,6 @@ SOURCES += \
     speed.cpp \
     ../../driver/driver_cloud_grpc_pc/grpcpc.cpp \
     ../../driver/driver_cloud_grpc_pc/uploadmsg.grpc.pb.cc \
-    ../../driver/driver_cloud_grpc_pc/uploadmsg.pb.cc \
     ../../include/msgtype/cloud.pb.cc \
     dialogpic.cpp \
     ivpicsave.cpp
@@ -54,6 +54,7 @@ HEADERS += \
     ../../include/msgtype/imu.pb.h \
     ../../include/msgtype/rawpic.pb.h \
     ../../include/msgtype/remotectrl.pb.h \
+    ../../include/msgtype/uploadmsg.pb.h \
     dialogbigpic.h \
     ivpicview.h \
     ivview.h \
@@ -64,7 +65,6 @@ HEADERS += \
     speed.h \
     ../../driver/driver_cloud_grpc_pc/grpcpc.h \
     ../../driver/driver_cloud_grpc_pc/uploadmsg.grpc.pb.h \
-    ../../driver/driver_cloud_grpc_pc/uploadmsg.pb.h \
     ../../include/msgtype/cloud.pb.h \
     dialogpic.h \
     ivpicsave.h

src/tool/RemoteCtrl/dialogbigpic.cpp

@@ -45,11 +45,12 @@ void DialogBigPic::onTimerPic()
 
     bool bUpdate = false;
 
-    if(mnLastPicTime != gTimeRawPic[mnCamera])
+    int ncam = mnCamera;
+    if((mnLastPicTime != gTimeRawPic[ncam])&&(gTimeRawPic[ncam]!= 0))
     {
-        gMutexPic[mnCamera].lock();
-        mpPicView->SetPic(grawpic[mnCamera]);
-        gMutexPic[mnCamera].unlock();
+        gMutexPic[ncam].lock();
+        mpPicView->SetPic(grawpic[ncam]);
+        gMutexPic[ncam].unlock();
         bUpdate = true;
         mbDraw = true;
     }
@@ -92,3 +93,8 @@ void DialogBigPic::onPainterUpdate()
 {
     update();
 }
+
+void DialogBigPic::setCamera(int n)
+{
+    mnCamera = n;
+}

src/tool/RemoteCtrl/dialogbigpic.h

@@ -30,6 +30,8 @@ public:
 
      void setRefresh(bool brefresh);
 
+     void setCamera(int n);
+
 private:
     Ui::DialogBigPic *ui;
 

src/tool/RemoteCtrl/mainwindow.cpp

@@ -359,6 +359,7 @@ void MainWindow::on_pushButton_test_clicked()
 
 void MainWindow::on_radioButton_manual_clicked()
 {
+    ui->radioButton_manual->setChecked(true);
     mPressKeys.clear();
     mfAcc = 0;
     mfWheel = 0;
@@ -515,6 +516,7 @@ void MainWindow::onTimerManual()
 
 void MainWindow::on_radioButton_auto_clicked()
 {
+    ui->radioButton_auto->setChecked(true);
     mPressKeys.clear();
     mpTimerManual->stop();
 
@@ -762,21 +764,25 @@ void MainWindow::on_radioButton_Rear_clicked()
 void MainWindow::on_radioButton_picfront_clicked()
 {
     mnSelPic = 0;
+    mpbigpicdlg->setCamera(mnSelPic);
 }
 
 void MainWindow::on_radioButton_picrear_clicked()
 {
     mnSelPic = 1;
+    mpbigpicdlg->setCamera(mnSelPic);
 }
 
 void MainWindow::on_radioButton_picleft_clicked()
 {
     mnSelPic = 2;
+    mpbigpicdlg->setCamera(mnSelPic);
 }
 
 void MainWindow::on_radioButton_picright_clicked()
 {
     mnSelPic = 3;
+    mpbigpicdlg->setCamera(mnSelPic);
 }