From da96e6da0b677c6a4e96308aaecd3d619a8e4db2 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期四, 26 六月 2025 08:46:11 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang

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

diff --git a/SourceCode/Bond/Servo/ServoDlg.h b/SourceCode/Bond/Servo/ServoDlg.h
index b38bd30..454d778 100644
--- a/SourceCode/Bond/Servo/ServoDlg.h
+++ b/SourceCode/Bond/Servo/ServoDlg.h
@@ -6,6 +6,7 @@
 #include "BlButton.h"
 #include "PageLog.h"
 #include "PageAlarm.h"
+#include "PageTransferLog.h"
 #include "PageRecipe.h"
 #include "TerminalDisplayDlg.h"
 #include "CPanelMaster.h"
@@ -14,6 +15,8 @@
 #include "CPageGraph1.h"
 #include "CPageGraph2.h"
 #include "TopToolbar.h"
+#include "CMyStatusbar.h"
+#include "CRobotTaskDlg.h"
 
 
 // CServoDlg 对话框
@@ -31,17 +34,19 @@
 	void InitRxWindows();
 	void Resize();
 	void ShowChildPage(int index);
-
+	void UpdateLoginStatus();
+	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;
-
+	CPageTransferLog* m_pPageTransferLog;
 
 // 对话框数据
 #ifdef AFX_DESIGN_TIME
@@ -61,6 +66,7 @@
 	CPanelMaster* m_pPanelMaster;
 	CPanelEquipment* m_pPanelEquipment;
 	CPanelAttributes* m_pPanelAttributes;
+	CMyStatusbar* m_pMyStatusbar;
 
 	// 生成的消息映射函数
 	virtual BOOL OnInitDialog();
@@ -93,4 +99,5 @@
 	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