From db9d120efcfe76bb73df089dca8986eca9ee0e6f Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期三, 10 十二月 2025 10:11:37 +0800
Subject: [PATCH] 1.扫码上报，但未在配置中设置变量；
---
SourceCode/Bond/Servo/ServoDlg.cpp | 99 +++++++++++++++++++++++++++++++++++--------------
1 files changed, 71 insertions(+), 28 deletions(-)
diff --git a/SourceCode/Bond/Servo/ServoDlg.cpp b/SourceCode/Bond/Servo/ServoDlg.cpp
index 5dac166..c886f66 100644
--- a/SourceCode/Bond/Servo/ServoDlg.cpp
+++ b/SourceCode/Bond/Servo/ServoDlg.cpp
@@ -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"
@@ -30,6 +31,9 @@
#include "InputDialog.h"
#include "ClientListDlg.h"
#include "CControlJobManagerDlg.h"
+#include "CUserManager2.h"
+#include "CUserManager2Dlg.h"
+#include "CUserXLogDlg.h"
#ifdef _DEBUG
@@ -44,7 +48,7 @@
#define TIMER_ID_UPDATE_RUMTIME 2
/* Test */
-#define TIMER_ID_TEST 3
+#define TIMER_ID_LOGIN 3
// 鐢ㄤ簬搴旂敤绋嬪簭鈥滃叧浜庘�濊彍鍗曢」鐨� CAboutDlg 瀵硅瘽妗�
@@ -197,7 +201,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);
@@ -359,9 +363,16 @@
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, 1500, nullptr);
// 鑿滃崟
CMenu menu;
@@ -928,11 +939,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();
+ }
+ }
}
@@ -970,32 +993,24 @@
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("鏈櫥褰�"));
}
}
@@ -1003,15 +1018,14 @@
LRESULT CServoDlg::OnToolbarBtnClicked(WPARAM wParam, LPARAM lParam)
{
int id = (int)lParam;
- if (id == IDC_BUTTON_RUN || id == IDC_BUTTON_STOP) {
- UserRole emRole = UserManager::getInstance().getCurrentUserRole();
- if (emRole != UserRole::SuperAdmin) {
- AfxMessageBox(_T("褰撳墠鐢ㄦ埛骞堕潪绠＄悊鍛橈紒锛侊紒"));
- return 1;
- }
- }
-
if (id == IDC_BUTTON_RUN) {
+ int rc = UX_CanExecute(L"start");
+ if (rc != 1) {
+ AfxMessageBox("鎿嶄綔鏉冮檺涓嶈冻锛岃鑱旂郴绠＄悊浜哄憳锛�");
+ return 0;
+ }
+ UX_RecordAction(L"start");
+
if (theApp.m_model.getMaster().getState() == SERVO::MASTERSTATE::MSERROR) {
AfxMessageBox("褰撳墠鏈夋満鍙板彂鐢熼敊璇紝涓嶈兘鍚姩锛岃纭瑙ｅ喅闂鍚庡啀灏濊瘯閲嶆柊鍚姩锛�");
}
@@ -1048,6 +1062,13 @@
}
}
else if (id == IDC_BUTTON_STOP) {
+ int rc = UX_CanExecute(L"stop");
+ if (rc != 1) {
+ AfxMessageBox("鎿嶄綔鏉冮檺涓嶈冻锛岃鑱旂郴绠＄悊浜哄憳锛�");
+ return 0;
+ }
+ UX_RecordAction(L"stop");
+
if (theApp.m_model.getMaster().stop() == 0) {
m_pTopToolbar->GetBtn(IDC_BUTTON_STOP)->EnableWindow(FALSE);
}
@@ -1083,6 +1104,27 @@
}
else if (id == IDC_BUTTON_OPERATOR) {
int menuId = (int)wParam;
+ if (menuId == 0) {
+ CUserManager2Dlg dlg;
+ dlg.DoModal();
+ }
+ else if (menuId == 1) {
+ CUserXLogDlg dlg;
+ dlg.DoModal();
+ }
+ else if (menuId == 2) {
+ CLoginDlg2 dlg;
+ if (dlg.DoModal() == IDOK) {
+ 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) {
@@ -1131,6 +1173,7 @@
}
UpdateLoginStatus();
+ */
}
return 0;
--
Gitblit v1.9.3