From b43897d4f69cf85a425f48df9270a289bc0a0125 Mon Sep 17 00:00:00 2001
From: LAPTOP-T815PCOQ\25526 <mr.liuyang@126.com>
Date: 星期二, 19 十一月 2024 18:04:20 +0800
Subject: [PATCH] 1. 添加用户管理的菜单栏 2.更新菜单栏的状态
---
SourceCode/Bond/BondEq/BondEqDlg.cpp | 101 ++++++++++++++++++++++++++++++++++++++------------
1 files changed, 76 insertions(+), 25 deletions(-)
diff --git a/SourceCode/Bond/BondEq/BondEqDlg.cpp b/SourceCode/Bond/BondEq/BondEqDlg.cpp
index 62305d3..0735685 100644
--- a/SourceCode/Bond/BondEq/BondEqDlg.cpp
+++ b/SourceCode/Bond/BondEq/BondEqDlg.cpp
@@ -7,10 +7,16 @@
#include "BondEqDlg.h"
#include "afxdialogex.h"
#include "Common.h"
-#include "Servo.h"
+#include "CBonder.h"
#include "SettingsDlg.h"
#include "UserManager.h"
#include "LoginDlg.h"
+#include "ChangePasswordDlg.h"
+#include "InputDialog.h"
+
+// test
+#include "AxisSettingsDlg.h"
+#include "UserManagerDlg.h"
#ifdef _DEBUG
@@ -195,6 +201,9 @@
m_pTopToolbar->Create(IDD_TOP_TOOLBAR, this);
m_pTopToolbar->ShowWindow(SW_SHOW);
m_pTopToolbar->GetBtn(IDC_BUTTON_STOP)->EnableWindow(FALSE);
+ HMENU hMenu = m_pTopToolbar->GetOperatorMenu();
+ ASSERT(hMenu);
+ ::EnableMenuItem(hMenu, ID_OPEATOR_SWITCH, MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
// 设备面板
@@ -212,16 +221,13 @@
// Home页
m_pHomeDialog = CreateHomeDlg();
ShowWindow(SW_SHOWMAXIMIZED);
- SetTimer(2, 1000, nullptr);
InitRxWindows();
- // 登录管理
- if (userManager.isLoggedIn()) {
- m_pTopToolbar->SetOperatorBtnText(userManager.getCurrentUser().c_str());
- }
+ // 更新登录状态
+ UpdateLoginStatus();
return TRUE; // 除非将焦点设置到控件，否则返回 TRUE
@@ -279,8 +285,8 @@
void CBondEqDlg::OnClose()
{
// TODO: 在此添加消息处理程序代码和/或调用默认值
- CServo& servo = theApp.m_model.getServo();
- if (servo.isRunning()) {
+ CBonder& bonder = theApp.m_model.getBonder();
+ if (bonder.isRunning()) {
AfxMessageBox("程序和机器正在运行中，请先停止工作再退出程序！");
return;
}
@@ -453,7 +459,7 @@
void CBondEqDlg::OnUpdateMenuFileSettings(CCmdUI* pCmdUI)
{
- pCmdUI->Enable(!theApp.m_model.getServo().isRunning());
+ pCmdUI->Enable(!theApp.m_model.getBonder().isRunning());
}
void CBondEqDlg::OnMenuFileExit()
@@ -463,7 +469,7 @@
void CBondEqDlg::OnUpdateMenuFileExit(CCmdUI* pCmdUI)
{
- pCmdUI->Enable(!theApp.m_model.getServo().isRunning());
+ pCmdUI->Enable(!theApp.m_model.getBonder().isRunning());
}
void CBondEqDlg::OnMenuHelpAbout()
@@ -506,6 +512,22 @@
LRESULT CBondEqDlg::OnToolbarBtnClicked(WPARAM wParam, LPARAM lParam)
{
int id = (int)lParam;
+ if (id == IDC_BUTTON_RUN || id == IDC_BUTTON_STOP || id == IDC_BUTTON_SETTINGS)
+ {
+ CInputDialog inputDialog(_T("验证用户"), _T("请输入用户密码："));
+ if (inputDialog.DoModal() != IDOK) {
+ AfxMessageBox(_T("取消验证！"));
+ return 0;
+ }
+
+ CString inputText = inputDialog.GetInputText();
+ std::string strPass = UserManager::getInstance().getCurrentPass();
+ if (inputText.Compare(strPass.c_str()) != 0) {
+ AfxMessageBox(_T("密码错误！"));
+ return 0;
+ }
+ }
+
if (id == IDC_BUTTON_RUN) {
m_pTopToolbar->GetBtn(IDC_BUTTON_RUN)->EnableWindow(FALSE);
m_pTopToolbar->GetBtn(IDC_BUTTON_STOP)->EnableWindow(TRUE);
@@ -522,20 +544,36 @@
int menuId = (int)wParam;
UserManager& userManager = UserManager::getInstance();
if (menuId == 0) {
- ShowLoginDlg();
+ CLoginDlg loginDlg;
+ loginDlg.DoModal();
+ UpdateLoginStatus();
}
else if (1 == menuId) {
+ CChangePasswordDlg changePasswordDlg;
+ if (changePasswordDlg.DoModal() == IDOK) {
+ }
+ }
+ else if (2 == menuId) {
+ CUserManagerDlg dlg;
+ dlg.DoModal();
+ }
+ else if (3 == menuId) {
+ int ret = AfxMessageBox(_T("是否切换用户？切换用户会退出当前账号！"), MB_OK | MB_ICONEXCLAMATION);
+ if (ret != MB_OK) {
+ return 0;
+ }
+
if (userManager.isLoggedIn()) {
userManager.logout();
}
- ShowLoginDlg();
+ CLoginDlg loginDlg;
+ loginDlg.DoModal();
+ UpdateLoginStatus();
}
- else if (2 == menuId) {
- if (userManager.isLoggedIn()) {
- userManager.logout();
- m_pTopToolbar->SetOperatorBtnText(_T("未登录"));
- }
+ else {
+ userManager.logout();
+ UpdateLoginStatus();
}
}
@@ -578,10 +616,7 @@
}
}
}
- else if (2 == nIDEvent) {
- KillTimer(2);
- theApp.m_model.createRemoteEqs();
- }
+
CDialogEx::OnTimer(nIDEvent);
}
@@ -611,17 +646,33 @@
return pDlg;
}
-void CBondEqDlg::ShowLoginDlg()
+void CBondEqDlg::UpdateLoginStatus()
{
- CLoginDlg loginDlg;
- loginDlg.DoModal();
-
+ 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);
+ ::EnableMenuItem(hMenu, ID_OPEATOR_SWITCH, MF_BYCOMMAND | MF_ENABLED);
+ ::EnableMenuItem(hMenu, ID_OPERATOR_LOGOUT, MF_BYCOMMAND | MF_ENABLED);
+
+ if (userManager.getCurrentUserRole() == UserRole::SuperAdmin) {
+ ::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());
}
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_OPEATOR_SWITCH, MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
+ ::EnableMenuItem(hMenu, ID_OPERATOR_LOGOUT, MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
+
m_pTopToolbar->SetOperatorBtnText(_T("未登录"));
}
}
--
Gitblit v1.9.3