1.test

LAPTOP-SNT8I5JK\Boounion

2025-05-24 1f5f8a22e9c584f709d4b34d2e4d24eaad2d5544

 SourceCode/Bond/Servo/PageAlarm.cpp

@@ -115,11 +115,7 @@
   GetDlgItem(IDC_BUTTON_NEXT_PAGE)->EnableWindow(m_nCurPage < m_nTotalPages);
}

<<<<<<< HEAD:SourceCode/Bond/Servo/AlarmDlg.cpp
void CAlarmDlg::FillDataToListCtrl(CListCtrl* pListCtrl, const std::vector<AlarmData>& vecData)
=======
void CPageAlarm::FillDataToListCtrl(CListCtrl* pListCtrl, const std::vector<AlarmData>& vecData)
>>>>>>> clh:SourceCode/Bond/Servo/PageAlarm.cpp
{
   if (pListCtrl == nullptr || pListCtrl->m_hWnd == nullptr) {
      return;
@@ -139,11 +135,7 @@
}

static char* pszAlarmLevel[] = { "Warning", "Error" };
<<<<<<< HEAD:SourceCode/Bond/Servo/AlarmDlg.cpp
void CAlarmDlg::InsertAlarmData(CListCtrl* pListCtrl, const AlarmData& alarmData)
=======
void CPageAlarm::InsertAlarmData(CListCtrl* pListCtrl, const AlarmData& alarmData)
>>>>>>> clh:SourceCode/Bond/Servo/PageAlarm.cpp
{
   if (pListCtrl == nullptr || pListCtrl->m_hWnd == nullptr) {
      return;
@@ -195,20 +187,11 @@
   ON_WM_DESTROY()
   ON_WM_CLOSE()
   ON_WM_SIZE()
<<<<<<< HEAD:SourceCode/Bond/Servo/AlarmDlg.cpp
   ON_WM_TIMER()
   ON_CBN_SELCHANGE(IDC_COMBO_DATETIME, &CAlarmDlg::OnCbnSelchangeComboDatetime)
   ON_BN_CLICKED(IDC_BUTTON_SEARCH, &CAlarmDlg::OnBnClickedButtonSearch)
   ON_BN_CLICKED(IDC_BUTTON_EXPORT, &CAlarmDlg::OnBnClickedButtonExport)
   ON_BN_CLICKED(IDC_BUTTON_PREV_PAGE, &CAlarmDlg::OnBnClickedButtonPrevPage)
   ON_BN_CLICKED(IDC_BUTTON_NEXT_PAGE, &CAlarmDlg::OnBnClickedButtonNextPage)
=======
   ON_CBN_SELCHANGE(IDC_COMBO_DATETIME, &CPageAlarm::OnCbnSelchangeComboDatetime)
   ON_BN_CLICKED(IDC_BUTTON_SEARCH, &CPageAlarm::OnBnClickedButtonSearch)
   ON_BN_CLICKED(IDC_BUTTON_EXPORT, &CPageAlarm::OnBnClickedButtonExport)
   ON_BN_CLICKED(IDC_BUTTON_PREV_PAGE, &CPageAlarm::OnBnClickedButtonPrevPage)
   ON_BN_CLICKED(IDC_BUTTON_NEXT_PAGE, &CPageAlarm::OnBnClickedButtonNextPage)
>>>>>>> clh:SourceCode/Bond/Servo/PageAlarm.cpp
END_MESSAGE_MAP()


@@ -331,19 +314,7 @@
   Resize();
}

<<<<<<< HEAD:SourceCode/Bond/Servo/AlarmDlg.cpp
void CAlarmDlg::OnTimer(UINT_PTR nIDEvent)
{
   if (1 == nIDEvent) {
      KillTimer(1);
      InitRxWindow();
   }
}

void CAlarmDlg::OnCbnSelchangeComboDatetime()
=======
void CPageAlarm::OnCbnSelchangeComboDatetime()
>>>>>>> clh:SourceCode/Bond/Servo/PageAlarm.cpp
{
   CComboBox* pComboBox = (CComboBox*)GetDlgItem(IDC_COMBO_DATETIME);
   int nIndex = pComboBox->GetCurSel();