From d14420e7f85b5fe7289aafe6bef0c053dede3657 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期五, 16 一月 2026 11:20:39 +0800
Subject: [PATCH] 1.修复以下问题： CEID 校验恒通过：ceidDefined 返回 true，PauseEvent ID 不做有效性检查。Host 若下发无效 CEID，将被接受但运行时无法触发暂停，风险难以察觉。 建议的上线前防护 / 改进（无需真机也可先改） 2.软件侧警告id上抛；
---
SourceCode/Bond/BoounionPLC/Model.cpp | 16 ++++------------
1 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/SourceCode/Bond/BoounionPLC/Model.cpp b/SourceCode/Bond/BoounionPLC/Model.cpp
index 59587a7..051b050 100644
--- a/SourceCode/Bond/BoounionPLC/Model.cpp
+++ b/SourceCode/Bond/BoounionPLC/Model.cpp
@@ -21,6 +21,7 @@
m_pObservableEmitter = nullptr;
m_pObservable = nullptr;
m_nTimerID = 0;
+ m_pActivePlc = nullptr;
}
@@ -337,7 +338,7 @@
pPLC->setWorkDir((LPTSTR)(LPCTSTR)strPlcDir);
PLCListener listener;
listener.onStateChanged = [&](void* pFrom, int state) -> void {
- LOGD("PLC状态改变，%d", state);
+ notifyPtr(RX_PLC_STATE_CHANGED, pFrom);
};
listener.onMonitorData = [&](void* pFrom, int id) -> void {
LOGD("PLConMonitorData，%d", id);
@@ -388,19 +389,10 @@
void CModel::setCurrentPlc(CPLC* pPlc)
{
- if (pPlc != nullptr) {
- m_strCurrPlc = pPlc->getName();
- } else {
- m_strCurrPlc = "";
- }
+ m_pActivePlc = pPlc;
}
CPLC* CModel::getCurrentPlc()
{
- auto item = m_mapPlc.find(m_strCurrPlc);
- if (item != m_mapPlc.end()) {
- return item->second;
- }
-
- return nullptr;
+ return m_pActivePlc;
}
\ No newline at end of file
--
Gitblit v1.9.3