From 2254c453025136727917601091f14da02af1b548 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期三, 21 一月 2026 15:02:41 +0800
Subject: [PATCH] 1.完善警告，软警告上抛和清除测试；

---
 SourceCode/Bond/Servo/ServoDlg.h |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/SourceCode/Bond/Servo/ServoDlg.h b/SourceCode/Bond/Servo/ServoDlg.h
index df4b01d..aa16b76 100644
--- a/SourceCode/Bond/Servo/ServoDlg.h
+++ b/SourceCode/Bond/Servo/ServoDlg.h
@@ -3,6 +3,8 @@
 //
 
 #pragma once
+#include <vector>
+#include <unordered_set>
 #include "BlButton.h"
 #include "PageLog.h"
 #include "PageAlarm.h"
@@ -15,12 +17,15 @@
 #include "CPanelProduction.h"
 #include "CPageGraph1.h"
 #include "CPageGraph2.h"
+#include "HmTab.h"
 #include "TopToolbar.h"
 #include "CMyStatusbar.h"
 #include "CRobotTaskDlg.h"
 #include "CPageGlassList.h"
 #include "CPageVarialbles.h"
 #include "CPageDataVarialbles.h"
+#include "AlarmPopupDlg.h"
+#include "AlarmManager.h"
 
 
 // CServoDlg 瀵硅瘽妗�
@@ -36,6 +41,10 @@
 
 private:
 	void InitRxWindows();
+	void RefreshAlarmBadge();
+	void MarkAlarmsRead();
+	void RaiseTestAlarm();
+	void ClearTestAlarm();
 	void Resize();
 	void SetLeftPanelType(int type, bool resize = true);
 	void ShowChildPage(int index);
@@ -53,6 +62,10 @@
 	CPageAlarm*	 m_pPageAlarm;
 	CPageLog*	 m_pPageLog;
 	CPageTransferLog* m_pPageTransferLog;
+	CAlarmPopupDlg* m_pAlarmPopupDlg;
+	CHmTab* m_pTab;
+	std::vector<AlarmData> m_unreadAlarms;
+	std::unordered_set<int> m_ackAlarms;
 
 // 瀵硅瘽妗嗘暟鎹�
 #ifdef AFX_DESIGN_TIME
@@ -100,6 +113,10 @@
 	afx_msg void OnUpdateMenuFileExit(CCmdUI* pCmdUI);
 	afx_msg void OnMenuProjectVarialbleList();
 	afx_msg void OnUpdateMenuProjectVarialbleList(CCmdUI* pCmdUI);
+	afx_msg void OnMenuTestAlarmOn();
+	afx_msg void OnUpdateMenuTestAlarmOn(CCmdUI* pCmdUI);
+	afx_msg void OnMenuTestAlarmOff();
+	afx_msg void OnUpdateMenuTestAlarmOff(CCmdUI* pCmdUI);
 	afx_msg void OnMenuTestMessageSet();
 	afx_msg void OnUpdateMenuTestMessageSet(CCmdUI* pCmdUI);
 	afx_msg void OnMenuTestMessageClear();
@@ -116,4 +133,5 @@
 	afx_msg void OnTabSelChanged(NMHDR* nmhdr, LRESULT* result);
 	LRESULT OnToolbarBtnClicked(WPARAM wParam, LPARAM lParam);
 	LRESULT OnStatusbarBtnClicked(WPARAM wParam, LPARAM lParam);
+	virtual BOOL PreTranslateMessage(MSG* pMsg);
 };

--
Gitblit v1.9.3