Эх сурвалжийг харах

change RemoteCtrl_Thread.

yuchuli 3 жил өмнө
parent
commit
c6e7c01aa7

+ 11 - 0
src/driver/driver_cloud_grpc_pc_thread/grpcpc.cpp

@@ -186,6 +186,10 @@ void grpcpc::run()
 
 
                         nlasttime = xreply.ntime();
                         nlasttime = xreply.ntime();
                     }
                     }
+                    else
+                    {
+                        std::this_thread::sleep_for(std::chrono::milliseconds(30));
+                    }
                 } else {
                 } else {
                   std::cout << status.error_code() << ": " << status.error_message()
                   std::cout << status.error_code() << ": " << status.error_message()
                             << std::endl;
                             << std::endl;
@@ -445,12 +449,19 @@ void grpcpc::threadpicdownload(int nCamPos)
             if(reply.nres() == 1)
             if(reply.nres() == 1)
             {
             {
                 std::cout<<"pic time is "<<reply.npictime()<<std::endl;
                 std::cout<<"pic time is "<<reply.npictime()<<std::endl;
+                mMutexPic.lock();
+                iv::modulecomm::ModuleSendMsg(mpaPic[nCamPos],reply.xdata().data(),reply.xdata().size());
+                mMutexPic.unlock();
 //                iv::cloud::cloudmsg xmsg;
 //                iv::cloud::cloudmsg xmsg;
 //                if(xmsg.ParseFromArray(reply.xdata().data(),reply.xdata().size()))
 //                if(xmsg.ParseFromArray(reply.xdata().data(),reply.xdata().size()))
 //                {
 //                {
 //                    sharectrlmsg(&xmsg);
 //                    sharectrlmsg(&xmsg);
 //                }
 //                }
             }
             }
+            else
+            {
+                std::this_thread::sleep_for(std::chrono::milliseconds(100));
+            }
         } else {
         } else {
           std::cout << status.error_code() << ": " << status.error_message()
           std::cout << status.error_code() << ": " << status.error_message()
                     << std::endl;
                     << std::endl;

+ 3 - 1
src/driver/driver_cloud_grpc_pc_thread/grpcpc.h

@@ -66,7 +66,7 @@ private:
     void run();
     void run();
 
 
 private:
 private:
-    std::string gstrserverip = "127.0.0.1";// "140.143.237.38";
+    std::string gstrserverip = "111.33.136.149";//"127.0.0.1";// "140.143.237.38";
     std::string gstrserverport = "50051";//"9000";
     std::string gstrserverport = "50051";//"9000";
     std::string gstruploadinterval = "100";
     std::string gstruploadinterval = "100";
     void * gpa;
     void * gpa;
@@ -101,6 +101,8 @@ private:
 
 
     std::thread * mpThread[NUM_CAM * NUM_THREAD_PERCAM];
     std::thread * mpThread[NUM_CAM * NUM_THREAD_PERCAM];
 
 
+    QMutex mMutexPic;
+
 
 
 };
 };