From 789af4f4a7baee07bd6c2c03588afcb19555343b Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期三, 16 七月 2025 14:00:32 +0800
Subject: [PATCH] 1.CollectionEvent列表从文件加载，界面上显示；
---
SourceCode/Bond/Servo/HsmsPassive.h | 43 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 43 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/Servo/HsmsPassive.h b/SourceCode/Bond/Servo/HsmsPassive.h
index 38ba909..742c7fc 100644
--- a/SourceCode/Bond/Servo/HsmsPassive.h
+++ b/SourceCode/Bond/Servo/HsmsPassive.h
@@ -5,6 +5,7 @@
#include <functional>
#include <vector>
#include <map>
+#include "CCollectionEvent.h"
#define EQCONSTANT_VALUE_MAX 64
@@ -61,6 +62,8 @@
typedef std::function<void(void* pFrom, std::vector<EQConstant>&)> SECSEQCONSTANTREQUEST;
typedef std::function<void(void* pFrom, const char*, std::vector<CommandParameter>&)> SECSCommand;
typedef std::function<void(void* pFrom, SYSTEMTIME& time)> DATETIMESYNC;
+typedef std::function<void(void* pFrom, bool bEnable, std::vector<unsigned int>& ids)> EDEVENTREPORT;
+typedef std::function<void(void* pFrom, bool bEnable, unsigned int id)> EDALARMREPORT;
typedef struct _SECSListener
{
SECSEQOFFLINE onEQOffLine;
@@ -69,6 +72,8 @@
SECSEQCONSTANTREQUEST onEQConstantSend;
SECSCommand onCommand;
DATETIMESYNC onDatetimeSync;
+ EDEVENTREPORT onEnableDisableEventReport;
+ EDALARMREPORT onEnableDisableAlarmReport;
} SECSListener;
@@ -103,8 +108,34 @@
// 取消 define report
void deleteReport(unsigned int RPTID);
+ // 从文件中加载CVariable列表
+ int loadVarialbles(const char* pszFilepath);
+
+ // 取得CVariable列表
+ std::vector<SERVO::CVariable*>& getVariables();
+
+ // 取得指定Variable
+ SERVO::CVariable* getVariable(int variableId);
+
+ // 从文件中加载CReport列表
+ int loadReports(const char* pszFilepath);
+
// 取消/删除所有 define report
void deleteAllReport();
+
+ // 取得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();
@@ -142,6 +173,9 @@
inline void Lock() { EnterCriticalSection(&m_criticalSection); }
inline void Unlock() { LeaveCriticalSection(&m_criticalSection); }
int onRecvMsg(IMessage* pMessage);
+ void clearAllVariabel();
+ std::vector<unsigned int> parseVidList(CString& strNums);
+ void clearAllReport();
private:
CModel* m_pModel;
@@ -175,5 +209,14 @@
// VID to Report
std::map<unsigned int, VALUE> m_mapValue;
+
+ // CVariable vector
+ std::vector<SERVO::CVariable*> m_variabels;
+
+ // CReport vector
+ std::vector<SERVO::CReport*> m_reports;
+
+ // CollectionEvent vector
+ std::vector<SERVO::CCollectionEvent*> m_collectionEvent;
};
--
Gitblit v1.9.3