From fcc340fc812ee692f72fa1774c114e6f4d788f5c Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期二, 18 十一月 2025 14:33:14 +0800
Subject: [PATCH] 1.实现用户管理。
---
SourceCode/Bond/Servo/ServoDlg.cpp | 230 ++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 138 insertions(+), 92 deletions(-)
diff --git a/SourceCode/Bond/Servo/ServoDlg.cpp b/SourceCode/Bond/Servo/ServoDlg.cpp
index 10cecb9..5705532 100644
--- a/SourceCode/Bond/Servo/ServoDlg.cpp
+++ b/SourceCode/Bond/Servo/ServoDlg.cpp
@@ -1,5 +1,5 @@
-
-// ServoDlg.cpp : 实现文件
+锘�
+// ServoDlg.cpp : 瀹炵幇鏂囦欢
//
#include "stdafx.h"
@@ -16,6 +16,7 @@
#include "CRobotCmdContainerDlg.h"
#include "CRobotCmdTestDlg.h"
#include "LoginDlg.h"
+#include "LoginDlg2.h"
#include "ChangePasswordDlg.h"
#include "UserManagerDlg.h"
#include "SystemLogManagerDlg.h"
@@ -28,7 +29,10 @@
#include "CPageCollectionEvent.h"
#include "CControlJobDlg.h"
#include "InputDialog.h"
+#include "ClientListDlg.h"
#include "CControlJobManagerDlg.h"
+#include "CUserManager2.h"
+#include "CUserManager2Dlg.h"
#ifdef _DEBUG
@@ -36,32 +40,32 @@
#endif
-/* 创建终端的定时器 */
+/* 鍒涘缓缁堢鐨勫畾鏃跺櫒 */
#define TIMER_ID_CREATE_TERMINAL 1
-/* 运行时间定时器 */
+/* 杩愯鏃堕棿瀹氭椂鍣� */
#define TIMER_ID_UPDATE_RUMTIME 2
/* Test */
-#define TIMER_ID_TEST 3
+#define TIMER_ID_LOGIN 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 +83,7 @@
END_MESSAGE_MAP()
-// CServoDlg 对话框
+// CServoDlg 瀵硅瘽妗�
CServoDlg::CServoDlg(CWnd* pParent /*=NULL*/)
@@ -134,6 +138,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 +150,12 @@
END_MESSAGE_MAP()
-// CServoDlg 消息处理程序
+// CServoDlg 娑堟伅澶勭悊绋嬪簭
void CServoDlg::InitRxWindows()
{
/* code */
- // 订阅数据
+ // 璁㈤槄鏁版嵁
IRxWindows* pRxWindows = RX_GetRxWindows();
pRxWindows->enableLog(5);
if (m_pObserver == NULL) {
@@ -194,7 +200,7 @@
else if (RX_CODE_MASTER_STATE_CHANGED == code) {
SERVO::MASTERSTATE state = theApp.m_model.getMaster().getState();
if (state == SERVO::MASTERSTATE::READY) {
- m_pTopToolbar->GetBtn(IDC_BUTTON_RUN)->EnableWindow(TRUE);
+ m_pTopToolbar ->GetBtn(IDC_BUTTON_RUN)->EnableWindow(TRUE);
m_pTopToolbar->GetBtn(IDC_BUTTON_RUN_BATCH)->EnableWindow(TRUE);
m_pTopToolbar->GetBtn(IDC_BUTTON_RUN_CT)->EnableWindow(TRUE);
m_pTopToolbar->GetBtn(IDC_BUTTON_STOP)->EnableWindow(FALSE);
@@ -208,7 +214,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 +223,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 +236,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 +280,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 +336,9 @@
{
CDialogEx::OnInitDialog();
- // 将“关于...”菜单项添加到系统菜单中。
+ // 灏嗏�滃叧浜�...鈥濊彍鍗曢」娣诲姞鍒扮郴缁熻彍鍗曚腑銆�
- // IDM_ABOUTBOX 必须在系统命令范围内。
+ // IDM_ABOUTBOX 蹇呴』鍦ㄧ郴缁熷懡浠よ寖鍥村唴銆�
ASSERT((IDM_ABOUTBOX & 0xFFF0) == IDM_ABOUTBOX);
ASSERT(IDM_ABOUTBOX < 0xF000);
@@ -350,17 +356,24 @@
}
}
- // 设置此对话框的图标。 当应用程序主窗口不是对话框时，框架将自动
- // 执行此操作
- SetIcon(m_hIcon, TRUE); // 设置大图标
- SetIcon(m_hIcon, FALSE); // 设置小图标
+ // 璁剧疆姝ゅ璇濇鐨勫浘鏍囥�� 褰撳簲鐢ㄧ▼搴忎富绐楀彛涓嶆槸瀵硅瘽妗嗘椂锛屾鏋跺皢鑷姩
+ // 鎵ц姝ゆ搷浣�
+ SetIcon(m_hIcon, TRUE); // 璁剧疆澶у浘鏍�
+ SetIcon(m_hIcon, FALSE); // 璁剧疆灏忓浘鏍�
+
+
+ // 鏈�澶у寲/绐楀彛鏍囬/鐗堟湰鍙�
+ ShowWindow(SW_MAXIMIZE);
+ CString strTitle;
+ strTitle.Format(_T("Bond Master -- V%s(%d)"), theApp.m_strVersionName, theApp.m_nVersionNumber);
+ SetWindowText(strTitle);
// model init
theApp.m_model.init();
- SetTimer(TIMER_ID_TEST, 1000, nullptr);
+ SetTimer(TIMER_ID_LOGIN, 1000, nullptr);
- // 菜单
+ // 鑿滃崟
CMenu menu;
menu.LoadMenu(IDR_MENU_APP);
SetMenu(&menu);
@@ -397,13 +410,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 +438,7 @@
- // 调整初始窗口位置
+ // 璋冩暣鍒濆绐楀彛浣嶇疆
CRect rcWnd;
GetWindowRect(&rcWnd);
int width = GetSystemMetrics(SM_CXSCREEN);
@@ -439,22 +452,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 +483,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 +503,7 @@
int x = (rect.Width() - cxIcon + 1) / 2;
int y = (rect.Height() - cyIcon + 1) / 2;
- // 绘制图标
+ // 缁樺埗鍥炬爣
dc.DrawIcon(x, y, m_hIcon);
}
else
@@ -499,8 +512,8 @@
}
}
-//当用户拖动最小化窗口时系统调用此函数取得光标
-//显示。
+//褰撶敤鎴锋嫋鍔ㄦ渶灏忓寲绐楀彛鏃剁郴缁熻皟鐢ㄦ鍑芥暟鍙栧緱鍏夋爣
+//鏄剧ず銆�
HCURSOR CServoDlg::OnQueryDragIcon()
{
return static_cast<HCURSOR>(m_hIcon);
@@ -660,6 +673,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 +693,14 @@
void CServoDlg::OnBnClickedOk()
{
- // TODO: 在此添加控件通知处理程序代码
+ // TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
CDialogEx::OnOK();
}
void CServoDlg::OnBnClickedCancel()
{
- // TODO: 在此添加控件通知处理程序代码
+ // TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
CDialogEx::OnCancel();
}
@@ -870,7 +894,7 @@
void CServoDlg::OnClose()
{
- // TODO: 在此添加消息处理程序代码和/或调用默认值
+ // TODO: 鍦ㄦ娣诲姞娑堟伅澶勭悊绋嬪簭浠ｇ爜鍜�/鎴栬皟鐢ㄩ粯璁ゅ��
CDialogEx::OnClose();
}
@@ -895,7 +919,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);
@@ -914,11 +938,23 @@
m_pMyStatusbar->setRunTimeText((LPTSTR)(LPCTSTR)strText);
}
- else if(TIMER_ID_TEST == nIDEvent){
- static __int64 tttt = 0;
- tttt++;
- theApp.m_model.m_hsmsPassive.setVariableValue("CJobSpace", tttt % 10);
- theApp.m_model.m_hsmsPassive.setVariableValue("PJobSpace", tttt % 5);
+ else if(TIMER_ID_LOGIN == nIDEvent){
+ KillTimer(TIMER_ID_LOGIN);
+ if (!CUserManager2::getInstance().isLoggedIn()) {
+ CLoginDlg2 dlg;
+ if (dlg.DoModal() != IDOK) {
+ PostMessage(WM_CLOSE);
+ }
+ else {
+ bool bRet = CUserManager2::getInstance().login((LPTSTR)(LPCTSTR)dlg.m_strUsername,
+ (LPTSTR)(LPCTSTR)dlg.m_strPassword);
+ if (!bRet) {
+ AfxMessageBox("鐧诲綍澶辫触锛岃妫�鏌ョ敤鎴峰悕鎴栧瘑鐮佹槸鍚︽纭紒");
+ PostMessage(WM_CLOSE);
+ }
+ UpdateLoginStatus();
+ }
+ }
}
@@ -956,33 +992,25 @@
void CServoDlg::UpdateLoginStatus()
{
HMENU hMenu = m_pTopToolbar->GetOperatorMenu();
- UserManager& userManager = UserManager::getInstance();
- if (userManager.isLoggedIn())
- {
- ::EnableMenuItem(hMenu, ID_OPEATOR_LOGIN, MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
- ::EnableMenuItem(hMenu, ID_OPERATOR_CHANGE_PASSWORD, MF_BYCOMMAND | MF_ENABLED);
+ CUserManager2& userManager = CUserManager2::getInstance();
+ if (userManager.isLoggedIn()) {
::EnableMenuItem(hMenu, ID_OPERATOR_SYSTEM_LOG, MF_BYCOMMAND | MF_ENABLED);
::EnableMenuItem(hMenu, ID_OPEATOR_SWITCH, MF_BYCOMMAND | MF_ENABLED);
- ::EnableMenuItem(hMenu, ID_OPERATOR_LOGOUT, MF_BYCOMMAND | MF_ENABLED);
- if (userManager.getCurrentUserRole() == UserRole::SuperAdmin) {
+ if (userManager.IsAdminCurrent()) {
::EnableMenuItem(hMenu, ID_OPEATOR_USER_MANAGER, MF_BYCOMMAND | MF_ENABLED);
}
else {
::EnableMenuItem(hMenu, ID_OPEATOR_USER_MANAGER, MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
}
- m_pTopToolbar->SetOperatorBtnText(userManager.getCurrentUser().c_str());
+ m_pTopToolbar->SetOperatorBtnText(userManager.getCurrentUserName().c_str());
}
else {
- ::EnableMenuItem(hMenu, ID_OPEATOR_LOGIN, MF_BYCOMMAND | MF_ENABLED);
- ::EnableMenuItem(hMenu, ID_OPERATOR_CHANGE_PASSWORD, MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
::EnableMenuItem(hMenu, ID_OPEATOR_USER_MANAGER, MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
::EnableMenuItem(hMenu, ID_OPERATOR_SYSTEM_LOG, MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
::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 +1020,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 +1039,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 +1051,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) {
@@ -1039,18 +1067,15 @@
}
}
else if (id == IDC_BUTTON_JOBS) {
- static int i = 0; i++;
- if (i % 2 == 0) {
- CControlJobManagerDlg dlg;
- dlg.DoModal();
- }
- else {
- CControlJobDlg dlg;
- dlg.DoModal();
- }
+ CControlJobDlg dlg;
+ dlg.DoModal();
}
else if (id == IDC_BUTTON_PORT_CONFIG) {
CPortConfigurationDlg dlg;
+ dlg.DoModal();
+ }
+ else if (id == IDC_BUTTON_CASSETTE) {
+ CControlJobManagerDlg dlg;
dlg.DoModal();
}
else if (id == IDC_BUTTON_ROBOT) {
@@ -1072,6 +1097,26 @@
}
else if (id == IDC_BUTTON_OPERATOR) {
int menuId = (int)wParam;
+ if (menuId == 0) {
+ CUserManager2Dlg dlg;
+ dlg.DoModal();
+ }
+ else if (menuId == 2) {
+ CLoginDlg2 dlg;
+ if (dlg.DoModal() != IDOK) {
+ PostMessage(WM_CLOSE);
+ }
+ else {
+ bool bRet = CUserManager2::getInstance().login((LPTSTR)(LPCTSTR)dlg.m_strUsername,
+ (LPTSTR)(LPCTSTR)dlg.m_strPassword);
+ if (!bRet) {
+ AfxMessageBox("鐧诲綍澶辫触锛岃妫�鏌ョ敤鎴峰悕鎴栧瘑鐮佹槸鍚︽纭紒");
+ }
+ UpdateLoginStatus();
+ }
+ }
+
+ /*
SystemLogManager& logManager = SystemLogManager::getInstance();
UserManager& userManager = UserManager::getInstance();
if (menuId == 0) {
@@ -1085,7 +1130,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) {
@@ -1093,14 +1138,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();
}
@@ -1109,17 +1154,18 @@
}
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();
}
UpdateLoginStatus();
+ */
}
return 0;
@@ -1159,16 +1205,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;
--
Gitblit v1.9.3