From c55e355700e462d281da22e49d22d5a81fdef183 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期四, 03 七月 2025 15:26:08 +0800
Subject: [PATCH] 1.人工搬出后实时刷新界面,去掉小绿点；
---
SourceCode/Bond/Servo/CEqVcrEventStep.cpp | 2 +-
SourceCode/Bond/Servo/CEqAlarmStep.cpp | 2 +-
SourceCode/Bond/Servo/CEquipment.cpp | 4 ++++
SourceCode/Bond/Servo/Model.cpp | 4 ++--
4 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEqAlarmStep.cpp b/SourceCode/Bond/Servo/CEqAlarmStep.cpp
index f488927..dcbd9b7 100644
--- a/SourceCode/Bond/Servo/CEqAlarmStep.cpp
+++ b/SourceCode/Bond/Servo/CEqAlarmStep.cpp
@@ -58,7 +58,7 @@
m_nAlarmCode = (unsigned int)CToolUnits::toInt16(&szBuffer[6]);
m_nAlarmLevel = (unsigned int)CToolUnits::toInt16(&szBuffer[8]);
- LOGI("<CEqAlarmStep> Equipment Alarm state Changed<State:%d, Unit:%d, Level:%d, Code:%d, ID:%d>\n",
+ LOGI("<CEqAlarmStep> Equipment Alarm state Changed<State:%d, Unit:%d, Level:%d, Code:%d, ID:%d>",
m_nAlarmState, m_nUnitId, m_nAlarmLevel, m_nAlarmCode, m_nAlarmId,
m_strText.c_str(), m_strDescription.c_str());
diff --git a/SourceCode/Bond/Servo/CEqVcrEventStep.cpp b/SourceCode/Bond/Servo/CEqVcrEventStep.cpp
index fd24db2..dbe4fc9 100644
--- a/SourceCode/Bond/Servo/CEqVcrEventStep.cpp
+++ b/SourceCode/Bond/Servo/CEqVcrEventStep.cpp
@@ -54,7 +54,7 @@
}
m_vcrEventReport.unserialize(szBuffer, 60);
- LOGI("<CEqVcrEventStep-%s>Read VCR Event Report\n", m_strName.c_str());
+ LOGI("<CEqVcrEventStep-%s>Read VCR Event Report", m_strName.c_str());
return 0;
}
diff --git a/SourceCode/Bond/Servo/CEquipment.cpp b/SourceCode/Bond/Servo/CEquipment.cpp
index 70c6134..c670d76 100644
--- a/SourceCode/Bond/Servo/CEquipment.cpp
+++ b/SourceCode/Bond/Servo/CEquipment.cpp
@@ -1402,6 +1402,10 @@
if (pSlot == nullptr) return -1;
pSlot->setContext(nullptr);
+ if (m_listener.onDataChanged != nullptr) {
+ m_listener.onDataChanged(this, EDCC_FETCHOUT_JOB);
+ }
+
return 0;
}
diff --git a/SourceCode/Bond/Servo/Model.cpp b/SourceCode/Bond/Servo/Model.cpp
index c2acb85..6c36c56 100644
--- a/SourceCode/Bond/Servo/Model.cpp
+++ b/SourceCode/Bond/Servo/Model.cpp
@@ -121,13 +121,13 @@
notify(RX_CODE_MASTER_STATE_CHANGED);
};
masterListener.onEqAlive = [&](void* pMaster, SERVO::CEquipment* pEquipment, BOOL bAlive) -> void {
- LOGI("<CModel>Equipment onAlive:%s(%s).\n", pEquipment->getName().c_str(),
+ LOGI("<CModel>Equipment onAlive:%s(%s).", pEquipment->getName().c_str(),
bAlive ? _T("ON") : _T("OFF"));
notifyPtr(RX_CODE_EQ_ALIVE, pEquipment);
};
masterListener.onEqCimStateChanged = [&](void* pMaster, SERVO::CEquipment* pEquipment, BOOL bOn) -> void {
- LOGI("<CModel>Equipment Cim State:%s(%s).\n", pEquipment->getName().c_str(),
+ LOGI("<CModel>Equipment Cim State:%s(%s).", pEquipment->getName().c_str(),
bOn ? _T("ON") : _T("OFF"));
notifyPtr(RX_CODE_EQ_ALIVE, pEquipment);
--
Gitblit v1.9.3