From bdf0dc4cb183d3fec40e1d51b3bb94b7e53d0a55 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期日, 04 一月 2026 10:45:07 +0800
Subject: [PATCH] 1.修复报文字段差异风险： S1F3：项目用 getSubItemU4(0) 取 SVID；日志里有 U2 的情况，可能导致解析失败后回退成 SV=0。 S6F11：项目发送 DATAID(U4) + CEID(U4)；日志样例里第一个字段是 U2，可能存在类型/字段定义不一致。
---
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