From a351ed8a97a72bddfb281d2aa350a5c42a7f81a5 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期四, 16 十月 2025 17:40:49 +0800
Subject: [PATCH] 1.添加客户端列表显示；

---
 SourceCode/Bond/Servo/Servo.vcxproj      |    2 
 SourceCode/Bond/Servo/resource.h         |    0 
 SourceCode/Bond/Servo/ClientListDlg.cpp  |  141 ++++++++++++++++++++
 SourceCode/Bond/Servo/Servo.vcxproj.user |    2 
 SourceCode/Bond/Servo/ClientListDlg.h    |   47 ++++++
 SourceCode/Bond/Servo/Servo.rc           |    0 
 SourceCode/Bond/Servo/CMaster.h          |   25 ++-
 SourceCode/Bond/Servo/ServoDlg.cpp       |  140 +++++++++++---------
 SourceCode/Bond/Servo/ServoDlg.h         |   20 +-
 9 files changed, 293 insertions(+), 84 deletions(-)

diff --git a/SourceCode/Bond/Servo/CMaster.h b/SourceCode/Bond/Servo/CMaster.h
index 21b68d6..e2844bd 100644
--- a/SourceCode/Bond/Servo/CMaster.h
+++ b/SourceCode/Bond/Servo/CMaster.h
@@ -1,4 +1,4 @@
-#pragma once
+锘�#pragma once
 #include <list>
 #include "CEquipment.h"
 #include "CEFEM.h"
@@ -171,7 +171,7 @@
             CEquipment* pTarEq, int nTarSlot, int armNo = 1);
 
     public:
-        // —— IResourceView 覆写 ——（注意 const）
+        // 鈥斺�� IResourceView 瑕嗗啓 鈥斺�旓紙娉ㄦ剰 const锛�
         bool isProcessJobsEmpty() const override;
         bool recipeExists(const std::string& ppid) const override;
         bool carrierPresent(const std::string& carrierId) const override;
@@ -183,7 +183,7 @@
         std::string& getLastErrorText();
 
     public:
-        // 新增函数
+        // 鏂板鍑芥暟
         CProcessJob* acquireNextProcessJob();
         CGlass* acquireNextGlass();
         int acquireGlassToQueue();
@@ -199,6 +199,9 @@
         bool canCreateControlJob();
         bool canCompleteControlJob();
         bool canDeleteControlJob();
+        
+        // DAQ Bridge閻╃鍙�
+        Collector* getCollector() const { return m_pCollector; }
 
     private:
         CRITICAL_SECTION m_criticalSection;
@@ -211,42 +214,42 @@
         bool m_bBatch;
 
     private:
-        /* 监控比特位的线程*/
+        /* 鐩戞帶姣旂壒浣嶇殑绾跨▼*/
         HANDLE m_hEventReadBitsThreadExit[2];
         HANDLE m_hReadBitsThreadHandle;
         unsigned m_nReadBitsThreadAddr;
 
-        // 调度线程
+        // 璋冨害绾跨▼
         HANDLE m_hDispatchEvent;
         HANDLE m_hEventDispatchThreadExit[2];
         HANDLE m_hDispatchThreadHandle;
         unsigned m_nDispatchThreadAddr;
 
-        // 启动时间，运行时间，状态
+        // 鍚姩鏃堕棿锛岃繍琛屾椂闂达紝鐘舵��
         ULONGLONG m_ullStartTime;
         ULONGLONG m_ullRunTime;
         MASTERSTATE m_state;
 
-        // 当前任务和已完成任务列表
+        // 褰撳墠浠诲姟鍜屽凡瀹屾垚浠诲姟鍒楄〃
         CRobotTask* m_pActiveRobotTask;
         std::list< CRobotTask* > m_listTask;
 
-        // 错误代码
+        // 閿欒浠ｇ爜
         int m_nLastError;
         std::string m_strLastError;
 
-        // 在开始工艺前是否先需要先比较map
+        // 鍦ㄥ紑濮嬪伐鑹哄墠鏄惁鍏堥渶瑕佸厛姣旇緝map
         BOOL m_isCompareMapsBeforeProceeding;
         BOOL m_bJobMode;
 
 
-        // 千传圈数计数
+        // 鍗冧紶鍦堟暟璁℃暟
         int m_nContinuousTransferCount;
         int m_nContinuousTransferStep;
         int m_nContinuousWorkingPort;
         int m_nContinuousWorkingSlot;
 
-        // 新增已经开始处理的ProcessJob列表
+        // 鏂板宸茬粡寮�濮嬪鐞嗙殑ProcessJob鍒楄〃
         std::vector<CProcessJob*> m_inProcesJobs;
         std::vector<CProcessJob*> m_completeProcessJobs;
         std::vector<CGlass*> m_queueGlasses;
