From 253693b8e42a751030051d3d619201dc6f5b12db Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 16 五月 2025 11:14:11 +0800
Subject: [PATCH] 1.CGlassPool实现; 2.CGlass翻译逻辑优化; 3.在Glass列表页,Glass项的显示,增加显示贴合的Glass的id

---
 SourceCode/Bond/Servo/CEquipmentPage2.cpp |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/SourceCode/Bond/Servo/CEquipmentPage2.cpp b/SourceCode/Bond/Servo/CEquipmentPage2.cpp
index ca4b445..3bffbe7 100644
--- a/SourceCode/Bond/Servo/CEquipmentPage2.cpp
+++ b/SourceCode/Bond/Servo/CEquipmentPage2.cpp
@@ -74,8 +74,9 @@
 	ListView_SetImageList(m_listCtrl.GetSafeHwnd(), imageList, LVSIL_SMALL);
 	m_listCtrl.InsertColumn(0, _T(""), LVCFMT_RIGHT, width[0]);
 	m_listCtrl.InsertColumn(1, _T("ID"), LVCFMT_LEFT, width[1]);
-	m_listCtrl.InsertColumn(2, _T("鏃堕棿"), LVCFMT_LEFT, width[2]);
-	m_listCtrl.SetColumnWidth(2, LVSCW_AUTOSIZE_USEHEADER);
+	m_listCtrl.InsertColumn(2, _T("璐村悎"), LVCFMT_LEFT, width[2]);
+	m_listCtrl.InsertColumn(3, _T("鏃堕棿"), LVCFMT_LEFT, width[3]);
+	m_listCtrl.SetColumnWidth(3, LVSCW_AUTOSIZE_USEHEADER);
 
 
 	ASSERT(m_pEquipment);
@@ -84,10 +85,14 @@
 	for (auto item : list) {
 		item->addRef();				
 		item->release();		// 閲婃斁list涓殑寮曠敤
+
+		SERVO::CGlass* pBuddy = item->getBuddy();
 		int index = m_listCtrl.InsertItem(m_listCtrl.GetItemCount(), _T(""));
 		m_listCtrl.SetItemData(index, (DWORD_PTR)item);
 		m_listCtrl.SetItemText(index, 1, item->getID().c_str());
-
+		if (pBuddy != nullptr) {
+			m_listCtrl.SetItemText(index, 2, pBuddy->getID().c_str());
+		}
 	}
 
 	return TRUE;  // return TRUE unless you set the focus to a control

--
Gitblit v1.9.3