From 4e5df2e71445ca3c0cc412e24510234e671b6072 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期四, 19 六月 2025 16:18:33 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/ServoDlg.cpp | 126 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 122 insertions(+), 4 deletions(-)
diff --git a/SourceCode/Bond/Servo/ServoDlg.cpp b/SourceCode/Bond/Servo/ServoDlg.cpp
index c99cced..bc56882 100644
--- a/SourceCode/Bond/Servo/ServoDlg.cpp
+++ b/SourceCode/Bond/Servo/ServoDlg.cpp
@@ -15,6 +15,12 @@
#include "HmTab.h"
#include "CRobotCmdContainerDlg.h"
#include "CRobotCmdTestDlg.h"
+#include "LoginDlg.h"
+#include "ChangePasswordDlg.h"
+#include "UserManagerDlg.h"
+#include "SystemLogManagerDlg.h"
+#include "UserManager.h"
+#include "SystemLogManager.h"
#ifdef _DEBUG
@@ -184,6 +190,18 @@
GetRuntimeFormatText(strText, "");
m_pMyStatusbar->setRunTimeText((LPTSTR)(LPCTSTR)strText);
}
+ else if (state == SERVO::MASTERSTATE::STARTING) {
+ m_pMyStatusbar->setBackgroundColor(STATUSBAR_BK_STARTING);
+ m_pMyStatusbar->setForegroundColor(RGB(0, 0, 0));
+ m_pMyStatusbar->setRunTimeText("正在启动...");
+ }
+ else if (state == SERVO::MASTERSTATE::MSERROR) {
+ m_pTopToolbar->GetBtn(IDC_BUTTON_RUN)->EnableWindow(TRUE);
+ m_pTopToolbar->GetBtn(IDC_BUTTON_STOP)->EnableWindow(FALSE);
+ m_pMyStatusbar->setBackgroundColor(STATUSBAR_BK_ALARM);
+ m_pMyStatusbar->setForegroundColor(RGB(0, 0, 0));
+ m_pMyStatusbar->setRunTimeText("启动失败.");
+ }
else if (state == SERVO::MASTERSTATE::RUNNING) {
m_pTopToolbar->GetBtn(IDC_BUTTON_RUN)->EnableWindow(FALSE);
m_pTopToolbar->GetBtn(IDC_BUTTON_STOP)->EnableWindow(TRUE);
@@ -343,10 +361,17 @@
// 相当于延时调用master的初始化
theApp.m_model.m_master.init();
+ theApp.m_model.loadPortParams();
// 初始化master以后需要控件绑定数据
m_pPageGraph1->BindEquipmentToGraph();
+
+
+ // 更新登录状态
+ UpdateLoginStatus();
+ //SystemLogManager::getInstance.log(SystemLogManager::LogType::Info, _T("BondEq启动..."));
+ //SystemLogManager::getInstance.
return TRUE; // 除非将焦点设置到控件，否则返回 TRUE
@@ -806,23 +831,116 @@
}
}
+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);
+ ::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) {
+ ::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_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("未登录"));
+ }
+}
+
LRESULT CServoDlg::OnToolbarBtnClicked(WPARAM wParam, LPARAM lParam)
{
int id = (int)lParam;
if (id == IDC_BUTTON_RUN) {
- theApp.m_model.getMaster().start();
- m_pTopToolbar->GetBtn(IDC_BUTTON_RUN)->EnableWindow(FALSE);
+ if (theApp.m_model.getMaster().getState() == SERVO::MASTERSTATE::MSERROR) {
+ AfxMessageBox("当前有机台发生错误，不能启动，请确认解决问题后再尝试重新启动！");
+ }
+ else {
+ if (theApp.m_model.getMaster().start() == 0) {
+ m_pTopToolbar->GetBtn(IDC_BUTTON_RUN)->EnableWindow(FALSE);
+ }
+ }
}
else if (id == IDC_BUTTON_STOP) {
- theApp.m_model.getMaster().stop();
- m_pTopToolbar->GetBtn(IDC_BUTTON_STOP)->EnableWindow(FALSE);
+ if (theApp.m_model.getMaster().stop() == 0) {
+ m_pTopToolbar->GetBtn(IDC_BUTTON_STOP)->EnableWindow(FALSE);
+ }
}
else if (id == IDC_BUTTON_ROBOT) {
+ theApp.m_model.getMaster().clearError();
SERVO::CEFEM* pEFEM = (SERVO::CEFEM*)theApp.m_model.getMaster().getEquipment(EQ_ID_EFEM);
CRobotCmdTestDlg dlg;
dlg.SetEFEM(pEFEM);
dlg.DoModal();
}
+ else if (id == IDC_BUTTON_OPERATOR) {
+ int menuId = (int)wParam;
+ SystemLogManager& logManager = SystemLogManager::getInstance();
+ UserManager& userManager = UserManager::getInstance();
+ if (menuId == 0) {
+ CLoginDlg loginDlg;
+ loginDlg.DoModal();
+ }
+ else if (1 == menuId) {
+ CChangePasswordDlg changePasswordDlg;
+ changePasswordDlg.DoModal();
+ }
+ else if (2 == menuId) {
+ CUserManagerDlg dlg;
+ if (dlg.DoModal() != IDOK) {
+ logManager.log(SystemLogManager::LogType::Operation, _T("用户管理的预操作被取消！"));
+ }
+ }
+ else if (3 == menuId) {
+ CSystemLogManagerDlg dlg;
+ dlg.DoModal();
+ }
+ else if (4 == menuId) {
+ int ret = AfxMessageBox(_T("是否切换用户？切换用户会退出当前账号！"), MB_OKCANCEL | MB_ICONEXCLAMATION);
+ if (ret != IDOK) {
+ return 0;
+ }
+
+ logManager.log(SystemLogManager::LogType::Operation, _T("确认切换角色！"));
+ if (userManager.isLoggedIn()) {
+ logManager.log(SystemLogManager::LogType::Info, _T("退出登录！"));
+ userManager.logout();
+ }
+
+ CLoginDlg loginDlg;
+ loginDlg.DoModal();
+ }
+ else {
+ CString cstrMessage;
+ 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("退出登录！"));
+ userManager.logout();
+ }
+
+ UpdateLoginStatus();
+ }
+
return 0;
}
--
Gitblit v1.9.3