From 5a8bbd2426aeacdbbb2fdb1a7f7a1adce0cac7f9 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期五, 01 八月 2025 16:23:29 +0800
Subject: [PATCH] 1. 新增以下功能函数并集成:    - InitStorage():初始化存储区域    - StartStorage():开始数据存储    - StopStorage():停止存储并自动提取、分析数据    - AnalyzeStoredData():分析指定端口数据,返回偏移量

---
 SourceCode/Bond/BondEq/Alarm.h |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/SourceCode/Bond/BondEq/Alarm.h b/SourceCode/Bond/BondEq/Alarm.h
index 9b3a354..12b4a26 100644
--- a/SourceCode/Bond/BondEq/Alarm.h
+++ b/SourceCode/Bond/BondEq/Alarm.h
@@ -6,14 +6,19 @@
 {
 public:
 	CAlarm();
-	CAlarm(int unitId, int status, int id, int level, const char* pszText);
+	CAlarm(int id, int level, const char* pszText);
+	CAlarm(int status, int id, int level, const char* pszText);
+	CAlarm(CAlarm* pScr);
 	~CAlarm();
 
 public:
 	virtual std::string& getClassName();
 	virtual std::string toString();
 	int getUnitId();
-	ULONGLONG getTime();
+	void alarmOn();
+	void alarmOff();
+	ULONGLONG getOnTime();
+	ULONGLONG getOffTime();
 	int getId();
 	int getLevel();
 	int getStatus();
@@ -22,8 +27,9 @@
 
 private:
 	int m_nUnitId;
-	ULONG64 m_time;
-	int m_nStatus;
+	ULONG64 m_timeOn;
+	ULONG64 m_timeOff;
+	int m_nStatus;				// 0:未知;1:ON;2:OFF;
 	int m_nId;
 	int m_nLevel;
 	std::string m_strText;

--
Gitblit v1.9.3