From 0fb528df2c1f05ef7d52827432bd934ce6f9d8cd Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期五, 12 九月 2025 09:46:59 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang

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

diff --git a/SourceCode/Bond/Servo/ServoDlg.h b/SourceCode/Bond/Servo/ServoDlg.h
index fbf4f05..b8f6748 100644
--- a/SourceCode/Bond/Servo/ServoDlg.h
+++ b/SourceCode/Bond/Servo/ServoDlg.h
@@ -17,6 +17,7 @@
 #include "TopToolbar.h"
 #include "CMyStatusbar.h"
 #include "CRobotTaskDlg.h"
+#include "CPageGlassList.h"
 
 
 // CServoDlg 对话框
@@ -34,6 +35,7 @@
 	void InitRxWindows();
 	void Resize();
 	void ShowChildPage(int index);
+	void UpdateLoginStatus();
 	CString& GetRuntimeFormatText(CString& strText, const char* pszSuffix);
 
 private:
@@ -42,6 +44,7 @@
 	CRobotTaskDlg* m_pRobotTaskDlg;
 	CPageGraph1* m_pPageGraph1;
 	CPageGraph2* m_pPageGraph2;
+	CPageGlassList* m_pPageGlassList;
 	CPageRecipe* m_pPageRecipe;
 	CPageAlarm*	 m_pPageAlarm;
 	CPageLog*	 m_pPageLog;
@@ -89,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();

--
Gitblit v1.9.3