From 3cfb3d13a937d5be56abb7c23e9c5d53521fc935 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期二, 11 二月 2025 16:06:04 +0800
Subject: [PATCH] 1.增加S2F33(Define Report)消息处理；
---
SourceCode/Bond/Servo/HsmsPassive.h | 26 +++++++++++++
SourceCode/Bond/Servo/HsmsPassive.cpp | 75 +++++++++++++++++++++++++++++++++++++
2 files changed, 100 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/HsmsPassive.cpp b/SourceCode/Bond/Servo/HsmsPassive.cpp
index f714e51..071ab51 100644
--- a/SourceCode/Bond/Servo/HsmsPassive.cpp
+++ b/SourceCode/Bond/Servo/HsmsPassive.cpp
@@ -125,6 +125,28 @@
}
+void CHsmsPassive::deleteReport(unsigned int RPTID)
+{
+ for (auto it = m_mapValueIdToPRTID.begin(); it != m_mapValueIdToPRTID.end(); ) {
+ if (it->second == RPTID) {
+ m_mapValueIdToPRTID.erase(it++); // 更新迭代器
+ }
+ else {
+ ++it;
+ }
+ }
+}
+
+void CHsmsPassive::deleteAllReport()
+{
+ m_mapValueIdToPRTID.clear();
+}
+
+void CHsmsPassive::defineReport(unsigned int VID, unsigned int RPTID)
+{
+ m_mapValueIdToPRTID[VID] = RPTID;
+}
+
void CHsmsPassive::OnTimer(UINT nTimerid)
{
// 所有已发送的Action自加1
@@ -238,6 +260,9 @@
}
else if (nStream == 2 && pHeader->function == 31) {
replyDatetime(pMessage);
+ }
+ else if (nStream == 2 && pHeader->function == 33) {
+ replyDefineReport(pMessage);
}
else if (nStream == 2 && pHeader->function == 35) {
replyLinkEventReport(pMessage);
@@ -597,6 +622,55 @@
return 0;
}
+// S2F33
+int CHsmsPassive::replyDefineReport(IMessage* pRecv)
+{
+ if (m_pPassive == NULL || STATE::SELECTED != m_pPassive->getState()) {
+ return ER_NOTSELECT;
+ }
+
+
+ ISECS2Item* pBody = pRecv->getBody();
+ ISECS2Item* defineItem, *rptListItem, * vidListItem;
+ unsigned int dataId, rptid, vid;
+ if (!pBody->getSubItemU4(0, dataId)) goto MYREPLY;
+ rptListItem = pBody->getSubItem(1);
+ if (rptListItem == nullptr) goto MYREPLY;
+ if (rptListItem->getSubItemSize() == 0) {
+ deleteAllReport();
+ goto MYREPLY;
+ }
+ for (int i = 0; i < rptListItem->getSubItemSize(); i++) {
+ defineItem = rptListItem->getSubItem(i);
+ if (defineItem == nullptr) continue;
+ vidListItem = defineItem->getSubItem(1);
+ if (defineItem->getSubItemU4(0, rptid)
+ && vidListItem != nullptr) {
+ int vidCount = vidListItem->getSubItemSize();
+ if (vidCount == 0) {
+ deleteReport(rptid);
+ }
+ else {
+ for (int k = 0; k < vidCount; k++) {
+ if (vidListItem->getSubItemU4(k, vid)) {
+ defineReport(vid, rptid);
+ }
+ }
+ }
+ }
+ }
+
+
+MYREPLY:
+ // 检验结果是否正确
+ for (auto item : m_mapValueIdToPRTID) {
+ LOGE("=== vid:%d, prtid:%d", item.first, item.second);
+ }
+
+ replyAck(2, 34, pRecv->getHeader()->systemBytes, BYTE(0), "DRACK");
+ return 0;
+}
+
// S2F35
int CHsmsPassive::replyLinkEventReport(IMessage* pRecv)
{
@@ -605,7 +679,6 @@
}
- BOOL bCheckData = FALSE;
ISECS2Item* pBody = pRecv->getBody();
ISECS2Item* linkItem, *ceidListItem, *rptListItem;
unsigned int dataId, ceid, rptid;
diff --git a/SourceCode/Bond/Servo/HsmsPassive.h b/SourceCode/Bond/Servo/HsmsPassive.h
index 670befa..616732e 100644
--- a/SourceCode/Bond/Servo/HsmsPassive.h
+++ b/SourceCode/Bond/Servo/HsmsPassive.h
@@ -11,6 +11,7 @@
#define COMMAND_NAME_MAX 64
#define COMMAND_VALUE_MAX 64
#define REPORT_NAME_MAX 64
+#define VALUE_NAME_MAX 64
#define ER_NOERROR 0
@@ -45,6 +46,15 @@
char szName[REPORT_NAME_MAX];
unsigned int id;
} REPORT;
+
+/*
+ * Value 数据结构
+ */
+typedef struct _VALUE
+{
+ char szName[VALUE_NAME_MAX];
+ unsigned int id;
+} VALUE;
typedef std::function<void(void* pFrom)> SECSEQOFFLINE;
@@ -83,6 +93,15 @@
// 取消连接report
void unlinkEventReport(unsigned int CEID);
+ // define Report
+ void defineReport(unsigned int VID, unsigned int RPTID);
+
+ // 取消 define report
+ void deleteReport(unsigned int RPTID);
+
+ // 取消/删除所有 define report
+ void deleteAllReport();
+
void setListener(SECSListener listener);
unsigned OnCimWork();
void OnTimer(UINT nTimerid);
@@ -106,6 +125,7 @@
int replyEquipmentConstantRequest(IMessage* pRecv);
int replyEquipmentConstantSend(IMessage* pRecv);
int replyDatetime(IMessage* pRecv);
+ int replyDefineReport(IMessage* pRecv);
int replyLinkEventReport(IMessage* pRecv);
int replyEanbleDisableEventReport(IMessage* pRecv);
int replyCommand(IMessage* pRecv);
@@ -144,5 +164,11 @@
// RPTID to Report
std::map<unsigned int, REPORT> m_mapReport;
+
+ // VID to RPTID
+ std::map<unsigned int, unsigned int> m_mapValueIdToPRTID;
+
+ // VID to Report
+ std::map<unsigned int, VALUE> m_mapValue;
};
--
Gitblit v1.9.3