From bdf0dc4cb183d3fec40e1d51b3bb94b7e53d0a55 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期日, 04 一月 2026 10:45:07 +0800
Subject: [PATCH] 1.修复报文字段差异风险： S1F3：项目用 getSubItemU4(0) 取 SVID；日志里有 U2 的情况，可能导致解析失败后回退成 SV=0。 S6F11：项目发送 DATAID(U4) + CEID(U4)；日志样例里第一个字段是 U2，可能存在类型/字段定义不一致。
---
SourceCode/Bond/BondEq/View/LoginDlg.cpp | 38 +++++++++++++++++++++++---------------
1 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/SourceCode/Bond/BondEq/View/LoginDlg.cpp b/SourceCode/Bond/BondEq/View/LoginDlg.cpp
index b78c28d..edacdb8 100644
--- a/SourceCode/Bond/BondEq/View/LoginDlg.cpp
+++ b/SourceCode/Bond/BondEq/View/LoginDlg.cpp
@@ -23,11 +23,11 @@
void CLoginDlg::DoDataExchange(CDataExchange* pDX)
{
- CDialogEx::DoDataExchange(pDX);
- DDX_Control(pDX, IDC_EDIT_USERNAME, m_editUsername);
- DDX_Control(pDX, IDC_EDIT_PASSWORD, m_editPassword);
- DDX_Control(pDX, IDC_COMBO_ROLE, m_comboRole);
- DDX_Control(pDX, IDC_CHECK_REMEMBER_PASSWORD, m_checkRememberPassword);
+ CDialogEx::DoDataExchange(pDX);
+ DDX_Control(pDX, IDC_STATIC_IMAGE, m_staticImage);
+ DDX_Control(pDX, IDC_EDIT_USERNAME, m_editUsername);
+ DDX_Control(pDX, IDC_EDIT_PASSWORD, m_editPassword);
+ DDX_Control(pDX, IDC_CHECK_REMEMBER_PASSWORD, m_checkRememberPassword);
}
@@ -46,10 +46,24 @@
// 璁剧疆绐楀彛鏍囬鍜屽垵濮嬪��
SetWindowText(_T("鐧诲綍"));
- m_comboRole.AddString(_T("绠＄悊鍛�"));
- m_comboRole.AddString(_T("宸ョ▼甯�"));
- m_comboRole.AddString(_T("鎿嶄綔鍛�"));
- m_comboRole.SetCurSel(0);
+
+ CString strIconPath;
+ strIconPath.Format(_T("%s\\Res\\Operator_High_32.ico"), (LPTSTR)(LPCTSTR)theApp.m_strAppDir);
+
+ // 鍔犺浇鍥炬爣
+ HICON hIcon = (HICON)::LoadImage(
+ nullptr,
+ strIconPath,
+ IMAGE_ICON,
+ 32, // 鍥炬爣瀹藉害
+ 32, // 鍥炬爣楂樺害
+ LR_LOADFROMFILE);
+
+ if (hIcon) {
+ // 璁剧疆 CStatic 鎺т欢涓哄浘鏍囨牱寮�
+ m_staticImage.ModifyStyle(0xF, SS_ICON);
+ m_staticImage.SetIcon(hIcon);
+ }
// 娣诲姞SS_NOTIFY鏍峰紡
CStatic* pStatic = (CStatic*)GetDlgItem(IDC_STATIC_CHANGE_PASSWORD);
@@ -59,11 +73,6 @@
UserManager& userManager = UserManager::getInstance();
if (userManager.isLoggedIn()) {
- int nRole = (int)userManager.getCurrentUserRole();
- if (nRole <= m_comboRole.GetCount()) {
- m_comboRole.SetCurSel(nRole);
- }
-
if (userManager.isRememberMe()) {
m_checkRememberPassword.SetCheck(BST_CHECKED);
}
@@ -81,7 +90,6 @@
CString username, password, role;
m_editUsername.GetWindowText(username);
m_editPassword.GetWindowText(password);
- m_comboRole.GetLBText(m_comboRole.GetCurSel(), role);
if (username.IsEmpty() || password.IsEmpty()) {
AfxMessageBox(_T("璇疯緭鍏ョ敤鎴峰悕鍜屽瘑鐮併��"));
--
Gitblit v1.9.3