2.4.1| 修复测试页面传感器状态不更新的BUG

appsrc/appconfig/basic/zappversion.hpp

@@ -1,3 +1,3 @@
 #pragma once
-#define VERSION      "2.4.0"
+#define VERSION      "2.4.1"
 #define PROJECT_NAME "TRANSMIT_DM"

appsrc/baseservice/iflytop_front_end_service/iflytop_front_end_service.cpp

@@ -14,6 +14,7 @@ void IflytopFrontEndService::initialize(string ip) {
   m_workQueue->startWork();
 
   m_server.reset(new WebSocketServer(19001, ip));
+  m_server->enablePong();
   SocketTLSOptions tlsOptions;
   // tlsOptions.tls = true;
   m_server->setTLSOptions(tlsOptions);
@@ -74,18 +75,25 @@ void IflytopFrontEndService::sendReport(json reportType, json report) {
   report["messageId"]   = UUID().toString();
   report["messageType"] = "Report";
   report["reportType"]  = reportType;
-  logger->debug("uplink msg: {}", report.dump());
 
-  auto clients = m_reportServer->getClients();
-  for (auto& each : clients) {
-    each->sendText(report.dump());
-  }
   auto serverClients = m_server->getClients();
+  if (serverClients.size() != 0) {
+    logger->debug("");
+  }
   for (auto& each : serverClients) {
     if (each) {
-      each->sendText(report.dump());
+      logger->debug("send msg to clientId:{}", each->getUrl());
+      auto result = each->sendText(report.dump());
+      if (!result.success) {
+        logger->debug("send failed,clientId:{},error:{}", each->getUrl(), result.compressionError);
+      } else {
+        logger->debug("send success,clientId:{},payloadSize:{},wireSize:{}", each->getUrl(), result.payloadSize, result.wireSize);
+      }
     }
   }
+  if (serverClients.size() != 0) {
+    logger->debug("");
+  }
 }
 
 void IflytopFrontEndService::sendClassReport(string fromclass, string fromfn, const json& rely) {
@@ -103,6 +111,9 @@ void IflytopFrontEndService::sendClassReport(string fromclass, string fromfn, co
 // }
 
 void IflytopFrontEndService::onMessageCallback(weak_ptr<WebSocket> webSocket, shared_ptr<ConnectionState> connectionState, const ix::WebSocketMessagePtr& msg) {
+  auto ws = webSocket.lock();
+  if (!ws) return;
+
   if (msg->type == ix::WebSocketMessageType::Open) {
     logger->info("New connection");
     logger->info("id     : {}", connectionState->getId());
@@ -111,6 +122,9 @@ void IflytopFrontEndService::onMessageCallback(weak_ptr<WebSocket> webSocket, sh
     for (auto it : msg->openInfo.headers) {
       logger->info("   {}: {}", it.first, it.second);
     }
+    // ws->setPingInterval(2);
+    ws->enablePong();
+    ws->setUrl(fmt::format("{}:{}", connectionState->getRemoteIp(), connectionState->getRemotePort()));
 
   } else if (msg->type == ix::WebSocketMessageType::Message) {
     logger->debug("downlink msg: {}", msg->str);

appsrc/service/hardware/device_io_ctrl_service.cpp

@@ -308,7 +308,7 @@ int DeviceIoControlService::Blower_close() {
   return 0;
 }
 float DeviceIoControlService::Blower_readEI() {
-  logger->info("  Blower_readEI");
+  // logger->info("  Blower_readEI");
   if (!VIRTUAL_DEVICE()) return CAN_MASTER->blowerReadEI(GET_BOARDID()) / 1000.0;
   return 0;
 }

appsrc/service/hardware/sensor_state_sync_service.cpp

@@ -3,7 +3,10 @@ using namespace iflytop;
 using namespace std;
 using namespace core;
 
-void SensorStateSyncService::initialize() { GET_TO_SERVICE(deviceIoControlService); }
+void SensorStateSyncService::initialize() {
+  GET_TO_SERVICE(deviceIoControlService);
+  startSync();
+}
 
 void SensorStateSyncService::startSync() {
   if (updateThread && !updateThread->isWaitingForJoin()) {