From 0393d1ff2ebc378b3c4cff9b45f72ebc8a4ea516 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期二, 03 六月 2025 15:13:42 +0800
Subject: [PATCH] Merge branch 'master' into liuyang

---
 SourceCode/Bond/Servo/ServoDlg.h |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/SourceCode/Bond/Servo/ServoDlg.h b/SourceCode/Bond/Servo/ServoDlg.h
index 9ff5766..ee43ac3 100644
--- a/SourceCode/Bond/Servo/ServoDlg.h
+++ b/SourceCode/Bond/Servo/ServoDlg.h
@@ -6,12 +6,16 @@
 #include "BlButton.h"
 #include "PageLog.h"
 #include "PageAlarm.h"
+#include "PageRecipe.h"
 #include "TerminalDisplayDlg.h"
 #include "CPanelMaster.h"
 #include "CPanelEquipment.h"
 #include "CPanelAttributes.h"
 #include "CPageGraph1.h"
 #include "CPageGraph2.h"
+#include "TopToolbar.h"
+#include "CMyStatusbar.h"
+#include "CRobotTaskDlg.h"
 
 
 // CServoDlg 对话框
@@ -29,16 +33,17 @@
 	void InitRxWindows();
 	void Resize();
 	void ShowChildPage(int index);
-
+	CString& GetRuntimeFormatText(CString& strText, const char* pszSuffix);
 
 private:
 	IObserver* m_pObserver;
 	CTerminalDisplayDlg* m_pTerminalDisplayDlg;
+	CRobotTaskDlg* m_pRobotTaskDlg;
 	CPageGraph1* m_pPageGraph1;
 	CPageGraph2* m_pPageGraph2;
+	CPageRecipe* m_pPageRecipe;
 	CPageAlarm*	 m_pPageAlarm;
 	CPageLog*	 m_pPageLog;
-
 
 // 对话框数据
 #ifdef AFX_DESIGN_TIME
@@ -54,11 +59,11 @@
 	HICON m_hIcon;
 	COLORREF m_crBkgnd;
 	HBRUSH m_hbrBkgnd;
-	CBlButton m_btnLog;
-	CBlButton m_btnAlarm;
+	CTopToolbar* m_pTopToolbar;
 	CPanelMaster* m_pPanelMaster;
 	CPanelEquipment* m_pPanelEquipment;
 	CPanelAttributes* m_pPanelAttributes;
+	CMyStatusbar* m_pMyStatusbar;
 
 	// 生成的消息映射函数
 	virtual BOOL OnInitDialog();
@@ -90,4 +95,6 @@
 	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);
 };

--
Gitblit v1.9.3