From a549ad408c941bfebd863c8537bc30520659c293 Mon Sep 17 00:00:00 2001
From: LAPTOP-T815PCOQ\25526 <mr.liuyang@126.com>
Date: 星期二, 24 十二月 2024 17:47:41 +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