From f56051fa3102feb35ea60650ebda80f49e62d025 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期二, 05 八月 2025 14:54:24 +0800
Subject: [PATCH] 1. SGMeasurement实现规划的地址 2. 优化读取位时输入的地址不是8的倍数的问题 3. 添加读写心跳的功能

---
 SourceCode/Bond/BondEq/AlarmPopupDlg.h |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/SourceCode/Bond/BondEq/AlarmPopupDlg.h b/SourceCode/Bond/BondEq/AlarmPopupDlg.h
index e9437a2..cce5908 100644
--- a/SourceCode/Bond/BondEq/AlarmPopupDlg.h
+++ b/SourceCode/Bond/BondEq/AlarmPopupDlg.h
@@ -13,13 +13,17 @@
 	CAlarmPopupDlg(CWnd* pParent = NULL);   // 标准构造函数
 	virtual ~CAlarmPopupDlg();
 
+public:
+	void SetPLC(CPLC* pPLC);
 
 public:
 	void AlarmOn();
 	void AlarmOff();
 
 private:
+	void InitRxWindows();
 	void ShowFirstAlarm();
+	void SetButtonBackgroundColors(bool bMute);
 
 private:
 	COLORREF m_crBkgnd;
@@ -30,6 +34,8 @@
 	CFont m_fontDescription;
 
 private:
+	IObserver* m_pObserver;
+	CPLC* m_pPLC;
 	CAlarm* m_pActiveAlarm;
 	CBlButton m_btnClose;
 	CBlButton m_btnSoundOff;
@@ -50,4 +56,6 @@
 	afx_msg void OnDestroy();
 	afx_msg void OnSize(UINT nType, int cx, int cy);
 	afx_msg void OnBnClickedButtonClose();
+	afx_msg void OnBnClickedButtonSoundOff();
+	afx_msg void OnBnClickedButtonAlarmOff();
 };

--
Gitblit v1.9.3