Merge branch 'liuyang' into clh

LAPTOP-SNT8I5JK\Boounion

2024-12-13 0677e1aaead1762fc19c16c82a02926ec6d21b8a

 SourceCode/Bond/BondEq/CPageAlarm.cpp

@@ -155,7 +155,7 @@

void CPageAlarm::LoadAlarms()
{
   CAlarmMonitor* pMonitor = (CAlarmMonitor*)theApp.m_model.getBonder().GetComponent("警告信息");
   CAlarmMonitor* pMonitor = (CAlarmMonitor*)theApp.m_model.getBonder().GetComponent(ALARM_MONITOR);

   pMonitor->Lock();

@@ -190,7 +190,7 @@
void CPageAlarm::AddAlarm(CAlarmMonitor* pMonitor, CAlarm* pAlarm)
{
   if (pMonitor == nullptr) {
      pMonitor = (CAlarmMonitor*)theApp.m_model.getBonder().GetComponent("警告信息");
      pMonitor = (CAlarmMonitor*)theApp.m_model.getBonder().GetComponent(ALARM_MONITOR);
   }
   CListCtrl* pListCtrl = (CListCtrl*)GetDlgItem(IDC_LIST_ALARM);
   pListCtrl->InsertItem(0, _T(""));
@@ -213,7 +213,7 @@
void CPageAlarm::UpdateAlarm(CAlarmMonitor* pMonitor, CAlarm* pAlarm)
{
   if (pMonitor == nullptr) {
      pMonitor = (CAlarmMonitor*)theApp.m_model.getBonder().GetComponent("警告信息");
      pMonitor = (CAlarmMonitor*)theApp.m_model.getBonder().GetComponent(ALARM_MONITOR);
   }
   CListCtrl* pListCtrl = (CListCtrl*)GetDlgItem(IDC_LIST_ALARM);
   for (int i = 0; i < pListCtrl->GetItemCount(); i++) {