diff --git a/SourceCode/Bond/Servo/ClientListDlg.cpp b/SourceCode/Bond/Servo/ClientListDlg.cpp
new file mode 100644
index 0000000..500062e
--- /dev/null
+++ b/SourceCode/Bond/Servo/ClientListDlg.cpp
@@ -0,0 +1,141 @@
+锘�#include "stdafx.h"
+#include "ClientListDlg.h"
+#include "afxdialogex.h"
+#include "../DAQBridge/core/Collector.h"
+#include "CMaster.h"
+#include "Model.h"
+#include "Servo.h"
+#include <chrono>
+#include <iomanip>
+#include <sstream>
+
+// CClientListDlg 瀵硅瘽妗�
+
+IMPLEMENT_DYNAMIC(CClientListDlg, CDialogEx)
+
+CClientListDlg::CClientListDlg(CWnd* pParent /*=nullptr*/)
+	: CDialogEx(IDD_DIALOG_CLIENT_LIST, pParent)
+{
+}
+
+CClientListDlg::~CClientListDlg()
+{
+}
+
+void CClientListDlg::DoDataExchange(CDataExchange* pDX)
+{
+	CDialogEx::DoDataExchange(pDX);
+	DDX_Control(pDX, IDC_LIST_CLIENTS, m_listClients);
+}
+
+BEGIN_MESSAGE_MAP(CClientListDlg, CDialogEx)
+	ON_BN_CLICKED(IDC_BUTTON_REFRESH, &CClientListDlg::OnBnClickedRefresh)
+	ON_WM_SYSCOMMAND()
+END_MESSAGE_MAP()
+
+// CClientListDlg 娑堟伅澶勭悊绋嬪簭
+
+BOOL CClientListDlg::OnInitDialog()
+{
+	CDialogEx::OnInitDialog();
+
+	// 鍒濆鍖栧垪琛ㄦ帶浠�
+	m_listClients.SetExtendedStyle(LVS_EX_FULLROWSELECT | LVS_EX_GRIDLINES | LVS_EX_HEADERDRAGDROP);
+	
+	// 娣诲姞鍒�
+	m_listClients.InsertColumn(0, _T("IP鍦板潃"), LVCFMT_LEFT, 120);
+	m_listClients.InsertColumn(1, _T("绔彛"), LVCFMT_CENTER, 80);
+	m_listClients.InsertColumn(2, _T("鐗堟湰鐘舵��"), LVCFMT_CENTER, 100);
+	m_listClients.InsertColumn(3, _T("杩炴帴鐘舵��"), LVCFMT_CENTER, 100);
+	m_listClients.InsertColumn(4, _T("杩炴帴鏃堕棿"), LVCFMT_LEFT, 150);
+
+	// 鍒锋柊瀹㈡埛绔垪琛�
+	RefreshClientList();
+
+	return TRUE;  // 闄ら潪灏嗙劍鐐硅缃埌鎺т欢锛屽惁鍒欒繑鍥� TRUE
+}
+
+void CClientListDlg::OnBnClickedRefresh()
+{
+	RefreshClientList();
+}
+
+void CClientListDlg::OnSysCommand(UINT nID, LPARAM lParam)
+{
+	if (nID == SC_CLOSE)
+	{
+		CDialogEx::OnCancel();
+		return;
+	}
+	CDialogEx::OnSysCommand(nID, lParam);
+}
+
+void CClientListDlg::RefreshClientList()
+{
+	// 娓呯┖褰撳墠鍒楄〃
+	m_listClients.DeleteAllItems();
+	m_clients.clear();
+
+	// 鑾峰彇Collector瀹炰緥
+	extern CServoApp theApp;
+	SERVO::CMaster& master = theApp.m_model.getMaster();
+	Collector* pCollector = master.getCollector();
+	
+	if (pCollector)
+	{
+		// 鑾峰彇鐪熷疄鐨勫鎴风鍒楄〃
+		auto clientSummaries = pCollector->getClientList();
+		
+		// 杞崲鏁版嵁鏍煎紡
+		for (const auto& summary : clientSummaries)
+		{
+			ClientInfo client;
+			client.ip = summary.ip;
+			client.port = summary.port;
+			client.versionOk = summary.versionOk;
+			client.status = summary.versionOk ? "宸茶繛鎺�" : "鐗堟湰涓嶅尮閰�";
+			
+			// 鑾峰彇褰撳墠鏃堕棿浣滀负杩炴帴鏃堕棿锛堝疄闄呭疄鐜颁腑搴旇浠嶤ollector鑾峰彇鐪熷疄杩炴帴鏃堕棿锛�
+			auto now = std::chrono::system_clock::now();
+			auto time_t = std::chrono::system_clock::to_time_t(now);
+			std::tm tm;
+			localtime_s(&tm, &time_t);
+			
+			std::ostringstream oss;
+			oss << std::put_time(&tm, "%Y-%m-%d %H:%M:%S");
+			client.connectTime = oss.str();
+			
+			m_clients.push_back(client);
+		}
+	}
+	else
+	{
+		// 濡傛灉鏃犳硶鑾峰彇Collector瀹炰緥锛屾樉绀烘彁绀轰俊鎭�
+		ClientInfo noData;
+		noData.ip = "鏃犳硶鑾峰彇鏁版嵁";
+		noData.port = 0;
+		noData.versionOk = false;
+		noData.status = "Collector鏈垵濮嬪寲";
+		noData.connectTime = "";
+		m_clients.push_back(noData);
+	}
+
+	// 鏇存柊鍒楄〃鏄剧ず
+	UpdateClientList(m_clients);
+}
+
+void CClientListDlg::UpdateClientList(const std::vector<ClientInfo>& clients)
+{
+	m_listClients.DeleteAllItems();
+
+	for (size_t i = 0; i < clients.size(); ++i)
+	{
+		const ClientInfo& client = clients[i];
+		
+		int nItem = m_listClients.InsertItem(i, CString(client.ip.c_str()));
+		m_listClients.SetItemText(nItem, 1, CString(std::to_string(client.port).c_str()));
+		m_listClients.SetItemText(nItem, 2, client.versionOk ? _T("姝ｅ父") : _T("寮傚父"));
+		m_listClients.SetItemText(nItem, 3, CString(client.status.c_str()));
+		m_listClients.SetItemText(nItem, 4, CString(client.connectTime.c_str()));
+	}
+}
diff --git a/SourceCode/Bond/Servo/ClientListDlg.h b/SourceCode/Bond/Servo/ClientListDlg.h
new file mode 100644
index 0000000..106ede1
--- /dev/null
+++ b/SourceCode/Bond/Servo/ClientListDlg.h
@@ -0,0 +1,47 @@
+锘�#pragma once
+#include "afxwin.h"
+#include <vector>
+#include <string>
+
+// 瀹㈡埛绔俊鎭粨鏋�
+struct ClientInfo {
+	std::string ip;
+	uint16_t port;
+	bool versionOk;
+	std::string status;
+	std::string connectTime;
+};
+
+// CClientListDlg 瀵硅瘽妗�
+
+class CClientListDlg : public CDialogEx
+{
+	DECLARE_DYNAMIC(CClientListDlg)
+
+public:
+	CClientListDlg(CWnd* pParent = nullptr);   // 鏍囧噯鏋勯�犲嚱鏁�
+	virtual ~CClientListDlg();
+
+// 瀵硅瘽妗嗘暟鎹�
+#ifdef AFX_DESIGN_TIME
+	enum { IDD = IDD_DIALOG_CLIENT_LIST };
+#endif
+
+protected:
+	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV 鏀寔
+
+	DECLARE_MESSAGE_MAP()
+
+public:
+	virtual BOOL OnInitDialog();
+	afx_msg void OnBnClickedRefresh();
+	afx_msg void OnSysCommand(UINT nID, LPARAM lParam);
+
+private:
+	void RefreshClientList();
+	void UpdateClientList(const std::vector<ClientInfo>& clients);
+
+private:
+	CListCtrl m_listClients;
+	std::vector<ClientInfo> m_clients;
+};
diff --git a/SourceCode/Bond/Servo/Servo.rc b/SourceCode/Bond/Servo/Servo.rc
index cb770d0..f3f35d6 100644
--- a/SourceCode/Bond/Servo/Servo.rc
+++ b/SourceCode/Bond/Servo/Servo.rc
Binary files differ
diff --git a/SourceCode/Bond/Servo/Servo.vcxproj b/SourceCode/Bond/Servo/Servo.vcxproj
index 0b003ae..2e09825 100644
--- a/SourceCode/Bond/Servo/Servo.vcxproj
+++ b/SourceCode/Bond/Servo/Servo.vcxproj
@@ -237,6 +237,7 @@
     <ClInclude Include="CExpandableListCtrl.h" />
     <ClInclude Include="CGlassPool.h" />
     <ClInclude Include="ChangePasswordDlg.h" />
