From 6dc80508b1c0f431007f8a8c947c152ec00c3d15 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期一, 08 九月 2025 09:24:05 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang

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

diff --git a/SourceCode/Bond/Servo/ServoDlg.h b/SourceCode/Bond/Servo/ServoDlg.h
index 774cb22..b8f6748 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"
@@ -15,6 +16,8 @@
 #include "CPageGraph2.h"
 #include "TopToolbar.h"
 #include "CMyStatusbar.h"
+#include "CRobotTaskDlg.h"
+#include "CPageGlassList.h"
 
 
 // CServoDlg 对话框
@@ -32,17 +35,20 @@
 	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;
+	CPageGlassList* m_pPageGlassList;
 	CPageRecipe* m_pPageRecipe;
 	CPageAlarm*	 m_pPageAlarm;
 	CPageLog*	 m_pPageLog;
-
+	CPageTransferLog* m_pPageTransferLog;
 
 // 对话框数据
 #ifdef AFX_DESIGN_TIME
@@ -86,6 +92,8 @@
 	afx_msg void OnUpdateMenuFileSecsTest(CCmdUI* pCmdUI);
 	afx_msg void OnMenuFileExit();
 	afx_msg void OnUpdateMenuFileExit(CCmdUI* pCmdUI);
+	afx_msg void OnMenuProjectVarialbleList();
+	afx_msg void OnUpdateMenuProjectVarialbleList(CCmdUI* pCmdUI);
 	afx_msg void OnMenuTestMessageSet();
 	afx_msg void OnUpdateMenuTestMessageSet(CCmdUI* pCmdUI);
 	afx_msg void OnMenuTestMessageClear();
@@ -95,4 +103,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