From 3e369afeb66a110fb6bd382f56bb70aa370fe154 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期三, 18 六月 2025 15:52:30 +0800
Subject: [PATCH] 1.更新文档 ;

---
 SourceCode/Bond/Servo/CStep.cpp |   51 +++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/SourceCode/Bond/Servo/CStep.cpp b/SourceCode/Bond/Servo/CStep.cpp
index dbbf161..d1907c7 100644
--- a/SourceCode/Bond/Servo/CStep.cpp
+++ b/SourceCode/Bond/Servo/CStep.cpp
@@ -6,7 +6,7 @@
 
 	CStep::CStep()
 	{
-		m_listener = {nullptr};
+		m_nID = 0;
 		m_pCclink = nullptr;
 		InitializeCriticalSection(&m_criticalSection);
 	}
@@ -14,11 +14,6 @@
 	CStep::~CStep()
 	{
 		DeleteCriticalSection(&m_criticalSection);
-	}
-
-	void CStep::setListener(StepListener listener)
-	{
-		m_listener.onEvent = listener.onEvent;
 	}
 
 	void CStep::setCcLink(CCCLinkIEControl* pCcLink)
@@ -36,6 +31,16 @@
 		return m_pEquipment;
 	}
 
+	void CStep::setID(int id)
+	{
+		m_nID = id;
+	}
+
+	int CStep::getID()
+	{
+		return m_nID;
+	}
+
 	void CStep::setName(const char* pszName)
 	{
 		m_strName = pszName;
@@ -48,11 +53,14 @@
 
 	void CStep::getAttributeVector(CAttributeVector& attrubutes)
 	{
+		unsigned int weight = 1;
 		attrubutes.clear();
 		attrubutes.addAttribute(new CAttribute("Network", 
-			std::to_string(m_station.nNetNo).c_str(), ""));
+			std::to_string(m_station.nNetNo).c_str(), "", weight++));
 		attrubutes.addAttribute(new CAttribute("Station",
-			std::to_string(m_station.nStNo).c_str(), ""));
+			std::to_string(m_station.nStNo).c_str(), "", weight++));
+		attrubutes.addAttributeVector(m_attributeVector);
+
 	}
 
 	void CStep::init()
@@ -65,6 +73,33 @@
 
 	}
 
+	void CStep::setProp(const char* pszKey, void* pValue)
+	{
+		m_mapProp[pszKey] = pValue;
+	}
+
+	void* CStep::getProp(const char* pszKey)
+	{
+		auto iter = m_mapProp.find(pszKey);
+		if (iter == m_mapProp.end()) return nullptr;
+		return iter->second;
+	}
+
+	void CStep::addAttribute(CAttribute* pAttribute)
+	{
+		// 添加attribute时,要前删除存在的同名的attribute
+		m_attributeVector.addAttribute(pAttribute, TRUE);
+	}
+
+	void CStep::addAttributeVector(CAttributeVector& attributeVector)
+	{
+		// 添加attribute时,要前删除存在的同名的attribute
+		unsigned int size = attributeVector.size();
+		for (unsigned int i = 0; i < size; i++) {
+			m_attributeVector.addAttribute(attributeVector.getAttribute(i), TRUE);
+		}
+	}
+
 	void CStep::convertString(const char* pszBuffer, int size, std::string& strOut)
 	{
 		strOut.clear();

--
Gitblit v1.9.3