From d6d85fd225db353ab5786725d5a2fc777308f276 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 25 七月 2025 10:40:53 +0800
Subject: [PATCH] 1.EAP模拟端，已增加发送Link Event Report功能接口并正确发送数据，待Master解释和逻辑处理。

---
 SourceCode/Bond/Servo/HsmsPassive.h |   30 ++++++++++++++++++++----------
 1 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/SourceCode/Bond/Servo/HsmsPassive.h b/SourceCode/Bond/Servo/HsmsPassive.h
index 7549e7c..7dbbbf6 100644
--- a/SourceCode/Bond/Servo/HsmsPassive.h
+++ b/SourceCode/Bond/Servo/HsmsPassive.h
@@ -103,13 +103,11 @@
 	unsigned int getCEID(int RPTID);
 
 	// define Report
-	void defineReport(unsigned int VID, unsigned int RPTID);
+	SERVO::CReport* defineReport(unsigned int RPTID, std::vector<unsigned int>& vids);
 
 	// 取消 define report
-	void deleteReport(unsigned int RPTID);
-
-	// 取消/删除所有 define report
-	void deleteAllReport();
+	bool removeReport(int rptid);
+	void clearAllReport();
 
 	// 从文件中加载CVariable列表
 	int loadVarialbles(const char* pszFilepath);
@@ -120,10 +118,23 @@
 	// 取得指定Variable
 	SERVO::CVariable* getVariable(int variableId);
 
-	// 从文件中加载CReport表表
+	// 从文件中加载CReport列表
 	int loadReports(const char* pszFilepath);
 
+	// 取得Report列表
 	std::vector<SERVO::CReport*>& getReports();
+
+	// 从文件中加载CCollectionEvent列表
+	int loadCollectionEvents(const char* pszFilepath);
+
+	// 取得CCollectionEvent列表
+	std::vector<SERVO::CCollectionEvent*>& getCollectionEvents();
+
+	// 取消/删除所有CollectionEvent
+	void clearAllCollectionEvent();
+
+
+	SERVO::CReport* getReport(int rptid);
 
 	void setListener(SECSListener listener);
 	unsigned OnCimWork();
@@ -163,7 +174,6 @@
 	int onRecvMsg(IMessage* pMessage);
 	void clearAllVariabel();
 	std::vector<unsigned int> parseVidList(CString& strNums);
-	void clearAllReport();
 
 private:
 	CModel* m_pModel;
@@ -192,9 +202,6 @@
 	// RPTID to Report
 	std::map<unsigned int, REPORT> m_mapReport;
 
-	// VID to RPTID
-	std::map<unsigned int, unsigned int> m_mapValueIdToPRTID;
-
 	// VID to Report
 	std::map<unsigned int, VALUE> m_mapValue;
 
@@ -203,5 +210,8 @@
 
 	// CReport vector
 	std::vector<SERVO::CReport*> m_reports;
+
+	// CollectionEvent vector
+	std::vector<SERVO::CCollectionEvent*> m_collectionEvent;
 };
 

--
Gitblit v1.9.3