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/BEQLibrary/Unit.cpp | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/BEQLibrary/Unit.cpp b/SourceCode/Bond/BEQLibrary/Unit.cpp
index df10698..a5e49e2 100644
--- a/SourceCode/Bond/BEQLibrary/Unit.cpp
+++ b/SourceCode/Bond/BEQLibrary/Unit.cpp
@@ -62,6 +62,7 @@
m_listener.onRemoveAlarm = listener.onRemoveAlarm;
m_listener.onStepChanged = listener.onStepChanged;
m_listener.onDataChanged = listener.onDataChanged;
+ m_listener.onReqNotReady = listener.onReqNotReady;
m_listener.onReqLoad = listener.onReqLoad;
m_listener.onReqUnload = listener.onReqUnload;
}
@@ -212,6 +213,22 @@
return m_strAlarmText;
}
+ int CUnit::reqNotReady(int layer)
+ {
+ ASSERT(m_listener.onReqNotReady);
+ if (layer <= 0) return -1;
+ if (layer > m_nLayerCount) return -2;
+
+ // 状态改变才回调到上层
+ if (m_nLayerLoadState[layer - 1] != LAYER_NOT_READY) {
+ m_nLayerLoadState[layer - 1] = LAYER_NOT_READY;
+ m_listener.onReqNotReady(this, layer);
+ return 0;
+ }
+
+ return -3;
+ }
+
int CUnit::reqLoad(int layer)
{
ASSERT(m_listener.onReqLoad);
--
Gitblit v1.9.3