From c96ec4c44d31e4df6da3ce904fd3c6d8f3548c2d Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 11 七月 2025 08:33:21 +0800
Subject: [PATCH] 1.终端信息显示模拟测试；
---
SourceCode/Bond/Servo/HsmsPassive.cpp | 61 ++++++++++++++++++++++++++----
1 files changed, 53 insertions(+), 8 deletions(-)
diff --git a/SourceCode/Bond/Servo/HsmsPassive.cpp b/SourceCode/Bond/Servo/HsmsPassive.cpp
index 071ab51..832f6d3 100644
--- a/SourceCode/Bond/Servo/HsmsPassive.cpp
+++ b/SourceCode/Bond/Servo/HsmsPassive.cpp
@@ -10,6 +10,10 @@
#include <string.h>
+const char ACK[2] = {0, 1};
+const char* ACK0 = &ACK[0];
+const char* ACK1 = &ACK[1];
+
unsigned __stdcall CimWorkThreadFunction(LPVOID lpParam)
{
CHsmsPassive* pPassive = (CHsmsPassive*)lpParam;
@@ -68,11 +72,7 @@
void CHsmsPassive::setListener(SECSListener listener)
{
- m_listener.onEQOffLine = listener.onEQOffLine;
- m_listener.onEQOnLine = listener.onEQOnLine;
- m_listener.onCommand = listener.onCommand;
- m_listener.onEQConstantRequest = listener.onEQConstantRequest;
- m_listener.onEQConstantSend = listener.onEQConstantSend;
+ m_listener = listener;
}
void CHsmsPassive::setActionTimeout(int nSecond)
@@ -123,6 +123,13 @@
}
}
+}
+
+unsigned int CHsmsPassive::getCEID(int RPTID)
+{
+ auto iter = m_mapReportIdToCEID.find(RPTID);
+ if (iter != m_mapReportIdToCEID.end()) return iter->second;
+ return 0;
}
void CHsmsPassive::deleteReport(unsigned int RPTID)
@@ -487,12 +494,12 @@
ASSERT(pMessage);
ISECS2Item* pItem = pMessage->getBody();
- pItem->addBinaryItem(BYTE(0), "COMMACK");
+ pItem->addBinaryItem(ACK0, 1, "COMMACK");
ISECS2Item* pList = pItem->addItem();
pList->addItem(m_strEquipmentModelType.c_str(), "MDLN");
pList->addItem(m_strSoftRev.c_str(), "SOFTREV");
m_pPassive->sendMessage(pMessage);
- LOGI("<HSMS>[SECS Msg SEND]S1F14 (SysByte=%u)", pMessage->getHeader()->systemBytes);
+ LOGI("<HSMS>[SECS Msg SEND]%s", pMessage->toString());
HSMS_Destroy1Message(pMessage);
return 0;
@@ -616,6 +623,9 @@
time.wYear = atoi(&szBuffer[0]);
time.wMilliseconds = 0;
SetLocalTime(&time);
+ if (m_listener.onDatetimeSync != nullptr) {
+ m_listener.onDatetimeSync(this, time);
+ }
}
replyAck(2, 32, pRecv->getHeader()->systemBytes, BYTE(0), "TIACK");
@@ -929,6 +939,9 @@
return ER_NOTSELECT;
}
+ char szALCD[1];
+ szALCD[0] = ALCD & 0xff;
+
Lock();
CHsmsAction* pAction = new CHsmsAction(ACTION_ALARM_REPORT, TRUE, m_nActionTimeout);
m_listAction.push_back(pAction);
@@ -936,7 +949,7 @@
HSMS_Create1Message(pMessage, m_nSessionId, 5 | REPLY, 1, ++m_nSystemByte);
ASSERT(pMessage);
ISECS2Item* pItem = pMessage->getBody();
- pItem->addBinaryItem(BYTE(ALCD & 0xff), "ALCD");
+ pItem->addBinaryItem(szALCD, 1, "ALCD");
pItem->addU4Item(ALID, "ALID");
pItem->addItem(ALTX, "ALTX");
pAction->setSendMessage(pMessage);
@@ -947,4 +960,36 @@
return ER_NOERROR;
}
+// S6F11
+int CHsmsPassive::requestEventReportSend(unsigned int DATAID, unsigned int RPTID, const std::vector<std::string>& values)
+{
+ if (m_pPassive == NULL || STATE::SELECTED != m_pPassive->getState()) {
+ return ER_NOTSELECT;
+ }
+
+ Lock();
+ CHsmsAction* pAction = new CHsmsAction(ACTION_EVENT_REPORT, TRUE, m_nActionTimeout);
+ m_listAction.push_back(pAction);
+ IMessage* pMessage = NULL;
+ HSMS_Create1Message(pMessage, m_nSessionId, 6 | REPLY, 11, ++m_nSystemByte);
+ ASSERT(pMessage);
+ ISECS2Item* pItem = pMessage->getBody();
+ pItem->addU4Item(DATAID, "DATAID");
+ pItem->addU4Item(getCEID(RPTID), "CEID");
+ ISECS2Item* pItemList1 = pItem->addItem();
+ ISECS2Item* pItemList2 = pItemList1->addItem();
+ pItemList2->addU4Item(RPTID, "RPTID");
+ ISECS2Item* pItemList3 = pItemList2->addItem();
+ for (auto item : values) {
+ pItemList3->addItem(item.c_str(), "V");
+ }
+ pAction->setSendMessage(pMessage);
+
+ SetEvent(m_hCimWorkEvent);
+ Unlock();
+
+ return ER_NOERROR;
+}
+
+
--
Gitblit v1.9.3