From 23cce52f9abd7dfd8e4eddd6068810e70c0a4ffa Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期四, 12 六月 2025 15:10:40 +0800
Subject: [PATCH] 1.转换为新的站号和Slot
---
SourceCode/Bond/Servo/ServoDlg.cpp | 223 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 208 insertions(+), 15 deletions(-)
diff --git a/SourceCode/Bond/Servo/ServoDlg.cpp b/SourceCode/Bond/Servo/ServoDlg.cpp
index 69a0d76..b8c863c 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
@@ -81,9 +87,11 @@
m_pPageGraph2 = nullptr;
m_pPageAlarm = nullptr;
m_pPageLog = nullptr;
+ m_pPageTransferLog = nullptr;
m_pPageRecipe = nullptr;
m_pTopToolbar = nullptr;
m_pMyStatusbar = nullptr;
+ m_pRobotTaskDlg = nullptr;
}
void CServoDlg::DoDataExchange(CDataExchange* pDX)
@@ -119,6 +127,7 @@
ON_MESSAGE(ID_MSG_PANEL_RESIZE, OnPanelResize)
ON_NOTIFY(BYHMTAB_SEL_CHANGED, IDC_TAB1, &CServoDlg::OnTabSelChanged)
ON_MESSAGE(ID_MSG_TOOLBAR_BTN_CLICKED, &CServoDlg::OnToolbarBtnClicked)
+ ON_MESSAGE(ID_MSG_STATUSBAR_BTN_CLICKED, &CServoDlg::OnStatusbarBtnClicked)
END_MESSAGE_MAP()
@@ -166,6 +175,53 @@
if (!m_pPanelAttributes->IsWindowVisible()) {
m_pPanelAttributes->ShowWindow(SW_SHOW);
Resize();
+ }
+ }
+ }
+ 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_STOP)->EnableWindow(FALSE);
+ m_pMyStatusbar->setBackgroundColor(STATUSBAR_BK_NORMAL);
+ m_pMyStatusbar->setForegroundColor(RGB(0, 0, 0));
+ KillTimer(TIMER_ID_UPDATE_RUMTIME);
+ CString strText;
+ GetRuntimeFormatText(strText, "");
+ m_pMyStatusbar->setRunTimeText((LPTSTR)(LPCTSTR)strText);
+ }
+ else if (state == SERVO::MASTERSTATE::RUNNING) {
+ m_pTopToolbar->GetBtn(IDC_BUTTON_RUN)->EnableWindow(FALSE);
+ m_pTopToolbar->GetBtn(IDC_BUTTON_STOP)->EnableWindow(TRUE);
+ m_pMyStatusbar->setBackgroundColor(STATUSBAR_BK_RUNNING);
+ m_pMyStatusbar->setForegroundColor(RGB(255, 255, 255));
+ SetTimer(TIMER_ID_UPDATE_RUMTIME, 500, nullptr);
+ }
+ }
+ else if (RX_CODE_EQ_ROBOT_TASK == code) {
+ int exCode;
+ if (pAny->getIntValue("exCode", exCode)) {
+ if (exCode == ROBOT_EVENT_CREATE) {
+ SERVO::CRobotTask* pTask = theApp.m_model.getMaster().getActiveRobotTask();
+ ASSERT(pTask);
+ if (m_pRobotTaskDlg) {
+ m_pRobotTaskDlg->SetRobotTask(pTask);
+ }
+
+ SERVO::CEquipment* pEq1, * pEq2;
+ pEq1 = theApp.m_model.getMaster().getEquipment(pTask->getSrcPosition());
+ pEq2 = theApp.m_model.getMaster().getEquipment(pTask->getTarPosition());
+ if (pEq1 != nullptr && pEq2 != nullptr) {
+ CString strText;
+ strText.Format(_T("%s --> %s"), pEq1->getName().c_str(), pEq2->getName().c_str());
+ m_pMyStatusbar->setCurTaskBtnText((LPTSTR)(LPCTSTR)strText);
+ }
+ }
+ else if (exCode == ROBOT_EVENT_FINISH) {
+ m_pMyStatusbar->setCurTaskBtnText("无");
+ }
+ else if (exCode == ROBOT_EVENT_ABORT) {
+ m_pMyStatusbar->setCurTaskBtnText("无");
}
}
}
@@ -241,6 +297,8 @@
m_pPageAlarm->Create(IDD_DIALOG_ALARM, this);
m_pPageLog = new CPageLog();
m_pPageLog->Create(IDD_DIALOG_LOG, this);
+ m_pPageTransferLog = new CPageTransferLog();
+ m_pPageTransferLog->Create(IDD_PAGE_TRANSFER_LOG, this);
CHmTab* m_pTab = CHmTab::Hook(GetDlgItem(IDC_TAB1)->m_hWnd);
m_pTab->SetPaddingLeft(20);
@@ -250,6 +308,7 @@
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);
@@ -294,6 +353,12 @@
// 初始化master以后需要控件绑定数据
m_pPageGraph1->BindEquipmentToGraph();
+
+
+ // 更新登录状态
+ UpdateLoginStatus();
+ //SystemLogManager::getInstance.log(SystemLogManager::LogType::Info, _T("BondEq启动..."));
+ //SystemLogManager::getInstance.
return TRUE; // 除非将焦点设置到控件，否则返回 TRUE
@@ -530,6 +595,12 @@
m_pMyStatusbar = nullptr;
}
+ if (m_pRobotTaskDlg != nullptr) {
+ m_pRobotTaskDlg->DestroyWindow();
+ delete m_pRobotTaskDlg;
+ m_pRobotTaskDlg = nullptr;
+ }
+
if (m_pTerminalDisplayDlg != nullptr) {
m_pTerminalDisplayDlg->DestroyWindow();
delete m_pTerminalDisplayDlg;
@@ -584,6 +655,12 @@
m_pPageLog = nullptr;
}
+ if (m_pPageTransferLog != nullptr) {
+ m_pPageTransferLog->DestroyWindow();
+ delete m_pPageTransferLog;
+ m_pPageTransferLog = nullptr;
+ }
+
if (m_hbrBkgnd != nullptr) {
::DeleteObject(m_hbrBkgnd);
}
@@ -604,6 +681,7 @@
if (m_pPageRecipe == nullptr) return;
if (m_pPageAlarm == nullptr) return;
if (m_pPageLog == nullptr) return;
+ if (m_pPageTransferLog == nullptr) return;
Resize();
Invalidate();
@@ -658,6 +736,7 @@
m_pPageRecipe->MoveWindow(x, y, rcClient.Width() - x, y2 - y);
m_pPageAlarm->MoveWindow(x, y, rcClient.Width() - x, y2 - y);
m_pPageLog->MoveWindow(x, y, rcClient.Width() - x, y2 - y);
+ m_pPageTransferLog->MoveWindow(x, y, rcClient.Width() - x, y2 - y);
m_pMyStatusbar->MoveWindow(0, y2, rcClient.Width(), STATUSBAR_HEIGHT);
@@ -704,12 +783,8 @@
if (index >= 4) index = 0;
static char* status[] = {"|", "/", "--", "\\"};
- CTime time = CTime::GetCurrentTime();
CString strText;
- strText.Format(_T("已运行：%d-%02d-%02d %02d:%02d:%02d %s"),
- time.GetYear(), time.GetMonth(), time.GetDay(),
- time.GetHour(), time.GetMinute(), time.GetSecond(),
- status[index]);
+ GetRuntimeFormatText(strText, status[index]);
m_pMyStatusbar->setRunTimeText((LPTSTR)(LPCTSTR)strText);
}
@@ -736,10 +811,43 @@
void CServoDlg::ShowChildPage(int index)
{
- ASSERT(0 <= index && index < 5);
- static CWnd* pPages[] = { m_pPageGraph1, m_pPageGraph2, m_pPageRecipe, m_pPageAlarm, m_pPageLog };
- for (int i = 0; i < 5; i++) {
+ ASSERT(0 <= index && index < 6);
+ static CWnd* pPages[] = { m_pPageGraph1, m_pPageGraph2, m_pPageRecipe, m_pPageAlarm, m_pPageLog, m_pPageTransferLog };
+ for (int i = 0; i < 6; i++) {
pPages[i]->ShowWindow(i == index ? SW_SHOW : SW_HIDE);
+ }
+}
+
+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("未登录"));
}
}
@@ -749,17 +857,10 @@
if (id == IDC_BUTTON_RUN) {
theApp.m_model.getMaster().start();
m_pTopToolbar->GetBtn(IDC_BUTTON_RUN)->EnableWindow(FALSE);
- m_pTopToolbar->GetBtn(IDC_BUTTON_STOP)->EnableWindow(TRUE);
- m_pMyStatusbar->setBkgnd(STATUSBAR_BK_RUNNING);
- SetTimer(TIMER_ID_UPDATE_RUMTIME, 1000, nullptr);
-
}
else if (id == IDC_BUTTON_STOP) {
theApp.m_model.getMaster().stop();
- m_pTopToolbar->GetBtn(IDC_BUTTON_RUN)->EnableWindow(TRUE);
m_pTopToolbar->GetBtn(IDC_BUTTON_STOP)->EnableWindow(FALSE);
- m_pMyStatusbar->setBkgnd(STATUSBAR_BK_ALARM);
- KillTimer(TIMER_ID_UPDATE_RUMTIME);
}
else if (id == IDC_BUTTON_ROBOT) {
SERVO::CEFEM* pEFEM = (SERVO::CEFEM*)theApp.m_model.getMaster().getEquipment(EQ_ID_EFEM);
@@ -767,5 +868,97 @@
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;
+}
+
+LRESULT CServoDlg::OnStatusbarBtnClicked(WPARAM wParam, LPARAM lParam)
+{
+ int id = (int)lParam;
+ int x = (int)wParam;
+ if (id == IDC_BUTTON_ROBOTTASK) {
+ if (m_pRobotTaskDlg == nullptr) {
+ m_pRobotTaskDlg = new CRobotTaskDlg();
+ m_pRobotTaskDlg->Create(IDD_DIALOG_ROBOT_TASK, this);
+ }
+
+ CRect rcBar;
+ int h = 258;
+ int w = 388;
+ m_pRobotTaskDlg->SetRobotTask(theApp.m_model.getMaster().getActiveRobotTask());
+ m_pMyStatusbar->GetWindowRect(rcBar);
+ m_pRobotTaskDlg->MoveWindow(x, rcBar.top - h, w, h);
+ m_pRobotTaskDlg->ShowWindow(SW_SHOW);
+ }
+ return 0;
+}
+
+CString& CServoDlg::GetRuntimeFormatText(CString& strText, const char* pszSuffix)
+{
+ ULONGLONG ullRunTime = (ULONGLONG)(theApp.m_model.getMaster().getRunTime() * 0.001);
+ int h, m, s;
+ h = int(ullRunTime / 3600);
+ m = int((ullRunTime % 3600) / 60);
+ s = int(ullRunTime % 60);
+
+ SERVO::MASTERSTATE state = theApp.m_model.getMaster().getState();
+ if (state == SERVO::MASTERSTATE::RUNNING) {
+ strText.Format(_T("正在运行：%02d:%02d:%02d %s"), h, m, s, pszSuffix);
+ }
+ else {
+ strText.Format(_T("已运行：%02d:%02d:%02d %s"), h, m, s, pszSuffix);
+ }
+
+ return strText;
}
\ No newline at end of file
--
Gitblit v1.9.3