From 5b1d01e622d2879b7c7ac5f928b184af185bf880 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期三, 27 八月 2025 18:19:23 +0800
Subject: [PATCH] 1.Slot显示Glass时,增加G1G2显示类型,方便调试观察;

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

diff --git a/SourceCode/Bond/BondEq/Alarm.cpp b/SourceCode/Bond/BondEq/Alarm.cpp
index 266e4ca..ef82a47 100644
--- a/SourceCode/Bond/BondEq/Alarm.cpp
+++ b/SourceCode/Bond/BondEq/Alarm.cpp
@@ -107,22 +107,24 @@
 	if (ar.IsStoring())
 	{
 		Lock();
+		ar << m_nUnitId;
+		ar << m_nId;
+		ar << m_nLevel;
 		ar << m_timeOn;
 		ar << m_timeOff;
 		ar << m_nStatus;
-		ar << m_nId;
-		ar << m_nLevel;
 		WriteString(ar, m_strText);
 		Unlock();
 	}
 	else
 	{
 		Lock();
+		ar >> m_nUnitId;
+		ar >> m_nId;
+		ar >> m_nLevel;
 		ar >> m_timeOn;
 		ar >> m_timeOff;
 		ar >> m_nStatus;
-		ar >> m_nId;
-		ar >> m_nLevel;
 		ReadString(ar, m_strText);
 		Unlock();
 	}

--
Gitblit v1.9.3