From 847a34f02bfe00475735fb5bfbefea2db28c8ad6 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期六, 24 一月 2026 17:15:48 +0800
Subject: [PATCH] 1.修复前烘-b, 后烘-b没有进入b分支导致数据没有推送到显示端的问题；
---
SourceCode/Bond/BondEq/CProjectPageRemoteEqs.cpp | 19 +++++--------------
1 files changed, 5 insertions(+), 14 deletions(-)
diff --git a/SourceCode/Bond/BondEq/CProjectPageRemoteEqs.cpp b/SourceCode/Bond/BondEq/CProjectPageRemoteEqs.cpp
index 2eed02d..e120046 100644
--- a/SourceCode/Bond/BondEq/CProjectPageRemoteEqs.cpp
+++ b/SourceCode/Bond/BondEq/CProjectPageRemoteEqs.cpp
@@ -55,7 +55,7 @@
// onNext
pAny->addRef();
int code = pAny->getCode();
- if (RX_CODE_REMOTEEQ_STATE_CHANGED == code) {
+ if (RX_CODE_EQ_STATE_CHANGED == code) {
BEQ::IRemoteEquipment* pRemoteEq;
if (pAny->getPtrValue("ptr", (void*&)pRemoteEq)) {
HTREEITEM hItem = getTreeItem(pRemoteEq);
@@ -128,9 +128,10 @@
::DeleteObject(m_hbrBkgnd);
}
- ASSERT(m_pObserver != NULL);
- m_pObserver->unsubscribe();
- m_pObserver = NULL;
+ if (m_pObserver != NULL) {
+ m_pObserver->unsubscribe();
+ m_pObserver = NULL;
+ }
}
@@ -195,16 +196,6 @@
if (1 == nIDEvent) {
KillTimer(1);
InitRxWindows();
-
- // 杩滅▼璁惧鍒楄〃
- char szEqName[256];
- BEQ::IRemoteEquipment* pRemoteEq = theApp.m_model.getBond1();
- ASSERT(pRemoteEq);
- pRemoteEq->getName(szEqName, 256);
-
- HTREEITEM hItemEq = m_treeRemoteEqs.InsertItem(szEqName);
- m_treeRemoteEqs.SetItemIcon(hItemEq, pRemoteEq->isConnected() ? m_hIconRemoteEqLight : m_hIconRemoteEqDark);
- m_treeRemoteEqs.SetItemData(hItemEq, (DWORD_PTR)pRemoteEq);
}
CDialogEx::OnTimer(nIDEvent);
--
Gitblit v1.9.3