From 3e91a18f75a75fbe8f646d73e4e68ba107b6750b Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期四, 08 一月 2026 21:04:26 +0800
Subject: [PATCH] 1.增加状态是否远程禁等逻辑；
---
SourceCode/Bond/Servo/Model.cpp | 40 +++++++++++++++++++++++++++++++++++++---
1 files changed, 37 insertions(+), 3 deletions(-)
diff --git a/SourceCode/Bond/Servo/Model.cpp b/SourceCode/Bond/Servo/Model.cpp
index bbff0f7..bb5d5ff 100644
--- a/SourceCode/Bond/Servo/Model.cpp
+++ b/SourceCode/Bond/Servo/Model.cpp
@@ -31,6 +31,24 @@
m_hsmsPassive.setVariableValue("PJobSpace", (__int64)(m_master.isProcessJobsEmpty() ? 1 : 0));
}
+void CModel::setControlState(ControlState newState)
+{
+ const auto prev = m_currentControlState;
+ if (newState != m_currentControlState) {
+ m_hsmsPassive.setVariableValue("PreviousControlState", (__int64)static_cast<uint8_t>(prev));
+ m_currentControlState = newState;
+ }
+
+ // Always keep SV in sync (even if state didn't change or variables were just loaded).
+ m_hsmsPassive.setVariableValue("CurrentControlState", (__int64)static_cast<uint8_t>(m_currentControlState));
+
+ if (newState != prev) {
+ // S6F11 (CEID=600): ControlStateChanged
+ m_hsmsPassive.requestEventReportSend("ControlStateChanged");
+ notifyInt(RX_CODE_CONTROL_STATE_CHANGED, static_cast<int>(m_currentControlState));
+ }
+}
+
IObservable* CModel::getObservable()
{
if (m_pObservable == nullptr) {
@@ -117,16 +135,31 @@
SECSListener listener;
- listener.onEQOffLine = [&](void* pFrom) -> void {
+ listener.onEQOffLine = [this](void* pFrom) -> void {
LOGI("杩滅▼璇锋眰OffLine");
+ (void)pFrom;
+ setControlState(ControlState::OfflineHost);
};
- listener.onEQOnLine = [&](void* pFrom) -> void {
+ listener.onEQOnLine = [this](void* pFrom) -> void {
LOGI("杩滅▼璇锋眰OnLine");
+ (void)pFrom;
+ // Customer flow: S1F17 RequestOnline defaults to OnlineRemote.
+ setControlState(ControlState::OnlineRemote);
};
- listener.onCommand = [&](void* pFrom, const char* pszName, std::vector<CommandParameter>& params) -> void {
+ listener.onCommand = [this](void* pFrom, const char* pszName, std::vector<CommandParameter>& params) -> void {
LOGI("onCommand:%s", pszName);
+ (void)pFrom;
for (auto& item : params) {
LOGI("param:%s,%s", item.szName, item.szValue);
+ }
+
+ if (pszName == nullptr) return;
+ // S2F41 GoLocal / GoRemote (RCMD)
+ if (_strcmpi(pszName, "GoLocal") == 0 || _strcmpi(pszName, "LOCAL") == 0 || _strcmpi(pszName, "GoLOCAL") == 0) {
+ setControlState(ControlState::OnlineLocal);
+ }
+ else if (_strcmpi(pszName, "GoRemote") == 0 || _strcmpi(pszName, "REMOTE") == 0 || _strcmpi(pszName, "GoREMOTE") == 0) {
+ setControlState(ControlState::OnlineRemote);
}
};
listener.onEQConstantRequest = [&](void* pFrom, std::vector<EQConstant>& eqcs) -> void {
@@ -253,6 +286,7 @@
CString strVarialbleFile;
strVarialbleFile.Format(_T("%s\\VariableList.txt"), (LPTSTR)(LPCTSTR)m_strWorkDir);
m_hsmsPassive.loadVarialbles((LPTSTR)(LPCTSTR)strVarialbleFile);
+ setControlState(m_currentControlState);
refreshDerivedSVs();
m_hsmsPassive.init(this, "APP", 7000);
strVarialbleFile.Format(_T("%s\\ReportList.txt"), (LPTSTR)(LPCTSTR)m_strWorkDir);
--
Gitblit v1.9.3