From 2070871df480a664c9c4e38bc4e4e324682a64c6 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期四, 03 四月 2025 16:12:28 +0800
Subject: [PATCH] 1. 解决 WebView2 控制器创建失败时闪退的问题 2. 解决连接图销毁时保存设备图形数据闪退的问题
---
SourceCode/Bond/Servo/HsmsPassive.cpp | 487 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 471 insertions(+), 16 deletions(-)
diff --git a/SourceCode/Bond/Servo/HsmsPassive.cpp b/SourceCode/Bond/Servo/HsmsPassive.cpp
index 5a62733..094f4fd 100644
--- a/SourceCode/Bond/Servo/HsmsPassive.cpp
+++ b/SourceCode/Bond/Servo/HsmsPassive.cpp
@@ -38,6 +38,11 @@
m_bCimWorking = FALSE;
m_hCimWorkEvent = ::CreateEvent(NULL, TRUE, FALSE, NULL);
m_nSessionId = 1;
+ m_listener.onEQOffLine = nullptr;
+ m_listener.onEQOnLine = nullptr;
+ m_listener.onCommand = nullptr;
+ m_listener.onEQConstantRequest = nullptr;
+ m_listener.onEQConstantSend = nullptr;
InitializeCriticalSection(&m_criticalSection);
}
@@ -61,6 +66,15 @@
DeleteCriticalSection(&m_criticalSection);
}
+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;
+}
+
void CHsmsPassive::setActionTimeout(int nSecond)
{
m_nActionTimeout = max(3, nSecond);
@@ -81,6 +95,63 @@
m_strSoftRev = m_strSoftRev.substr(0, 20);
}
+}
+
+void CHsmsPassive::addReport(unsigned int id, const char* pszName)
+{
+ Lock();
+ REPORT report;
+ report.id = id;
+ strcpy_s(report.szName, REPORT_NAME_MAX, pszName);
+ m_mapReport[id] = report;
+ Unlock();
+}
+
+void CHsmsPassive::linkEventReport(unsigned int RPTID, unsigned int CEID)
+{
+ m_mapReportIdToCEID[RPTID] = CEID;
+}
+
+void CHsmsPassive::unlinkEventReport(unsigned int CEID)
+{
+ for (auto it = m_mapReportIdToCEID.begin(); it != m_mapReportIdToCEID.end(); ) {
+ if (it->second == CEID) {
+ m_mapReportIdToCEID.erase(it++); // 更新迭代器
+ }
+ else {
+ ++it;
+ }
+ }
+
+}
+
+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)
+{
+ 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)
@@ -177,19 +248,43 @@
LOGI("<HSMS>收到消息 S%dF%d", nStream, pHeader->function);
if (nStream == 1 && pHeader->function == 1) {
// S1F1
- replyAreYouThere(pHeader->systemBytes);
+ replyAreYouThere(pMessage);
}
else if (nStream == 1 && pHeader->function == 13) {
- replyEstablishCommunications(pHeader->systemBytes);
+ replyEstablishCommunications(pMessage);
+ }
+ else if (nStream == 1 && pHeader->function == 15) {
+ replyOffLine(pMessage);
+ }
+ else if (nStream == 1 && pHeader->function == 17) {
+ replyOnLine(pMessage);
+ }
+ else if (nStream == 2 && pHeader->function == 13) {
+ replyEquipmentConstantRequest(pMessage);
+ }
+ else if (nStream == 2 && pHeader->function == 15) {
+ replyEquipmentConstantSend(pMessage);
}
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);
+ }
else if (nStream == 2 && pHeader->function == 37) {
replyEanbleDisableEventReport(pMessage);
}
+ else if (nStream == 2 && pHeader->function == 41) {
+ replyCommand(pMessage);
+ }
else if (nStream == 5 && pHeader->function == 3) {
replyEanbleDisableAlarmReport(pMessage);
+ }
+ else if (nStream == 7 && pHeader->function == 19) {
+ replyQueryPPIDList(pMessage);
}
else if (nStream == 10 && pHeader->function == 3) {
replyTerminalDisplay(pMessage);
@@ -302,7 +397,7 @@
HSMS_Create1Message(pMessage, m_nSessionId, s, f, systemBytes);
ASSERT(pMessage);
ISECS2Item* pItem = pMessage->getBody();
- pItem->setBinary(ack, pszAckName);
+ pItem->setBinary((const char*)&ack, 1, pszAckName);
m_pPassive->sendMessage(pMessage);
LOGI("<HSMS>[SECS Msg SEND]S%dF%d (SysByte=%u)", s, f, systemBytes);
HSMS_Destroy1Message(pMessage);
@@ -330,14 +425,14 @@
}
// S1F2
-int CHsmsPassive::replyAreYouThere(unsigned int systemBytes)
+int CHsmsPassive::replyAreYouThere(IMessage* pRecv)
{
if (m_pPassive == NULL || STATE::SELECTED != m_pPassive->getState()) {
return ER_NOTSELECT;
}
IMessage* pMessage = NULL;
- HSMS_Create1Message(pMessage, m_nSessionId, 1, 2, systemBytes);
+ HSMS_Create1Message(pMessage, m_nSessionId, 1, 2, pRecv->getHeader()->systemBytes);
ASSERT(pMessage);
ISECS2Item* pItem = pMessage->getBody();
@@ -350,15 +445,52 @@
return 0;
}
-// S1F14
-int CHsmsPassive::replyEstablishCommunications(unsigned int systemBytes)
+// S1F15
+int CHsmsPassive::replyOffLine(IMessage* pRecv)
+{
+ if (m_pPassive == NULL || STATE::SELECTED != m_pPassive->getState()) {
+ return ER_NOTSELECT;
+ }
+
+
+ // 交由上层应用来获取机器常量值
+ if (m_listener.onEQOffLine != nullptr) {
+ m_listener.onEQOffLine(this);
+ }
+
+
+ // 回复
+ replyAck(1, 16, pRecv->getHeader()->systemBytes, BYTE(0), "OFLACK");
+ return 0;
+}
+
+// S1F17
+int CHsmsPassive::replyOnLine(IMessage* pRecv)
+{
+ if (m_pPassive == NULL || STATE::SELECTED != m_pPassive->getState()) {
+ return ER_NOTSELECT;
+ }
+
+
+ // 交由上层应用来获取机器常量值
+ if (m_listener.onEQOnLine != nullptr) {
+ m_listener.onEQOnLine(this);
+ }
+
+
+ // 回复
+ replyAck(1, 18, pRecv->getHeader()->systemBytes, BYTE(0), "ONLACK");
+ return 0;
+}
+
+int CHsmsPassive::replyEstablishCommunications(IMessage* pRecv)
{
if (m_pPassive == NULL || STATE::SELECTED != m_pPassive->getState()) {
return ER_NOTSELECT;
}
IMessage* pMessage = NULL;
- HSMS_Create1Message(pMessage, m_nSessionId, 1, 14, systemBytes);
+ HSMS_Create1Message(pMessage, m_nSessionId, 1, 14, pRecv->getHeader()->systemBytes);
ASSERT(pMessage);
ISECS2Item* pItem = pMessage->getBody();
@@ -373,6 +505,96 @@
return 0;
}
+// S2F13
+int CHsmsPassive::replyEquipmentConstantRequest(IMessage* pRecv)
+{
+ if (m_pPassive == NULL || STATE::SELECTED != m_pPassive->getState()) {
+ return ER_NOTSELECT;
+ }
+
+
+ // 要获取的常量表表
+ BOOL bCheckData = FALSE;
+ std::vector<EQConstant> eqcs;
+ {
+ ISECS2Item* pItem = pRecv->getBody();
+ int ecidSize = pItem->getSubItemSize();
+ for (int i = 0; i < ecidSize; i++) {
+ EQConstant eqc;
+ unsigned short id;
+ if (pItem->getSubItemU2(i, id)) {
+ eqc.id = id;
+ eqcs.push_back(eqc);
+ }
+ }
+ }
+
+
+ // 交由上层应用来获取机器常量值
+ if (m_listener.onEQConstantRequest != nullptr) {
+ m_listener.onEQConstantRequest(this, eqcs);
+ }
+
+
+ // 回复
+ IMessage* pMessage = NULL;
+ HSMS_Create1Message(pMessage, m_nSessionId, 1, 14, pRecv->getHeader()->systemBytes);
+ ASSERT(pMessage);
+ ISECS2Item* pItem = pMessage->getBody();
+ for (auto& item : eqcs) {
+ pItem->addItem(item.szValue, "ECV");
+ }
+
+ m_pPassive->sendMessage(pMessage);
+ LOGI("<HSMS>[SECS Msg SEND]S2F14 (SysByte=%u)", pMessage->getHeader()->systemBytes);
+ HSMS_Destroy1Message(pMessage);
+
+ return 0;
+}
+
+// S2F15
+int CHsmsPassive::replyEquipmentConstantSend(IMessage* pRecv)
+{
+ if (m_pPassive == NULL || STATE::SELECTED != m_pPassive->getState()) {
+ return ER_NOTSELECT;
+ }
+
+
+ // 要设置的常量表表
+ BOOL bCheckData = FALSE;
+ std::vector<EQConstant> eqcs;
+ {
+ ISECS2Item* pItem = pRecv->getBody();
+ int ecidSize = pItem->getSubItemSize();
+ for (int i = 0; i < ecidSize; i++) {
+ ISECS2Item* pItemEqc = pItem->getSubItem(i);
+ if (pItemEqc != nullptr) {
+ EQConstant eqc;
+ unsigned short eqcid;
+ const char* pszValue;
+ if (pItemEqc->getSubItemU2(0, eqcid)
+ && pItemEqc->getSubItemString(1, pszValue)) {
+ eqc.id = eqcid;
+ strcpy_s(eqc.szValue, EQCONSTANT_VALUE_MAX, pszValue);
+ eqcs.push_back(eqc);
+ }
+ }
+ }
+ }
+
+
+ // 交由上层应用来保存和设置机器常量值
+ std::vector<unsigned int> ecvs;
+ if (m_listener.onEQConstantSend != nullptr) {
+ m_listener.onEQConstantSend(this, eqcs);
+ }
+
+
+ // 回复
+ replyAck(2, 16, pRecv->getHeader()->systemBytes, BYTE(0), "EACK");
+ return 0;
+}
+
// S2F31
int CHsmsPassive::replyDatetime(IMessage* pRecv)
{
@@ -381,7 +603,7 @@
}
ISECS2Item* pBody = pRecv->getBody();
if (pBody == nullptr || pBody->getType() != SITYPE::A) ER_PARAM_ERROR;
- char* pszMessage;
+ const char* pszMessage;
if (pBody->getString(pszMessage)) {
// 更新时间
SYSTEMTIME time;
@@ -404,6 +626,100 @@
}
replyAck(2, 32, pRecv->getHeader()->systemBytes, BYTE(0), "TIACK");
+ 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)
+{
+ if (m_pPassive == NULL || STATE::SELECTED != m_pPassive->getState()) {
+ return ER_NOTSELECT;
+ }
+
+
+ ISECS2Item* pBody = pRecv->getBody();
+ ISECS2Item* linkItem, *ceidListItem, *rptListItem;
+ unsigned int dataId, ceid, rptid;
+ if (!pBody->getSubItemU4(0, dataId)) goto MYREPLY;
+ ceidListItem = pBody->getSubItem(1);
+ if (ceidListItem == nullptr) goto MYREPLY;
+ for (int i = 0; i < ceidListItem->getSubItemSize(); i++) {
+ linkItem = ceidListItem->getSubItem(i);
+ if (linkItem == nullptr) continue;
+ rptListItem = linkItem->getSubItem(1);
+ if (linkItem->getSubItemU4(0, ceid)
+ && rptListItem != nullptr) {
+ int prtCount = rptListItem->getSubItemSize();
+ if (prtCount == 0) {
+ unlinkEventReport(ceid);
+ }
+ else {
+ for (int k = 0; k < prtCount; k++) {
+ if (rptListItem->getSubItemU4(k, rptid)) {
+ linkEventReport(rptid, ceid);
+ }
+ }
+ }
+ }
+ }
+
+
+ // 检验结果是否正确
+ for (auto item : m_mapReportIdToCEID) {
+ LOGE("=== prtid:%d, ceid:%d", item.first, item.second);
+ }
+
+MYREPLY:
+ replyAck(2, 36, pRecv->getHeader()->systemBytes, BYTE(0), "LRACK");
return 0;
}
@@ -447,6 +763,55 @@
return 0;
}
+// S2F41
+int CHsmsPassive::replyCommand(IMessage* pRecv)
+{
+ if (m_pPassive == NULL || STATE::SELECTED != m_pPassive->getState()) {
+ return ER_NOTSELECT;
+ }
+ ISECS2Item* pBody = pRecv->getBody();
+ if (pBody == nullptr || pBody->getType() != SITYPE::A) ER_PARAM_ERROR;
+
+
+
+ BOOL bCheckData = FALSE;
+ const char* pszCmdName;
+ std::vector<CommandParameter> params;
+ {
+ ISECS2Item* pItemParams, *pItemParam;
+ ISECS2Item* pItem = pRecv->getBody();
+ if (pItem->getSubItemSize() < 2) goto MYREPLY;
+ if (!pItem->getSubItemString(0, pszCmdName)) goto MYREPLY;
+ pItemParams = pItem->getSubItem(1);
+ if (pItemParams == nullptr || pItemParams->getType() != SITYPE::L) goto MYREPLY;
+ for (int i = 0; i < pItemParams->getSubItemSize(); i++) {
+ const char* pszParamName, * pszParamValue;
+ pItemParam = pItemParams->getSubItem(i);
+ if (pItemParam != nullptr
+ && pItemParam->getSubItemString(0, pszParamName)
+ && pItemParam->getSubItemString(1, pszParamValue)) {
+ CommandParameter cp;
+ strcpy_s(cp.szName, COMMAND_NAME_MAX, pszParamName);
+ strcpy_s(cp.szValue, COMMAND_VALUE_MAX, pszParamValue);
+ params.push_back(cp);
+ }
+ }
+ bCheckData = TRUE;
+ }
+
+
+ // 回调到应用层
+ if (bCheckData) {
+ if (m_listener.onCommand != nullptr) {
+ m_listener.onCommand(this, pszCmdName, params);
+ }
+ }
+
+MYREPLY:
+ replyAck(2, 42, pRecv->getHeader()->systemBytes, BYTE(0), "ERACK");
+ return 0;
+}
+
// S5F3
int CHsmsPassive::replyEanbleDisableAlarmReport(IMessage* pRecv)
{
@@ -459,20 +824,77 @@
BOOL bCheckData = FALSE;
- BYTE ALED;
+ const char* ALED;
unsigned int ALID;
+ unsigned int ALEDLEN;
{
ISECS2Item* pItem = pRecv->getBody();
if (pItem->getSubItemSize() < 2) goto MYREPLY;
- if (!pItem->getSubItemBinary(0, ALED)) goto MYREPLY;
+ if (!pItem->getSubItemBinary(0, ALED, ALEDLEN)) goto MYREPLY;
if (!pItem->getSubItemU4(1, ALID)) goto MYREPLY;
bCheckData = TRUE;
- LOGI("EanbleDisableAlarmReport ALED:%d, ALID:%d", ALED, ALID);
+ LOGI("EanbleDisableAlarmReport ALED:0x%02x, ALID:%d", ALED[0], ALID);
+
+ double d;
+ float f;
+ pItem->getSubItemF4(2, f);
+ pItem->getSubItemF8(3, d);
+ LOGI("EanbleDisableAlarmReport d:%lf, f:%f",
+ d, f);
+ /*
+ unsigned long long n1;
+ unsigned int n2;
+ unsigned short n3;
+ unsigned char n4;
+ long long sn1;
+ int sn2;
+ short sn3;
+ char sn4;
+ pItem->getSubItemU8(2, n1);
+ pItem->getSubItemU4(3, n2);
+ pItem->getSubItemU2(4, n3);
+ pItem->getSubItemU1(5, n4);
+ pItem->getSubItemI8(6, sn1);
+ pItem->getSubItemI4(7, sn2);
+ pItem->getSubItemI2(8, sn3);
+ pItem->getSubItemI1(9, sn4);
+
+ LOGI("EanbleDisableAlarmReport n1:%llu, n2:%u, n3:%hu, n4:%hhu",
+ n1, n2, n3, n4);
+ LOGI("EanbleDisableAlarmReport sn1:%lld, sn2:%d, sn3:%hd, sn4:%hhd",
+ sn1, sn2, sn3, sn4);
+ */
}
MYREPLY:
replyAck(5, 4, pRecv->getHeader()->systemBytes, BYTE(0), "ACKC5");
+ return 0;
+}
+
+// S7F19
+int CHsmsPassive::replyQueryPPIDList(IMessage* pRecv)
+{
+ if (m_pPassive == NULL || STATE::SELECTED != m_pPassive->getState()) {
+ return ER_NOTSELECT;
+ }
+
+
+ IMessage* pMessage = NULL;
+ HSMS_Create1Message(pMessage, m_nSessionId, 7, 20, pRecv->getHeader()->systemBytes);
+ ASSERT(pMessage);
+
+ ISECS2Item* pItem = pMessage->getBody();
+ pItem->addItem("banana1", "PPID1");
+ pItem->addItem("banana2", "PPID2");
+ pItem->addF8Item(-123.45, "PPID2");
+ pItem->addF4Item(-568.99f, "PPID2");
+ pItem->addF8Item(456.456, "PPID2");
+ pItem->addF4Item(123.123f, "PPID2");
+ m_pPassive->sendMessage(pMessage);
+ LOGI("<HSMS>[SECS Msg SEND]S7F20 (SysByte=%u)", pMessage->getHeader()->systemBytes);
+ HSMS_Destroy1Message(pMessage);
+
return 0;
}
@@ -488,15 +910,16 @@
BOOL bCheckData = FALSE;
- BYTE tid;
- char* pszText = nullptr;;
+ const char* tid;
+ unsigned int tidlen;
+ const char* pszText = nullptr;;
{
ISECS2Item* pItem = pRecv->getBody();
if (pItem->getSubItemSize() < 2) goto MYREPLY;
- if (!pItem->getSubItemBinary(0, tid)) goto MYREPLY;
+ if (!pItem->getSubItemBinary(0, tid, tidlen)) goto MYREPLY;
if (!pItem->getSubItemString(1, pszText)) goto MYREPLY;
bCheckData = TRUE;
- LOGI("TerminalDisplay tid:%d, pszText:%s", tid, pszText);
+ LOGI("TerminalDisplay tid:0x%02x, pszText:%s", tid[0], pszText);
m_pModel->notifyText(RX_HSMS_TERMINAL_TEXT, pszText);
}
@@ -531,4 +954,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