From 9167ffecc0c63927d56268182e57cb8c52ed1b37 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期四, 28 八月 2025 15:19:25 +0800
Subject: [PATCH] 1.ControlJob工作流程模拟测试，保存工作状态，重启软件还原工作状态等； 2.CJEnd事件上报，EAP模拟测试，数据验证等；
---
SourceCode/Bond/BondEq/CProjectPageRemoteEqs.cpp | 21 ++++++---------------
1 files changed, 6 insertions(+), 15 deletions(-)
diff --git a/SourceCode/Bond/BondEq/CProjectPageRemoteEqs.cpp b/SourceCode/Bond/BondEq/CProjectPageRemoteEqs.cpp
index a9e516f..e120046 100644
--- a/SourceCode/Bond/BondEq/CProjectPageRemoteEqs.cpp
+++ b/SourceCode/Bond/BondEq/CProjectPageRemoteEqs.cpp
@@ -3,7 +3,7 @@
#include "stdafx.h"
#include "Common.h"
-#include "BondServo.h"
+#include "BondEq.h"
#include "CProjectPageRemoteEqs.h"
#include "afxdialogex.h"
@@ -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