From 4849a5172d454dd2f95a956f4662606f5f3a68ff Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期一, 08 九月 2025 09:43:08 +0800
Subject: [PATCH] 1. 代码合并冲突，重新提交
---
SourceCode/Bond/BoounionPLC/BoounionPLCDlg.cpp | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/BoounionPLC/BoounionPLCDlg.cpp b/SourceCode/Bond/BoounionPLC/BoounionPLCDlg.cpp
index 1f8db8c..d859bee 100644
--- a/SourceCode/Bond/BoounionPLC/BoounionPLCDlg.cpp
+++ b/SourceCode/Bond/BoounionPLC/BoounionPLCDlg.cpp
@@ -141,6 +141,9 @@
theApp.m_model.setCurrentPlc(pPlc);
}
}
+ else if (RX_PLC_STATE_CHANGED == code) {
+
+ }
else if (code == RX_CODE_ALARM_ON) {
CPLC* pPlc;
if (pAny->getPtrValue("ptr", (void*&)pPlc) && pPlc == theApp.m_model.getCurrentPlc()) {
--
Gitblit v1.9.3