Explorar el Código

增强系统稳定性

lishengyin hace 3 años
padre
commit
3cd9171a1d

BIN
lib/libmodules.so


+ 1 - 1
modules/dataType/include/NettyClientCommandEnum.h

@@ -12,7 +12,7 @@ public:
     NettyClientCommandEnum(/* args */){};
     ~NettyClientCommandEnum(){};
 
-        // 客户端传输给服务端-登录数据中
+    // 客户端传输给服务端-登录数据中
     const string login = "login";
     //客户端传输到服务端-心跳包数据
     const string heartbeat = "heartbeat";

+ 1 - 1
modules/dataType/include/NettyServerCommandEnum.h

@@ -21,5 +21,5 @@ public:
     string device_send_command = "device_send_command";
     // 服务端响应到客户端-结果信息数据
     string api_result = "api_result";
-    
+
 };

+ 3 - 1
modules/inference/src/inference.cpp

@@ -224,10 +224,12 @@ namespace MIVA{
             }
             sourceId++;
         }
+        gst_element_set_state(this->pipeline, GST_STATE_PAUSED);
         NoticeCenter::Instance().emitEvent(NOTICE_RELEASE);
     }
     void Inference::RestartTask()
     {
+        gst_element_set_state(this->pipeline, GST_STATE_PLAYING);
         std::vector<DataSource>::iterator iter;
         for (iter = this->m_DataList.begin(); iter != this->m_DataList.end(); iter++){
             if(iter->Play == false){
@@ -321,7 +323,7 @@ namespace MIVA{
                 gst_message_parse_warning (msg, &error, &debug);
                 WarnL << "WARNING from element " << GST_OBJECT_NAME (msg->src) << ": " << error->message;
                 g_free (debug);
-                ErrorL << "Warning: " << error->message;
+                WarnL << "Warning: " << error->message;
                 g_error_free (error);
                 break;
             }

+ 1 - 0
modules/userApp/src/user_app.cpp

@@ -253,6 +253,7 @@ namespace MIVA
         // 对Netty端的接口
         
 
+
     }
     // 处理PIS系统的数据
     void UserApp::ListenPISData(const Buffer::Ptr &buf, struct sockaddr *addr)