1. 对话框基类添加动态控件管理 2. 对话框基类主题切换功能

LAPTOP-T815PCOQ\25526

2024-12-18 50a42e5d72e2f8cf92ff9b2273e0442977dbcefd

 SourceCode/Bond/BondEq/CPageAlarm.cpp

@@ -155,22 +155,19 @@

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


   // 当前正在发生的报警
   pMonitor->Lock();

#if 0
   std::map<int, CAlarm*>& alarmings = pMonitor->getAlarmingMap();
   std::list< CAlarm*>& alarms = pMonitor->getAlarmRecords();

   for (auto item : alarmings) {
      AddAlarm(pMonitor, item.second);
   }
   for (auto item : alarms) {
      AddAlarm(pMonitor, item);
   }
#else
   // 获取报警数据
   pMonitor->Unlock();


   // 获取历史报警数据
   auto vecData = AlarmManager::getInstance().getAllAlarms();

   // 填充数据
@@ -182,15 +179,12 @@
      pListCtrl->SetItemText(0, 3, item[2].c_str());
      pListCtrl->SetItemText(0, 4, item[3].c_str());
   }
#endif // 0

   pMonitor->Unlock();
}

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(""));
@@ -202,30 +196,18 @@
   if (pAlarm->getOffTime() > 0) {
      pListCtrl->SetItemText(0, 4, CToolUnits::timeToString2(pAlarm->getOffTime()).c_str());
   }

   AlarmManager::getInstance().addAlarm(
      std::to_string(pAlarm->getId()).c_str(), 
      pMonitor->getAlarmText(pAlarm->getId()),
      CToolUnits::timeToString2(pAlarm->getOnTime()).c_str(),
      CToolUnits::timeToString2(pAlarm->getOffTime()).c_str());
}

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++) {
      if (pListCtrl->GetItemData(i) == (DWORD_PTR)pAlarm) {
         if (pAlarm->getOffTime() > 0) {
            pListCtrl->SetItemText(i, 4, CToolUnits::timeToString2(pAlarm->getOffTime()).c_str());

            AlarmManager::getInstance().updateAlarmEndTime(
               std::to_string(pAlarm->getId()).c_str(),
               pMonitor->getAlarmText(pAlarm->getId()),
               CToolUnits::timeToString2(pAlarm->getOnTime()).c_str(),
               CToolUnits::timeToString2(pAlarm->getOffTime()).c_str());
         }
      }
   }