From 7c35ff8d9a626f69a8a8b7de3d73dc9d73de9dd7 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期六, 13 九月 2025 10:51:32 +0800
Subject: [PATCH] 1. 解决读取报警文件错误的问题，提高兼容性（可能文件是在MacOS编辑的，导致换行符不一样）
---
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