소스 검색

change RemoteCtrl_Wide.

yuchuli 2 년 전
부모
커밋
72dd171f66
3개의 변경된 파일26개의 추가작업 그리고 5개의 파일을 삭제
  1. 20 2
      src/tool/RemoteCtrl_Wide/grpcpc.cpp
  2. 4 2
      src/tool/RemoteCtrl_Wide/grpcpc.h
  3. 2 1
      src/tool/RemoteCtrl_Wide/mainwindow.cpp

+ 20 - 2
src/tool/RemoteCtrl_Wide/grpcpc.cpp

@@ -13,6 +13,11 @@ grpcpc::grpcpc(std::string stryamlpath)
 
     ggrpcpc = this;
 
+
+}
+
+void grpcpc::StartRTSP()
+{
     int i;
 
     if(mbUseRTSP == false)
@@ -121,6 +126,7 @@ int grpcpc::Consumeh264frame(int ncampos,iv::h264rawframedata & xframe,int nwait
 
 int grpcpc::SetCtrlMsg(std::string strmsgname,char * strdata,int ndatasize)
 {
+ //   std::cout<<" set ctrl msg: "<<strmsgname<<std::endl;
     mmutexctrlmsg.lock();
     if(mvectorctrlmsg.size() == 0)
     {
@@ -255,17 +261,26 @@ void grpcpc::run()
     while(!QThread::isInterruptionRequested())
     {
         std::this_thread::sleep_for(std::chrono::milliseconds(1));
+
         if(abs(xTime.elapsed()-nlastsend)<ninterval)
         {
             continue;
         }
+        std::cout<<"nlastsend: "<<nlastsend<<std::endl;
 
         bool bImportant = false;
         int nkeeptime = 0;
 
             iv::cloud::cloudmsg xmsg;
             xmsg.clear_xclouddata();
-            GetCtrlMsg(xmsg);
+            int nctrlrtn = GetCtrlMsg(xmsg);
+            if(nctrlrtn == 1)
+            {
+                if(xmsg.xclouddata_size() > 0)
+                    std::cout<<" msgname: "<<xmsg.xclouddata(0).msgname()<<std::endl;
+                std::cout<<" ctrl code: "<<gstrctrlMD5<<std::endl;
+            }
+            std::cout<<"nctrlrtn: "<<nctrlrtn<<std::endl;
             xmsg.set_xtime(QDateTime::currentMSecsSinceEpoch());
             nlastsend = xTime.elapsed();
 
@@ -332,9 +347,12 @@ void grpcpc::run()
 //                qDebug("nlasttime is %ld",nlasttime);//1607905685318
                 nid++;
                 // The actual RPC.
+//                QTime xTime1;
+//                xTime1.start();
                 Status status = stub_->queryctrl(&context, request, &xreply);
                 if (status.ok()) {
- //                   std::cout<<nid<<" query successfully, res is "<<xreply.nres()<<std::endl;
+//                    std::cout<<" query time: "<<xTime1.elapsed()<<std::endl;
+                    std::cout<<nid<<" query successfully, res is "<<xreply.nres()<<std::endl;
                     if(xreply.nres() == 1)
                     {
 

+ 4 - 2
src/tool/RemoteCtrl_Wide/grpcpc.h

@@ -1,4 +1,4 @@
-#ifndef GRPCPC_H
+#ifndef GRPCPC_H
 #define GRPCPC_H
 
 #include <QThread>
@@ -73,7 +73,7 @@ private:
     std::string gstrserverip = "192.168.14.98";//"111.33.136.149";//"127.0.0.1";// "140.143.237.38";
     std::string gstrserverport = "50051";//"9000";
     std::string gstruploadinterval = "100";
-    std::string gstrVIN = "AAAAAAAAAAAAAAAAB";
+    std::string gstrVIN = "AAAAAAAAAAAAAAAAC";
     std::string gstrqueryMD5 = "5d41402abc4b2a76b9719d911017c592";
     std::string gstrctrlMD5 = "5d41402abc4b2a76b9719d911017c592";
 
@@ -82,6 +82,8 @@ private:
 public:
     std::string GetVIN();
 
+    void StartRTSP();
+
 private:
     void threadpicdownload(int nCamPos);
     void * mpaPic[NUM_CAM];

+ 2 - 1
src/tool/RemoteCtrl_Wide/mainwindow.cpp

@@ -140,6 +140,7 @@ MainWindow::MainWindow(QWidget *parent)
     mgrpcpc->setVIN(mstrVehVIN);
     mgrpcpc->setqueryMD5(mstrqueryMD5);
     mgrpcpc->setctrlMD5(mstrctrlMD5);
+    mgrpcpc->StartRTSP();
     mgrpcpc->start();
 
     for(i=0;i<NUM_CAM;i++)
@@ -620,7 +621,7 @@ void MainWindow::onTimerManual()
         mfWheel = mpJRT->GetWheel() * (-100.0)/32768.0;
         mfAcc = ((mpJRT->GetAcc()-32767.0)/65535)*(-100.0);
         mfBrake = ((mpJRT->GetBrake()-32767.0)/65535)*(-100.0);
-        if(mfWheel != fOldWheel)mpWheel->updatevalue(mfWheel);
+        if(mfWheel != fOldWheel)mpWheel->updatevalue(mfWheel*5.5);
         if(mfAcc != fOldAcc)mpAcc->updatevalue(mfAcc);
         if(mfBrake != fOldBrake)mpBrake->updatevalue(mfBrake);