+    <ClInclude Include="ClientListDlg.h" />
     <ClInclude Include="CMyStatusbar.h" />
     <ClInclude Include="CPageCollectionEvent.h" />
     <ClInclude Include="CPageGlassList.h" />
@@ -449,6 +450,7 @@
     <ClCompile Include="CExpandableListCtrl.cpp" />
     <ClCompile Include="CGlassPool.cpp" />
     <ClCompile Include="ChangePasswordDlg.cpp" />
+    <ClCompile Include="ClientListDlg.cpp" />
     <ClCompile Include="CMyStatusbar.cpp" />
     <ClCompile Include="CPageCollectionEvent.cpp" />
     <ClCompile Include="CPageGlassList.cpp" />
diff --git a/SourceCode/Bond/Servo/Servo.vcxproj.user b/SourceCode/Bond/Servo/Servo.vcxproj.user
index 0c03257..82c7903 100644
--- a/SourceCode/Bond/Servo/Servo.vcxproj.user
+++ b/SourceCode/Bond/Servo/Servo.vcxproj.user
@@ -7,6 +7,6 @@
     <RemoteDebuggerCommand>\\DESKTOP-IODBVIQ\Servo\Debug\Servo.exe</RemoteDebuggerCommand>
     <RemoteDebuggerWorkingDirectory>\\DESKTOP-IODBVIQ\Servo\Debug\</RemoteDebuggerWorkingDirectory>
     <RemoteDebuggerServerName>DESKTOP-IODBVIQ</RemoteDebuggerServerName>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+    <DebuggerFlavor>WindowsRemoteDebugger</DebuggerFlavor>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/SourceCode/Bond/Servo/ServoDlg.cpp b/SourceCode/Bond/Servo/ServoDlg.cpp
