~chenluhua/Bond2.git

			@@ -1,7 +1,10 @@
			#pragma once
			#include "afxdialogex.h"
			#include <vector>
			#include <string>
			#include "AlarmManager.h"
			#include "ListCtrlEx.h"


			#define ID_MSG_ALARMDLG_HIDE WM_USER + 1024

			// CAlarmDlg 对话框

			@@ -17,19 +20,21 @@
			void InitRxWindow();
			void Resize();
			void LoadAlarms();
			//void AddAlarm(CAlarmMonitor* pMonitor, CAlarm* pAlarm);
			//void UpdateAlarm(CAlarmMonitor* pMonitor, CAlarm* pAlarm);
			void UpdatePageData();
			void UpdatePageControls();
			void FillDataToListCtrl(CListCtrl* pListCtrl, const std::vector<std::vector<std::string>>& vecData);
			void FillDataToListCtrl(CListCtrl* pListCtrl, const std::vector<AlarmData>& vecData);
			void InsertAlarmData(CListCtrl* pListCtrl, const AlarmData& alarmData);
			std::string getCurrentTimeString();

			private:
			COLORREF m_crBkgnd;
			HBRUSH m_hbrBkgnd;
			IObserver* m_pObserver;

			// 关键字
			std::string m_strEqName;
			// 搜索关键字
			int m_nSeverityLevel;
			std::string m_strDeviceName;
			std::string m_strUnitName;
			std::string m_strKeyword;

			// 页码
			@@ -44,6 +49,7 @@
			// 控件
			CDateTimeCtrl m_dateTimeStart;
			CDateTimeCtrl m_dateTimeEnd;
			CListCtrlEx m_listCtrl;

			// 对话框数据
			#ifdef AFX_DESIGN_TIME
			@@ -53,9 +59,9 @@
			protected:
			virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV 支持
			virtual BOOL OnInitDialog();
			virtual BOOL DestroyWindow();
			afx_msg HBRUSH OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor);
			afx_msg void OnDestroy();
			afx_msg void OnClose();
			afx_msg void OnSize(UINT nType, int cx, int cy);
			afx_msg void OnCbnSelchangeComboDatetime();
			afx_msg void OnBnClickedButtonSearch();