From d2e6f402c0705170c83cffef1b09bf3994a9127f Mon Sep 17 00:00:00 2001
From: LAPTOP-T815PCOQ\25526 <mr.liuyang@126.com>
Date: 星期一, 13 一月 2025 16:56:39 +0800
Subject: [PATCH] Merge branch 'master' into liuyang

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

diff --git a/SourceCode/Bond/BondEq/AlarmPopupDlg.h b/SourceCode/Bond/BondEq/AlarmPopupDlg.h
index 4479eb3..cce5908 100644
--- a/SourceCode/Bond/BondEq/AlarmPopupDlg.h
+++ b/SourceCode/Bond/BondEq/AlarmPopupDlg.h
@@ -21,6 +21,7 @@
 	void AlarmOff();
 
 private:
+	void InitRxWindows();
 	void ShowFirstAlarm();
 	void SetButtonBackgroundColors(bool bMute);
 
@@ -33,6 +34,7 @@
 	CFont m_fontDescription;
 
 private:
+	IObserver* m_pObserver;
 	CPLC* m_pPLC;
 	CAlarm* m_pActiveAlarm;
 	CBlButton m_btnClose;

--
Gitblit v1.9.3