From 726f0553fa435809d10c8a33abe46473ee975db1 Mon Sep 17 00:00:00 2001
From: LAPTOP-T815PCOQ\25526 <mr.liuyang@126.com>
Date: 星期二, 10 十二月 2024 16:37:00 +0800
Subject: [PATCH] 1. 完善axis细部设定人机交互（数据填充和文件保存）

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

diff --git a/SourceCode/Bond/BondEq/AlarmMonitor.h b/SourceCode/Bond/BondEq/AlarmMonitor.h
index ae84f65..ecf7cbd 100644
--- a/SourceCode/Bond/BondEq/AlarmMonitor.h
+++ b/SourceCode/Bond/BondEq/AlarmMonitor.h
@@ -17,24 +17,24 @@
 	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);
+	void getAlarmingMap(std::map<int, CAlarm*>& alarms);
+	BOOL isAlarming();
 
 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);
 
 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;		// 正在发生的警告
+	std::list< CAlarm*> m_alarms;				// 历史发生的警告信息，考虑保存一定数量
+	char* m_pRawData;
 };
 

--
Gitblit v1.9.3