index 69ff046..5dac166 100644
--- a/SourceCode/Bond/Servo/ServoDlg.cpp
+++ b/SourceCode/Bond/Servo/ServoDlg.cpp
@@ -1,5 +1,5 @@
-
-// ServoDlg.cpp : 实现文件
+锘�
+// ServoDlg.cpp : 瀹炵幇鏂囦欢
 //
 
 #include "stdafx.h"
@@ -28,6 +28,7 @@
 #include "CPageCollectionEvent.h"
 #include "CControlJobDlg.h"
 #include "InputDialog.h"
+#include "ClientListDlg.h"
 #include "CControlJobManagerDlg.h"
 
 
@@ -36,32 +37,32 @@
 #endif
 
 
-/* 创建终端的定时器 */
+/* 鍒涘缓缁堢鐨勫畾鏃跺櫒 */
 #define TIMER_ID_CREATE_TERMINAL		1
 
-/* 运行时间定时器 */
+/* 杩愯鏃堕棿瀹氭椂鍣� */
 #define TIMER_ID_UPDATE_RUMTIME			2
 
 /* Test */
 #define TIMER_ID_TEST					3
 
 
-// 用于应用程序“关于”菜单项的 CAboutDlg 对话框
+// 鐢ㄤ簬搴旂敤绋嬪簭鈥滃叧浜庘�濊彍鍗曢」鐨� CAboutDlg 瀵硅瘽妗�
 
 class CAboutDlg : public CDialogEx
 {
 public:
 	CAboutDlg();
 
-// 对话框数据
+// 瀵硅瘽妗嗘暟鎹�
 #ifdef AFX_DESIGN_TIME
 	enum { IDD = IDD_ABOUTBOX };
 #endif
 
 	protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV 支持
+	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV 鏀寔
 
-// 实现
+// 瀹炵幇
 protected:
 	DECLARE_MESSAGE_MAP()
 };
@@ -79,7 +80,7 @@
 END_MESSAGE_MAP()
 
 
-// CServoDlg 对话框
+// CServoDlg 瀵硅瘽妗�
 
 
 CServoDlg::CServoDlg(CWnd* pParent /*=NULL*/)
@@ -134,6 +135,8 @@
 	ON_UPDATE_COMMAND_UI(ID_MENU_TEST_MESSAGE_SET, &CServoDlg::OnUpdateMenuTestMessageSet)
 	ON_COMMAND(ID_MENU_TEST_MESSAGE_CLEAR, &CServoDlg::OnMenuTestMessageClear)
 	ON_UPDATE_COMMAND_UI(ID_MENU_TEST_MESSAGE_CLEAR, &CServoDlg::OnUpdateMenuTestMessageClear)
+	ON_COMMAND(ID_MENU_TOOLS_CLIENT_LIST, &CServoDlg::OnMenuToolsClientList)
+	ON_UPDATE_COMMAND_UI(ID_MENU_TOOLS_CLIENT_LIST, &CServoDlg::OnUpdateMenuToolsClientList)
 	ON_COMMAND(ID_MENU_HELP_ABOUT, &CServoDlg::OnMenuHelpAbout)
 	ON_WM_INITMENUPOPUP()
 	ON_WM_TIMER()
@@ -144,12 +147,12 @@
 END_MESSAGE_MAP()
 
 
-// CServoDlg 消息处理程序
+// CServoDlg 娑堟伅澶勭悊绋嬪簭
 
 void CServoDlg::InitRxWindows()
 {
 	/* code */
-	// 订阅数据
+	// 璁㈤槄鏁版嵁
 	IRxWindows* pRxWindows = RX_GetRxWindows();
 	pRxWindows->enableLog(5);
 	if (m_pObserver == NULL) {
@@ -208,7 +211,7 @@
 				else if (state == SERVO::MASTERSTATE::STARTING) {
 					m_pMyStatusbar->setBackgroundColor(STATUSBAR_BK_STARTING);
 					m_pMyStatusbar->setForegroundColor(RGB(0, 0, 0));
-					m_pMyStatusbar->setRunTimeText("正在启动...");
+					m_pMyStatusbar->setRunTimeText("姝ｅ湪鍚姩...");
 				}
 				else if (state == SERVO::MASTERSTATE::MSERROR) {
 					m_pTopToolbar->GetBtn(IDC_BUTTON_RUN)->EnableWindow(TRUE);
@@ -217,7 +220,7 @@
 					m_pTopToolbar->GetBtn(IDC_BUTTON_STOP)->EnableWindow(FALSE);
 					m_pMyStatusbar->setBackgroundColor(STATUSBAR_BK_ALARM);
 					m_pMyStatusbar->setForegroundColor(RGB(0, 0, 0));
-					m_pMyStatusbar->setRunTimeText("启动失败.");
+					m_pMyStatusbar->setRunTimeText("鍚姩澶辫触.");
 					m_pTopToolbar->GetBtn(IDC_BUTTON_ALARM)->EnableWindow(TRUE);
 					KillTimer(TIMER_ID_UPDATE_RUMTIME);
 				}
@@ -230,7 +233,7 @@
 					m_pMyStatusbar->setForegroundColor(RGB(0, 0, 0));
 					m_pMyStatusbar->setRunTimeText(theApp.m_model.getMaster().getLastErrorText().c_str());
 					if (theApp.m_model.getMaster().getLastError() == ER_CODE_AOI_NG) {
-						AfxMessageBox(_T("AOI检测失败，请操作员介入解决问题！"));
+						AfxMessageBox(_T("AOI妫�娴嬪け璐ワ紝璇锋搷浣滃憳浠嬪叆瑙ｅ喅闂锛�"));
 					}
 					m_pTopToolbar->GetBtn(IDC_BUTTON_ALARM)->EnableWindow(TRUE);
 					KillTimer(TIMER_ID_UPDATE_RUMTIME);
@@ -274,13 +277,13 @@
 						}
 					}
 					else if (exCode == ROBOT_EVENT_FINISH) {
-						m_pMyStatusbar->setCurTaskBtnText("无");
+						m_pMyStatusbar->setCurTaskBtnText("鏃�");
 					}
 					else if (exCode == ROBOT_EVENT_ABORT) {
-						m_pMyStatusbar->setCurTaskBtnText("无");
+						m_pMyStatusbar->setCurTaskBtnText("鏃�");
 					}
 					else if (exCode == ROBOT_EVENT_RESTORE) {
-						m_pMyStatusbar->setCurTaskBtnText("无");
+						m_pMyStatusbar->setCurTaskBtnText("鏃�");
 					}
 				}
 			}
