From 6747bc043d0af20d6fa02a6cf385d81eb44643d0 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期六, 28 六月 2025 11:29:42 +0800
Subject: [PATCH] 1.自绘按钮，修改为支持文字在按钮下，或在按钮右。 2.日志页，修改为“包含”和“排除”关键字，以及正则表达式的支持，便于在调试过程中快速观察日志

---
 SourceCode/Bond/BondEq/AlarmMonitor.h |   24 +++++++++++++-----------
 1 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/SourceCode/Bond/BondEq/AlarmMonitor.h b/SourceCode/Bond/BondEq/AlarmMonitor.h
index ae84f65..c7cf2f1 100644
--- a/SourceCode/Bond/BondEq/AlarmMonitor.h
+++ b/SourceCode/Bond/BondEq/AlarmMonitor.h
@@ -17,24 +17,26 @@
 	virtual void onRecvBroadcast(void* pSender, CIntent* pIntent);
 	virtual void init();
 	virtual void term();
-	void setBeginAddr(int nAddr);
 	int readAlarmListFromFile(const char* pszFilepath);
 	virtual void OnTimer(UINT nTimerid);
 	const char* getAlarmText(int nID);
-	void Alarm(int id, int level);
 	virtual void Serialize(CArchive& ar);
-	void getAlarmList(std::list<CAlarm*>& list);
+	std::map<int, CAlarm*>& getAlarmingMap();
+	BOOL isAlarming();
+	CAlarm* getActiveAlarm();
+	void getAlarmRecords(std::list< CAlarm*>& list);
 
 private:
-	void AddAlarm(CAlarm* pAlarm);
+	BOOL compareData(const char* pScrData, const char* pTarData, int len);
+	int addAlarmTemplate(int id, int level, const char* pszDescription);
+	BOOL isAlarmOn(int id);
+	BOOL findAlarm(std::vector<int>& ids, int id);
+	void addAlarmToHistoryRecord(CAlarm* pAlarm);
+	BOOL addAlarming(CAlarm* pAlarm);
 
 private:
-	int m_nBeginAddr;
-
-private:
-	std::map<int, std::string> m_mapAlarmText;
-	int m_nLastId;
-	int m_nLastLevel;
-	std::list<CAlarm*> m_alarms;
+	std::map<int, CAlarm*> m_mapAlarmTemplate;	// 这是警告的模板，从文件加载
+	std::map<int, CAlarm*> m_mapAlarming;		// 正在发生的警告
+	char* m_pRawData;
 };
 

--
Gitblit v1.9.3