From ce7f9f6df6e34cee1cbb9e776a814bc7548e8bd1 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期三, 28 五月 2025 17:47:55 +0800
Subject: [PATCH] 1.补允上次提交；
---
SourceCode/Bond/Servo/CEquipmentPage2.cpp | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipmentPage2.cpp b/SourceCode/Bond/Servo/CEquipmentPage2.cpp
index ca4b445..e28bc78 100644
--- a/SourceCode/Bond/Servo/CEquipmentPage2.cpp
+++ b/SourceCode/Bond/Servo/CEquipmentPage2.cpp
@@ -74,20 +74,23 @@
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);
- std::list<SERVO::CGlass*> list;
- m_pEquipment->getGlassList(list);
- for (auto item : list) {
- item->addRef();
- item->release(); // 閲婃斁list涓殑寮曠敤
- 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());
+ for (int i = 0; i < SLOT_MAX; i++) {
+ SERVO::CGlass* pGlass = m_pEquipment->getGlassFromSlot(i+1);
+ pGlass->addRef();
+ SERVO::CGlass* pBuddy = pGlass->getBuddy();
+ int index = m_listCtrl.InsertItem(m_listCtrl.GetItemCount(), _T(""));
+ m_listCtrl.SetItemData(index, (DWORD_PTR)pGlass);
+ m_listCtrl.SetItemText(index, 1, pGlass->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
@@ -167,6 +170,7 @@
void CEquipmentPage2::OnBnClickedButtonRemove()
{
+ /*
int index = GetSelectedItemIndex();
if (index >= 0) {
SERVO::CGlass* pGlass = (SERVO::CGlass*)m_listCtrl.GetItemData(index);
@@ -177,4 +181,5 @@
m_listCtrl.DeleteItem(index);
}
}
+ */
}
--
Gitblit v1.9.3