@@ -330,9 +333,9 @@
 {
 	CDialogEx::OnInitDialog();
 
-	// 将“关于...”菜单项添加到系统菜单中。
+	// 灏嗏�滃叧浜�...鈥濊彍鍗曢」娣诲姞鍒扮郴缁熻彍鍗曚腑銆�
 
-	// IDM_ABOUTBOX 必须在系统命令范围内。
+	// IDM_ABOUTBOX 蹇呴』鍦ㄧ郴缁熷懡浠よ寖鍥村唴銆�
 	ASSERT((IDM_ABOUTBOX & 0xFFF0) == IDM_ABOUTBOX);
 	ASSERT(IDM_ABOUTBOX < 0xF000);
 
@@ -350,17 +353,17 @@
 		}
 	}
 
-	// 设置此对话框的图标。  当应用程序主窗口不是对话框时，框架将自动
-	//  执行此操作
-	SetIcon(m_hIcon, TRUE);			// 设置大图标
-	SetIcon(m_hIcon, FALSE);		// 设置小图标
+	// 璁剧疆姝ゅ璇濇鐨勫浘鏍囥��  褰撳簲鐢ㄧ▼搴忎富绐楀彛涓嶆槸瀵硅瘽妗嗘椂锛屾鏋跺皢鑷姩
+	//  鎵ц姝ゆ搷浣�
+	SetIcon(m_hIcon, TRUE);			// 璁剧疆澶у浘鏍�
+	SetIcon(m_hIcon, FALSE);		// 璁剧疆灏忓浘鏍�
 
 
 	// model init
 	theApp.m_model.init();
 	SetTimer(TIMER_ID_TEST, 1000, nullptr);
 
-	// 菜单
+	// 鑿滃崟
 	CMenu menu;
 	menu.LoadMenu(IDR_MENU_APP);
 	SetMenu(&menu);
@@ -397,13 +400,13 @@
 	CHmTab* m_pTab = CHmTab::Hook(GetDlgItem(IDC_TAB1)->m_hWnd);
 	m_pTab->SetPaddingLeft(20);
 	m_pTab->SetItemMarginLeft(18);
-	m_pTab->AddItem("状态图", FALSE);
-	m_pTab->AddItem("连接图", TRUE);
+	m_pTab->AddItem("鐘舵�佸浘", FALSE);
+	m_pTab->AddItem("杩炴帴鍥�", TRUE);
 	m_pTab->AddItem("Glass", TRUE);
-	m_pTab->AddItem("配方", TRUE);
-	m_pTab->AddItem("报警", TRUE);
-	m_pTab->AddItem("日志", TRUE);
-	m_pTab->AddItem("搬运任务", TRUE);
+	m_pTab->AddItem("閰嶆柟", TRUE);
+	m_pTab->AddItem("鎶ヨ", TRUE);
+	m_pTab->AddItem("鏃ュ織", TRUE);
+	m_pTab->AddItem("鎼繍浠诲姟", TRUE);
 	m_pTab->SetCurSel(0);
 	m_pTab->SetBkgndColor(RGB(222, 222, 222));
 	ShowChildPage(0);
@@ -425,7 +428,7 @@
 
 
 
-	// 调整初始窗口位置
+	// 璋冩暣鍒濆绐楀彛浣嶇疆
 	CRect rcWnd;
 	GetWindowRect(&rcWnd);
 	int width = GetSystemMetrics(SM_CXSCREEN);
@@ -439,22 +442,22 @@
 	Resize();
 
 
-	// 相当于延时调用master的初始化
+	// 鐩稿綋浜庡欢鏃惰皟鐢╩aster鐨勫垵濮嬪寲
 	theApp.m_model.m_master.init();
 	theApp.m_model.loadPortParams();
 
 
