chenluhua1980
2026-01-06 0e6f46c82c3f01e4a1b371dbb952f017a7cf42b4
1.CEID, SV增加名称显示,方便查看和分析
已修改1个文件
36 ■■■■ 文件已修改
SourceCode/Bond/Servo/HsmsPassive.cpp 36 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SourceCode/Bond/Servo/HsmsPassive.cpp
@@ -110,23 +110,35 @@
    ASSERT(pParent);
    ASSERT(pVariable);
    std::string svNote("SV");
    {
        SERVO::CVariable* pDef = getVariable((int)pVariable->getVarialbleId());
        if (pDef == nullptr) {
            pDef = pVariable;
        }
        auto& name = pDef->getName();
        if (!name.empty()) {
            svNote += " -> ";
            svNote += name;
        }
    }
    ISECS2Item* pItemList;
    SERVO::SVFromat format = pVariable->getFormat();
    switch (format)
    {
    case SERVO::SVFromat::U1:
        pParent->addU1Item((unsigned char)pVariable->getIntValue(), "SV");
        pParent->addU1Item((unsigned char)pVariable->getIntValue(), svNote.c_str());
        break;
    case SERVO::SVFromat::U2:
        pParent->addU2Item((unsigned char)pVariable->getIntValue(), "SV");
        pParent->addU2Item((unsigned char)pVariable->getIntValue(), svNote.c_str());
        break;
    case SERVO::SVFromat::I2:
        pParent->addI2Item((unsigned char)pVariable->getIntValue(), "SV");
        pParent->addI2Item((unsigned char)pVariable->getIntValue(), svNote.c_str());
        break;
    case SERVO::SVFromat::A20:
    case SERVO::SVFromat::A50:
        pParent->addItem(pVariable->getValue().c_str(), "SV");
        pParent->addItem(pVariable->getValue().c_str(), svNote.c_str());
        break;
    case SERVO::SVFromat::L:
        pItemList = pParent->addItem();
@@ -1590,7 +1602,8 @@
                ASSERT(pMessage);
                m_pPassive->sendMessage(pMessage);
                LOGI("<HSMS> [SEND] SysByte=%u sessionId:%d", pMessage->getHeader()->systemBytes, pMessage->getHeader()->sessionId);
                LOGI("<HSMS>[SEND]SysByte=%u sessionId:%d", pMessage->getHeader()->systemBytes, pMessage->getHeader()->sessionId);
                LOGI("<HSMS>[SEND]%s", pMessage->toString());
                int nRet = WaitForSingleObject(pAction->getEvent(), pAction->getTimeout() * 1000);
                if (nRet == WAIT_TIMEOUT) {
@@ -1615,7 +1628,8 @@
                ASSERT(pMessage);
                m_pPassive->sendMessage(pMessage);
                LOGI("<HSMS> [SEND] SysByte=%u sessionId:%d", pMessage->getHeader()->systemBytes, pMessage->getHeader()->sessionId);
                LOGI("<HSMS>[SEND]SysByte=%u sessionId:%d", pMessage->getHeader()->systemBytes, pMessage->getHeader()->sessionId);
                LOGI("<HSMS>[SEND]%s", pMessage->toString());
            }
        }
@@ -2670,7 +2684,15 @@
    ISECS2Item* pItem = pMessage->getBody();
    // pItem->addU2Item(++DATAID, "DATAID");        // 根据别的日志显示DATAID恒为0,所以我们先照使用0
    pItem->addU2Item(0, "DATAID");
    pItem->addU4Item(CEID, "CEID");
    std::string ceidNote("CEID");
    if (pEvent != nullptr) {
        auto& name = pEvent->getName();
        if (!name.empty()) {
            ceidNote += " -> ";
            ceidNote += name;
        }
    }
    pItem->addU4Item(CEID, ceidNote.c_str());
    ISECS2Item* pItemList1 = pItem->addItem(); // L[n] reports
    if (pReport != nullptr) {
        ISECS2Item* pItemList2 = pItemList1->addItem();