From 1fd6271242b881c26a131289ddfcfe7fd68dbaed Mon Sep 17 00:00:00 2001
From: darker <mr.darker@163.com>
Date: 星期二, 14 一月 2025 17:39:20 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/BoounionPLC/PagePlcList.cpp | 43 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 42 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/BoounionPLC/PagePlcList.cpp b/SourceCode/Bond/BoounionPLC/PagePlcList.cpp
index f5203c8..fd94ec0 100644
--- a/SourceCode/Bond/BoounionPLC/PagePlcList.cpp
+++ b/SourceCode/Bond/BoounionPLC/PagePlcList.cpp
@@ -8,6 +8,8 @@
#include "Common.h"
+#define ID_TIMER_INIT 1
+
// CPagePlcList 对话框
IMPLEMENT_DYNAMIC(CPagePlcList, CDialogEx)
@@ -36,6 +38,7 @@
ON_WM_DESTROY()
ON_WM_SIZE()
ON_MESSAGE(ID_MSG_TREE_CLICK_ITEM, OnTreeClickItem)
+ ON_WM_TIMER()
END_MESSAGE_MAP()
@@ -82,6 +85,18 @@
theApp.m_model.notifyPtr(RX_CODE_SELECT_PLC, pSelectedPlc);
}
}
+ else if (RX_PLC_STATE_CHANGED == code) {
+ CPLC* pPlc;
+ if (pAny->getPtrValue("ptr", (void*&)pPlc)) {
+ HTREEITEM hItem = FindItem(pPlc);
+ if (hItem != nullptr && pPlc->isConnected()) {
+ m_treeCtrl.ShowItemBadgeDotMode(hItem);
+ }
+ else {
+ m_treeCtrl.HideItemBadge(hItem);
+ }
+ }
+ }
pAny->release();
}, [&]() -> void {
@@ -113,7 +128,8 @@
m_treeCtrl.SetBkColor(PAGE_PLC_LIST_BACKGROUND);
m_treeCtrl.SetItemHeight(50);
- ReadPLCList();
+ SetTimer(ID_TIMER_INIT, 200, nullptr);
+
return TRUE; // return TRUE unless you set the focus to a control
// 异常: OCX 属性页应返回 FALSE
@@ -182,14 +198,28 @@
void CPagePlcList::ReadPLCList()
{
+ HTREEITEM hItemFirst = nullptr;
std::map<std::string, CPLC*>& plcs = theApp.m_model.getPlcMap();
for (auto item : plcs) {
HTREEITEM hItem = m_treeCtrl.InsertItem(item.second->getName().c_str(), nullptr, nullptr);
m_treeCtrl.SetItemData(hItem, (DWORD_PTR)item.second);
+ m_treeCtrl.SetItemBadge(hItem, TREE_BADGE_BACKGROUND, TREE_BADGE_FOREGROUND);
+ if (item.second->isConnected()) {
+ m_treeCtrl.ShowItemBadgeDotMode(hItem);
+ }
+ if (hItemFirst == nullptr) {
+ hItemFirst = hItem;
+ }
}
if (!plcs.empty()) {
m_treeCtrl.ShowWindow(SW_SHOW);
GetDlgItem(IDC_LABEL_NO_PLC)->ShowWindow(SW_HIDE);
+ }
+
+ if (hItemFirst != nullptr) {
+ m_treeCtrl.SelectItem(hItemFirst);
+ CPLC* pPlc = (CPLC*)m_treeCtrl.GetItemData(hItemFirst);
+ theApp.m_model.notifyPtr(RX_CODE_SELECT_PLC, pPlc);
}
}
@@ -215,3 +245,14 @@
return nullptr;
}
+
+void CPagePlcList::OnTimer(UINT_PTR nIDEvent)
+{
+ // TODO: 在此添加消息处理程序代码和/或调用默认值
+ if (ID_TIMER_INIT == nIDEvent) {
+ KillTimer(ID_TIMER_INIT);
+ ReadPLCList();
+ }
+
+ CDialogEx::OnTimer(nIDEvent);
+}
--
Gitblit v1.9.3