-	// 初始化master以后需要控件绑定数据
+	// 鍒濆鍖杕aster浠ュ悗闇�瑕佹帶浠剁粦瀹氭暟鎹�
 	m_pPageGraph1->BindEquipmentToGraph();
 
 
-	// 更新登录状态
+	// 鏇存柊鐧诲綍鐘舵��
 	UpdateLoginStatus();
-	//SystemLogManager::getInstance.log(SystemLogManager::LogType::Info, _T("BondEq启动..."));
+	//SystemLogManager::getInstance.log(SystemLogManager::LogType::Info, _T("BondEq鍚姩..."));
 	//SystemLogManager::getInstance.
 
 
-	return TRUE;  // 除非将焦点设置到控件，否则返回 TRUE
+	return TRUE;  // 闄ら潪灏嗙劍鐐硅缃埌鎺т欢锛屽惁鍒欒繑鍥� TRUE
 }
 
 void CServoDlg::OnSysCommand(UINT nID, LPARAM lParam)
@@ -470,19 +473,19 @@
 	}
 }
 
-// 如果向对话框添加最小化按钮，则需要下面的代码
-//  来绘制该图标。  对于使用文档/视图模型的 MFC 应用程序，
-//  这将由框架自动完成。
+// 濡傛灉鍚戝璇濇娣诲姞鏈�灏忓寲鎸夐挳锛屽垯闇�瑕佷笅闈㈢殑浠ｇ爜
+//  鏉ョ粯鍒惰鍥炬爣銆�  瀵逛簬浣跨敤鏂囨。/瑙嗗浘妯″瀷鐨� MFC 搴旂敤绋嬪簭锛�
+//  杩欏皢鐢辨鏋惰嚜鍔ㄥ畬鎴愩��
 
 void CServoDlg::OnPaint()
 {
 	if (IsIconic())
 	{
-		CPaintDC dc(this); // 用于绘制的设备上下文
+		CPaintDC dc(this); // 鐢ㄤ簬缁樺埗鐨勮澶囦笂涓嬫枃
 
 		SendMessage(WM_ICONERASEBKGND, reinterpret_cast<WPARAM>(dc.GetSafeHdc()), 0);
 
-		// 使图标在工作区矩形中居中
+		// 浣垮浘鏍囧湪宸ヤ綔鍖虹煩褰腑灞呬腑
 		int cxIcon = GetSystemMetrics(SM_CXICON);
 		int cyIcon = GetSystemMetrics(SM_CYICON);
 		CRect rect;
@@ -490,7 +493,7 @@
 		int x = (rect.Width() - cxIcon + 1) / 2;
 		int y = (rect.Height() - cyIcon + 1) / 2;
 
-		// 绘制图标
+		// 缁樺埗鍥炬爣
 		dc.DrawIcon(x, y, m_hIcon);
 	}
 	else
@@ -499,8 +502,8 @@
 	}
 }
 
-//当用户拖动最小化窗口时系统调用此函数取得光标
-//显示。
+//褰撶敤鎴锋嫋鍔ㄦ渶灏忓寲绐楀彛鏃剁郴缁熻皟鐢ㄦ鍑芥暟鍙栧緱鍏夋爣
+//鏄剧ず銆�
 HCURSOR CServoDlg::OnQueryDragIcon()
 {
 	return static_cast<HCURSOR>(m_hIcon);
@@ -660,6 +663,17 @@
 	pCmdUI->Enable(TRUE);
 }
 
