2.3.4 | 修复部分BUG

appsrc/appcomponents/canchannel/com/zscanprotocol_com.cpp

@@ -15,13 +15,13 @@ using namespace transmit_disfection_protocol;
 
 void ZSCanProtocolCom::initialize() {
   m_wq.reset(new WorkQueue("ZScanProtocolComWQ"));
-
   m_zexcan_socket.reset(new UnixScoket(UnixScoket::Client, "tdcan"));
   m_zexcan_socket->start();
   m_zexcan_socket->onPacket.connect([this](uint8_t *data, size_t len) {
     string hexStr = StringUtils().bytesToString((uint8_t *)data, len);
 
     tdcan_frame_t *rxframe = (tdcan_frame_t *)data;
+    // logger->error("<--- rx report  xxxxx ptype:{} {}({})", rxframe->ptype, hexStr, len);
 
     if (rxframe->ptype == kreceipt || rxframe->ptype == kerror_receipt) {
       logger->trace("<--- rx receipt index:{} {}({})", rxframe->index, rxframe->ptype, hexStr, len);
@@ -37,12 +37,13 @@ void ZSCanProtocolCom::initialize() {
     } else if (rxframe->ptype == kcmd) {
       logger->warn("<--- rx cmd ? {}({})", rxframe->ptype, hexStr, len);
     } else if (rxframe->ptype == kreport) {
-      logger->trace("<--- rx report ptype:{} {}({})", rxframe->ptype, hexStr, len);
+      // logger->error("<--- rx report ptype:{} {}({})", rxframe->ptype, hexStr, len);
       callOnReport(rxframe->from, (uint8_t *)rxframe, len);
     } else {
       logger->trace("<--- rx unkown ptype:{}", rxframe->ptype);
     }
   });
+  m_wq->startWork();
 }
 
 shared_ptr<Receipt> ZSCanProtocolCom::base_callcmd(int32_t to, int32_t cmdid, uint8_t *param, int32_t paramLen, int32_t overtime) {
@@ -115,7 +116,7 @@ shared_ptr<Receipt> ZSCanProtocolCom::callcmd(int32_t to, int32_t cmdid, uint8_t
   shared_ptr<Receipt> receipt;
   lock_guard<mutex>   lock(m_lock);
   usleep(10 * 1000);
-  logger->debug("tx [to:{}, cmd:{}, param:{}({}) ] overtime:{}", to, cmdid, StringUtils().bytesToString((uint8_t *)param, paramLen), paramLen,overtime);
+  logger->debug("tx [to:{}, cmd:{}, param:{}({}) ] overtime:{}", to, cmdid, StringUtils().bytesToString((uint8_t *)param, paramLen), paramLen, overtime);
 
   for (size_t i = 0; i <= 5; i++) {
     try {

appsrc/appconfig/basic/zappversion.hpp

@@ -1,3 +1,3 @@
 #pragma once
-#define VERSION      "2.3.3"
+#define VERSION      "2.3.4"
 #define PROJECT_NAME "TRANSMIT_DM"

appsrc/baseservice/iflytop_front_end_service/iflytop_front_end_service.hpp

@@ -36,9 +36,6 @@ class IflytopFrontEndService : public enable_shared_from_this<IflytopFrontEndSer
   THISCLASS(IflytopFrontEndService);
 
  public:
-  // nod::signal<void(weak_ptr<WebSocket> webSocket, const ix::WebSocketMessagePtr& msg)> onMessage;
-  // nod::signal<void(weak_ptr<WebSocket> webSocket)>                           onConnect;
-  // nod::signal<void(weak_ptr<WebSocket> webSocket)>                           onDisconnect;
   nod::signal<void(weak_ptr<WebSocket> webSocket, json& cmd, json& receipt)> onMessage;
 
  private:

appsrc/main.cpp

@@ -111,7 +111,7 @@ json build_default_logger_cfg() {
 }
 int main(int argc, char *argv[]) {
   spdlog::flush_on(spdlog::level::debug);
-  string config = build_default_logger_cfg().dump();
+  string config = build_default_logger_cfg().dump(2);
   SpdLoggerFactory::Instance().initialize(config);
 
   Main main;

appsrc/service/device_info_mgr_service.cpp

@@ -52,7 +52,7 @@ json DeviceInfoMgrService::tryConstructBoardInfo(int boardId) {
   else {
     try {
       ack_read_board_info_data_t info = CAN_MASTER->readboardinfo(boardId);
-      boardInfo["version"]            = fmt::format("BT{:0>2d}HV{:0>2d}-{}", info.boardType, info.hardware_version, info.software_version);
+      boardInfo["version"]            = fmt::format("BT{:0>3x}HV{:0>2d}-{}", info.boardType, info.hardware_version, info.software_version);
     } catch (...) {
       boardInfo["version"] = "离线";
     }

appsrc/service/hardware/device_io_ctrl_service.cpp

@@ -179,6 +179,8 @@ int DeviceIoControlService::processReportMsg(uint8_t from, uint8_t *hex, uint32_
   if (DS->isTestMode()) return 0;
   tdcan_frame_t *packet = (tdcan_frame_t *)hex;
 
+  // logger->warn(".................................");
+
   if (packet->fnid == kreport_h2o2_sensor_data) {
     report_h2o2_data_t *h2o2data = (report_h2o2_data_t *)packet->params;
     int                 sensorId = 0;