Merge branch 'clh' into liuyang

mrDarker

6 天以前 829fe6c6bc33d53fda9c31fd45a37e1df87befff

 SourceCode/Bond/Servo/AlarmPopupDlg.cpp

@@ -5,6 +5,7 @@
#include "Log.h"
#include "Common.h"
#include "HorizontalLine.h"
#include "ServoDlg.h"


IMPLEMENT_DYNAMIC(CAlarmPopupDlg, CDialogEx)
@@ -228,6 +229,11 @@

   m_activeAlarm = m_activeAlarms[idx];

   // 标记已读
   if (auto* pParent = dynamic_cast<CServoDlg*>(GetParent())) {
      pParent->AckAlarm(m_activeAlarm.nId);
   }

   AlarmManager& alarmManager = AlarmManager::getInstance();
   const AlarmInfo* info = alarmManager.getAlarmInfoByID(m_activeAlarm.nId);