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/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