From 6eacf60891a6ac09f96985af042df3c4ed3da000 Mon Sep 17 00:00:00 2001
From: LAPTOP-T815PCOQ\25526 <mr.liuyang@126.com>
Date: 星期五, 15 十一月 2024 18:00:22 +0800
Subject: [PATCH] 1. 修改控件库的字符集 2. 添加用户管理界面 3.修改密码的加密方式(对称加密)

---
 SourceCode/Bond/BondEq/BondEqDlg.cpp |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/SourceCode/Bond/BondEq/BondEqDlg.cpp b/SourceCode/Bond/BondEq/BondEqDlg.cpp
index eb1cde7..715cfe4 100644
--- a/SourceCode/Bond/BondEq/BondEqDlg.cpp
+++ b/SourceCode/Bond/BondEq/BondEqDlg.cpp
@@ -7,13 +7,14 @@
 #include "BondEqDlg.h"
 #include "afxdialogex.h"
 #include "Common.h"
-#include "Bonder.h"
+#include "CBonder.h"
 #include "SettingsDlg.h"
 #include "UserManager.h"
 #include "LoginDlg.h"
 
 // test
 #include "AxisSettingsDlg.h"
+#include "UserManagerDlg.h"
 
 
 #ifdef _DEBUG
@@ -198,6 +199,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);
 
 
 	// 设备面板
@@ -534,13 +538,14 @@
 			ShowLoginDlg();
 		}
 		else if (2 == menuId) {
+			// test
+			CUserManagerDlg dlg;
+			dlg.DoModal();
+
 			if (userManager.isLoggedIn()) {
 				userManager.logout();
 				m_pTopToolbar->SetOperatorBtnText(_T("未登录"));
 			}
-
-			CAxisSettingsDlg loginDlg;
-			loginDlg.DoModal();
 		}
 	}
 

--
Gitblit v1.9.3