From 1e8e3473cb124f9e51dfc1ca35e5cb13b1668bdc Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期六, 10 五月 2025 10:46:19 +0800
Subject: [PATCH] 1.重命名类名称和文件名;

---
 SourceCode/Bond/BondEq/CProjectPageComponents.cpp |   15 +++++++--------
 1 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/SourceCode/Bond/BondEq/CProjectPageComponents.cpp b/SourceCode/Bond/BondEq/CProjectPageComponents.cpp
index 9c4032c..e6eb9f5 100644
--- a/SourceCode/Bond/BondEq/CProjectPageComponents.cpp
+++ b/SourceCode/Bond/BondEq/CProjectPageComponents.cpp
@@ -6,6 +6,7 @@
 #include "CProjectPageComponents.h"
 #include "afxdialogex.h"
 #include "Alarm.h"
+#include "AlarmMonitor.h"
 
 
 // CProjectPageComponents 瀵硅瘽妗�
@@ -13,7 +14,7 @@
 IMPLEMENT_DYNAMIC(CProjectPageComponents, CDialogEx)
 
 CProjectPageComponents::CProjectPageComponents(CWnd* pParent /*=nullptr*/)
-	: CDialogEx(IDD_PROJECT_PAGE_COMPENTS, pParent)
+	: CDialogEx(IDD_PROJECT_PAGE_COMPONENTS, pParent)
 {
 	m_crBkgnd = PROPAGE_BACKGROUND_COLOR;
 	m_hbrBkgnd = nullptr;
@@ -72,18 +73,16 @@
 					}
 				}
 			}
-			else if (RX_CODE_ALARM_EVENT == code) {
-				CComponent* pComponent = nullptr;
-				CAlarm* pAlarm = nullptr;
-				pAny->getObject("obj", (IRxObject*&)pAlarm);
+			else if (RX_CODE_ALARM_ON == code
+				|| RX_CODE_ALARM_OFF == code) {
+				CAlarmMonitor* pComponent = nullptr;
 				pAny->getPtrValue("ptr", (void*&)pComponent);
 				ASSERT(pComponent);
-				ASSERT(pAlarm);
 				HTREEITEM hItem = getTreeItem(pComponent);
 				if (hItem != nullptr) {
-					if(pAlarm->getStatus() == 1)
+					if (pComponent->isAlarming())
 						m_treeComponents.ShowItemBadgeDotMode(hItem);
-					else if (pAlarm->getStatus() == 2)
+					else
 						m_treeComponents.HideItemBadge(hItem);
 				}
 			}

--
Gitblit v1.9.3