From 829fe6c6bc33d53fda9c31fd45a37e1df87befff Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期五, 30 一月 2026 11:16:24 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
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