From 829fe6c6bc33d53fda9c31fd45a37e1df87befff Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期五, 30 一月 2026 11:16:24 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang

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

diff --git a/SourceCode/Bond/Servo/ServoDlg.h b/SourceCode/Bond/Servo/ServoDlg.h
index bdc47a4..e05c9e5 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"
@@ -12,12 +14,18 @@
 #include "CPanelMaster.h"
 #include "CPanelEquipment.h"
 #include "CPanelAttributes.h"
+#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 瀵硅瘽妗�
@@ -30,10 +38,16 @@
 
 public:
 	void ShowTerminalText(const char* pszText, unsigned int duration = -1);
+	void AckAlarm(int alarmId);
 
 private:
 	void InitRxWindows();
+	void RefreshAlarmBadge();
+	void MarkAlarmsRead();
+	void RaiseTestAlarm();
+	void ClearTestAlarm();
 	void Resize();
+	void SetLeftPanelType(int type, bool resize = true);
 	void ShowChildPage(int index);
 	void UpdateLoginStatus();
 	CString& GetRuntimeFormatText(CString& strText, const char* pszSuffix);
@@ -49,6 +63,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
@@ -64,8 +82,10 @@
 	HICON m_hIcon;
 	COLORREF m_crBkgnd;
 	HBRUSH m_hbrBkgnd;
+	int m_nLeftPanelType; // 1: CPanelMaster, 2: CPanelProduction
 	CTopToolbar* m_pTopToolbar;
 	CPanelMaster* m_pPanelMaster;
+	CPanelProduction* m_pPanelProduction;
 	CPanelEquipment* m_pPanelEquipment;
 	CPanelAttributes* m_pPanelAttributes;
 	CMyStatusbar* m_pMyStatusbar;
@@ -94,16 +114,29 @@
 	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();
 	afx_msg void OnUpdateMenuTestMessageClear(CCmdUI* pCmdUI);
 	afx_msg void OnMenuToolsClientList();
 	afx_msg void OnUpdateMenuToolsClientList(CCmdUI* pCmdUI);
+	afx_msg void OnMenuToolsCurveEmptyMode();
+	afx_msg void OnUpdateMenuToolsCurveEmptyMode(CCmdUI* pCmdUI);
+	afx_msg void OnMenuToolsCurveProductionMode();
+	afx_msg void OnUpdateMenuToolsCurveProductionMode(CCmdUI* pCmdUI);
+	afx_msg void OnMenuWndTestPanel();
+	afx_msg void OnUpdateMenuWndTestPanel(CCmdUI* pCmdUI);
+	afx_msg void OnMenuWndProPanel();
+	afx_msg void OnUpdateMenuWndProPanel(CCmdUI* pCmdUI);
 	afx_msg void OnMenuHelpAbout();
 	afx_msg void OnTimer(UINT_PTR nIDEvent);
 	afx_msg LRESULT OnPanelResize(WPARAM wParam, LPARAM lParam);
 	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