From 7c35ff8d9a626f69a8a8b7de3d73dc9d73de9dd7 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期六, 13 九月 2025 10:51:32 +0800
Subject: [PATCH] 1. 解决读取报警文件错误的问题，提高兼容性（可能文件是在MacOS编辑的，导致换行符不一样）

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

diff --git a/SourceCode/Bond/Servo/ServoDlg.h b/SourceCode/Bond/Servo/ServoDlg.h
index ee43ac3..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"
@@ -16,6 +17,7 @@
 #include "TopToolbar.h"
 #include "CMyStatusbar.h"
 #include "CRobotTaskDlg.h"
+#include "CPageGlassList.h"
 
 
 // CServoDlg 对话框
@@ -33,6 +35,7 @@
 	void InitRxWindows();
 	void Resize();
 	void ShowChildPage(int index);
+	void UpdateLoginStatus();
 	CString& GetRuntimeFormatText(CString& strText, const char* pszSuffix);
 
 private:
@@ -41,9 +44,11 @@
 	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
@@ -87,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