From 31aa10eaae103c30e02d7dc6c71ff4e50de361b3 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期一, 12 五月 2025 15:28:32 +0800
Subject: [PATCH] 1. 修改报警的显示模式（包括日志，需要后期修复） 2. 添加Release模式编译

---
 SourceCode/Bond/Servo/ServoDlg.h |   60 +++++++++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 47 insertions(+), 13 deletions(-)

diff --git a/SourceCode/Bond/Servo/ServoDlg.h b/SourceCode/Bond/Servo/ServoDlg.h
index 3b1cd3b..ec38640 100644
--- a/SourceCode/Bond/Servo/ServoDlg.h
+++ b/SourceCode/Bond/Servo/ServoDlg.h
@@ -3,9 +3,15 @@
 //
 
 #pragma once
-#include "ServoGraph.h"
 #include "BlButton.h"
 #include "LogDlg.h"
+#include "AlarmDlg.h"
+#include "TerminalDisplayDlg.h"
+#include "CPanelMaster.h"
+#include "CPanelEquipment.h"
+#include "CPanelAttributes.h"
+#include "CPageGraph1.h"
+#include "CPageGraph2.h"
 
 
 // CServoDlg 对话框
@@ -16,9 +22,28 @@
 	CServoDlg(CWnd* pParent = NULL);	// 标准构造函数
 
 
+public:
+	void ShowTerminalText(const char* pszText, unsigned int duration = -1);
+
 private:
+	void InitRxWindows();
 	void Resize();
-	void UpdateLogBtn();
+	//void UpdateLogBtn();
+	//void UpdateAlarmBtn();
+	void ShowChildPage(int index);
+
+
+private:
+	IObserver* m_pObserver;
+	//BOOL m_bShowLogWnd;
+	//BOOL m_bShowAlarmWnd;
+	//CLogDlg* m_pLogDlg;
+	//CAlarmDlg* m_pAlarmDlg;
+	CTerminalDisplayDlg* m_pTerminalDisplayDlg;
+	CPageGraph1* m_pPageGraph1;
+	CPageGraph2* m_pPageGraph2;
+	CAlarmDlg*	 m_pPageGraph3;
+	CLogDlg*	 m_pPageGraph4;
 
 
 // 对话框数据
@@ -30,18 +55,16 @@
 	virtual void DoDataExchange(CDataExchange* pDX);	// DDX/DDV 支持
 
 
-private:
-	BOOL m_bShowLogWnd;
-	CLogDlg* m_pLogDlg;
-
 // 实现
 protected:
 	HICON m_hIcon;
-	CServoGraph* m_pGraph;
 	COLORREF m_crBkgnd;
 	HBRUSH m_hbrBkgnd;
-	CBlButton m_btnLog;
-
+	//CBlButton m_btnLog;
+	//CBlButton m_btnAlarm;
+	CPanelMaster* m_pPanelMaster;
+	CPanelEquipment* m_pPanelEquipment;
+	CPanelAttributes* m_pPanelAttributes;
 
 	// 生成的消息映射函数
 	virtual BOOL OnInitDialog();
@@ -54,10 +77,11 @@
 	afx_msg void OnBnClickedCancel();
 	afx_msg HBRUSH OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor);
 	afx_msg void OnDestroy();
-	afx_msg void OnBnClickedButtonLog();
+	//afx_msg void OnBnClickedButtonLog();
 	afx_msg void OnSize(UINT nType, int cx, int cy);
 	afx_msg void OnClose();
-	afx_msg LRESULT OnLogDlgHide(WPARAM wParam, LPARAM lParam);
+	//afx_msg LRESULT OnLogDlgHide(WPARAM wParam, LPARAM lParam);
+	//afx_msg LRESULT OnAlarmDlgHide(WPARAM wParam, LPARAM lParam);
 	afx_msg void OnMoving(UINT fwSide, LPRECT pRect);
 	afx_msg void OnMove(int x, int y);
 	afx_msg void OnInitMenuPopup(CMenu* pPopupMenu, UINT nIndex, BOOL bSysMenu);
@@ -65,9 +89,19 @@
 	afx_msg void OnUpdateMenuFileSettings(CCmdUI* pCmdUI);
 	afx_msg void OnMenuFileSecsTest();
 	afx_msg void OnUpdateMenuFileSecsTest(CCmdUI* pCmdUI);
-	afx_msg void OnMenuWndLog();
-	afx_msg void OnUpdateMenuWndLog(CCmdUI* pCmdUI);
+	//afx_msg void OnMenuWndLog();
+	//afx_msg void OnUpdateMenuWndLog(CCmdUI* pCmdUI);
+	//afx_msg void OnMenuWndAlarm();
+	//afx_msg void OnUpdateMenuWndAlarm(CCmdUI* pCmdUI);
 	afx_msg void OnMenuFileExit();
 	afx_msg void OnUpdateMenuFileExit(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 OnMenuHelpAbout();
+	afx_msg void OnTimer(UINT_PTR nIDEvent);
+	//afx_msg void OnBnClickedButtonAlarm();
+	afx_msg LRESULT OnPanelResize(WPARAM wParam, LPARAM lParam);
+	afx_msg void OnTabSelChanged(NMHDR* nmhdr, LRESULT* result);
 };

--
Gitblit v1.9.3