+void CServoDlg::OnMenuToolsClientList()
+{
+	CClientListDlg dlg;
+	dlg.DoModal();
+}
+
+void CServoDlg::OnUpdateMenuToolsClientList(CCmdUI* pCmdUI)
+{
+	pCmdUI->Enable(TRUE);
+}
+
 void CServoDlg::OnMenuHelpAbout()
 {
 	theApp.m_model.getMaster().test();
@@ -669,14 +683,14 @@
 
 void CServoDlg::OnBnClickedOk()
 {
-	// TODO: 在此添加控件通知处理程序代码
+	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
 	CDialogEx::OnOK();
 }
 
 
 void CServoDlg::OnBnClickedCancel()
 {
-	// TODO: 在此添加控件通知处理程序代码
+	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
 	CDialogEx::OnCancel();
 }
 
@@ -870,7 +884,7 @@
 
 void CServoDlg::OnClose()
 {
-	// TODO: 在此添加消息处理程序代码和/或调用默认值
+	// TODO: 鍦ㄦ娣诲姞娑堟伅澶勭悊绋嬪簭浠ｇ爜鍜�/鎴栬皟鐢ㄩ粯璁ゅ��
 
 	CDialogEx::OnClose();
 }
@@ -895,7 +909,7 @@
 void CServoDlg::OnTimer(UINT_PTR nIDEvent)
 {
 	if (TIMER_ID_CREATE_TERMINAL == nIDEvent) {
-		// 预先创建终端窗口
+		// 棰勫厛鍒涘缓缁堢绐楀彛
 		KillTimer(TIMER_ID_CREATE_TERMINAL);
 		char szBuffer[MAX_PATH];
 		sprintf_s(szBuffer, MAX_PATH, "%s\\RES\\TeminalMsg.html", (LPTSTR)(LPCTSTR)theApp.m_strAppDir);
@@ -982,7 +996,7 @@
 		::EnableMenuItem(hMenu, ID_OPEATOR_SWITCH, MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
 		::EnableMenuItem(hMenu, ID_OPERATOR_LOGOUT, MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
 
-		m_pTopToolbar->SetOperatorBtnText(_T("未登录"));
+		m_pTopToolbar->SetOperatorBtnText(_T("鏈櫥褰�"));
 	}
 }
 
@@ -992,14 +1006,14 @@
 	if (id == IDC_BUTTON_RUN || id == IDC_BUTTON_STOP) {
 		UserRole emRole = UserManager::getInstance().getCurrentUserRole();
 		if (emRole != UserRole::SuperAdmin) {
-			AfxMessageBox(_T("当前用户并非管理员！！！")); 
+			AfxMessageBox(_T("褰撳墠鐢ㄦ埛骞堕潪绠＄悊鍛橈紒锛侊紒")); 
 			return 1;
 		}
 	}
 
 	if (id == IDC_BUTTON_RUN) {
 		if (theApp.m_model.getMaster().getState() == SERVO::MASTERSTATE::MSERROR) {
-			AfxMessageBox("当前有机台发生错误，不能启动，请确认解决问题后再尝试重新启动！");
+			AfxMessageBox("褰撳墠鏈夋満鍙板彂鐢熼敊璇紝涓嶈兘鍚姩锛岃纭瑙ｅ喅闂鍚庡啀灏濊瘯閲嶆柊鍚姩锛�");
 		}
 		else {
 			if (theApp.m_model.getMaster().start() == 0) {
@@ -1011,7 +1025,7 @@
 	}
 	else if (id == IDC_BUTTON_RUN_BATCH) {
 		if (theApp.m_model.getMaster().getState() == SERVO::MASTERSTATE::MSERROR) {
-			AfxMessageBox("当前有机台发生错误，不能启动，请确认解决问题后再尝试重新启动！");
+			AfxMessageBox("褰撳墠鏈夋満鍙板彂鐢熼敊璇紝涓嶈兘鍚姩锛岃纭瑙ｅ喅闂鍚庡啀灏濊瘯閲嶆柊鍚姩锛�");
 		}
 		else {
 			if (theApp.m_model.getMaster().startBatch() == 0) {
@@ -1023,7 +1037,7 @@
 	}
 	else if (id == IDC_BUTTON_RUN_CT) {
 		if (theApp.m_model.getMaster().getState() == SERVO::MASTERSTATE::MSERROR) {
-			AfxMessageBox("当前有机台发生错误，不能启动，请确认解决问题后再尝试重新启动！");
+			AfxMessageBox("褰撳墠鏈夋満鍙板彂鐢熼敊璇紝涓嶈兘鍚姩锛岃纭瑙ｅ喅闂鍚庡啀灏濊瘯閲嶆柊鍚姩锛�");
 		}
 		else {
 			if (theApp.m_model.getMaster().startContinuousTransfer() == 0) {
@@ -1082,7 +1096,7 @@
 		else if (2 == menuId) {
 			CUserManagerDlg dlg;
 			if (dlg.DoModal() != IDOK) {
-				logManager.log(SystemLogManager::LogType::Operation, _T("用户管理的预操作被取消！"));
+				logManager.log(SystemLogManager::LogType::Operation, _T("鐢ㄦ埛绠＄悊鐨勯鎿嶄綔琚彇娑堬紒"));
 			}
 		}
 		else if (3 == menuId) {
@@ -1090,14 +1104,14 @@
 			dlg.DoModal();
 		}
 		else if (4 == menuId) {
-			int ret = AfxMessageBox(_T("是否切换用户？切换用户会退出当前账号！"), MB_OKCANCEL | MB_ICONEXCLAMATION);
+			int ret = AfxMessageBox(_T("鏄惁鍒囨崲鐢ㄦ埛锛熷垏鎹㈢敤鎴蜂細閫�鍑哄綋鍓嶈处鍙凤紒"), MB_OKCANCEL | MB_ICONEXCLAMATION);
 			if (ret != IDOK) {
 				return 0;
 			}
 
-			logManager.log(SystemLogManager::LogType::Operation, _T("确认切换角色！"));
+			logManager.log(SystemLogManager::LogType::Operation, _T("纭鍒囨崲瑙掕壊锛�"));
 			if (userManager.isLoggedIn()) {
-				logManager.log(SystemLogManager::LogType::Info, _T("退出登录！"));
+				logManager.log(SystemLogManager::LogType::Info, _T("閫�鍑虹櫥褰曪紒"));
 				userManager.logout();
 			}
 
@@ -1106,13 +1120,13 @@
 		}
 		else {
 			CString cstrMessage;
-			cstrMessage.Format(_T("是否退出用户 [%s]？"), userManager.getCurrentUser().c_str());
+			cstrMessage.Format(_T("鏄惁閫�鍑虹敤鎴� [%s]锛�"), userManager.getCurrentUser().c_str());
 			int ret = AfxMessageBox(_T(cstrMessage), MB_OKCANCEL | MB_ICONEXCLAMATION);
 			if (ret != IDOK) {
 				return 0;
 			}
 
-			logManager.log(SystemLogManager::LogType::Info, _T("退出登录！"));
+			logManager.log(SystemLogManager::LogType::Info, _T("閫�鍑虹櫥褰曪紒"));
 			userManager.logout();
 		}
 
@@ -1156,16 +1170,16 @@
 
 	SERVO::MASTERSTATE state = theApp.m_model.getMaster().getState();
 	if (state == SERVO::MASTERSTATE::RUNNING) {
-		strText.Format(_T("正在运行：%02d:%02d:%02d   %s"), h, m, s, pszSuffix);
+		strText.Format(_T("姝ｅ湪杩愯锛�%02d:%02d:%02d   %s"), h, m, s, pszSuffix);
 	}
 	else if (state == SERVO::MASTERSTATE::RUNNING_CONTINUOUS_TRANSFER) {
-		strText.Format(_T("千传模式：%02d:%02d:%02d   %s"), h, m, s, pszSuffix);
+		strText.Format(_T("鍗冧紶妯″紡锛�%02d:%02d:%02d   %s"), h, m, s, pszSuffix);
 	}
 	else if (state == SERVO::MASTERSTATE::RUNNING_BATCH) {
-		strText.Format(_T("JOB模式：%02d:%02d:%02d   %s"), h, m, s, pszSuffix);
+		strText.Format(_T("JOB妯″紡锛�%02d:%02d:%02d   %s"), h, m, s, pszSuffix);
 	}
 	else {
-		strText.Format(_T("已运行：%02d:%02d:%02d   %s"), h, m, s, pszSuffix);
+		strText.Format(_T("宸茶繍琛岋細%02d:%02d:%02d   %s"), h, m, s, pszSuffix);
 	}
 
 	return strText;
diff --git a/SourceCode/Bond/Servo/ServoDlg.h b/SourceCode/Bond/Servo/ServoDlg.h
index b8f6748..bdc47a4 100644
--- a/SourceCode/Bond/Servo/ServoDlg.h
+++ b/SourceCode/Bond/Servo/ServoDlg.h
@@ -1,5 +1,5 @@
-
-// ServoDlg.h : 头文件
+锘�
+// ServoDlg.h : 澶存枃浠�
 //
 
 #pragma once
@@ -20,12 +20,12 @@
 #include "CPageGlassList.h"
 
 
-// CServoDlg 对话框
+// CServoDlg 瀵硅瘽妗�
 class CServoDlg : public CDialogEx
 {
-// 构造
+// 鏋勯��
 public:
-	CServoDlg(CWnd* pParent = NULL);	// 标准构造函数
+	CServoDlg(CWnd* pParent = NULL);	// 鏍囧噯鏋勯�犲嚱鏁�
 
 
 public:
@@ -50,16 +50,16 @@
 	CPageLog*	 m_pPageLog;
 	CPageTransferLog* m_pPageTransferLog;
 
-// 对话框数据
+// 瀵硅瘽妗嗘暟鎹�
 #ifdef AFX_DESIGN_TIME
 	enum { IDD = IDD_SERVO_DIALOG };
 #endif
 
 	protected:
-	virtual void DoDataExchange(CDataExchange* pDX);	// DDX/DDV 支持
+	virtual void DoDataExchange(CDataExchange* pDX);	// DDX/DDV 鏀寔
 
 
-// 实现
+// 瀹炵幇
 protected:
 	HICON m_hIcon;
 	COLORREF m_crBkgnd;
@@ -70,7 +70,7 @@
 	CPanelAttributes* m_pPanelAttributes;
 	CMyStatusbar* m_pMyStatusbar;
 
-	// 生成的消息映射函数
+	// 鐢熸垚鐨勬秷鎭槧灏勫嚱鏁�
 	virtual BOOL OnInitDialog();
 	afx_msg void OnSysCommand(UINT nID, LPARAM lParam);
 	afx_msg void OnPaint();
@@ -98,6 +98,8 @@
 	afx_msg void OnUpdateMenuTestMessageSet(CCmdUI* pCmdUI);
 	afx_msg void OnMenuTestMessageClear();
 	afx_msg void OnUpdateMenuTestMessageClear(CCmdUI* pCmdUI);
+	afx_msg void OnMenuToolsClientList();
+	afx_msg void OnUpdateMenuToolsClientList(CCmdUI* pCmdUI);
 	afx_msg void OnMenuHelpAbout();
 	afx_msg void OnTimer(UINT_PTR nIDEvent);
 	afx_msg LRESULT OnPanelResize(WPARAM wParam, LPARAM lParam);
diff --git a/SourceCode/Bond/Servo/resource.h b/SourceCode/Bond/Servo/resource.h
index 526378a..6c9865f 100644
--- a/SourceCode/Bond/Servo/resource.h
+++ b/SourceCode/Bond/Servo/resource.h
Binary files differ

--
Gitblit v1.9.3