From 7203ac92219156addaa0d4b6e6a9d81b5ffe8a13 Mon Sep 17 00:00:00 2001
From: Darker <mr.darker@163.com>
Date: 星期三, 26 二月 2025 09:56:59 +0800
Subject: [PATCH] 1. 添加报警对话框的按钮 2. 接受报警消息,并获取数据添加到数据库和显示在界面列表

---
 SourceCode/Bond/Servo/Model.cpp |   53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 53 insertions(+), 0 deletions(-)

diff --git a/SourceCode/Bond/Servo/Model.cpp b/SourceCode/Bond/Servo/Model.cpp
index c4e39d0..38ad39f 100644
--- a/SourceCode/Bond/Servo/Model.cpp
+++ b/SourceCode/Bond/Servo/Model.cpp
@@ -57,10 +57,61 @@
 	});
 
 
+	SECSListener listener;
+	listener.onEQOffLine = [&](void* pFrom) -> void {
+		LOGI("远程请求OffLine");
+	};
+	listener.onEQOnLine = [&](void* pFrom) -> void {
+		LOGI("远程请求OnLine");
+	};
+	listener.onCommand = [&](void* pFrom, const char* pszName, std::vector<CommandParameter>& params) -> void {
+		LOGI("onCommand:%s", pszName);
+		for (auto& item : params) {
+			LOGI("param:%s,%s", item.szName, item.szValue);
+		}
+	};
+	listener.onEQConstantRequest = [&](void* pFrom, std::vector<EQConstant>& eqcs) -> void {
+		// 在此填充常量值,目前仅是加1后返回
+		for (auto& item : eqcs) {
+			sprintf_s(item.szValue, 256, "Test%d", item.id+1);
+		}
+	};
+	listener.onEQConstantSend = [&](void* pFrom, std::vector<EQConstant>& eqcs) -> void {
+		// 在此保存和设置机器常量值
+		for (auto& item : eqcs) {
+			LOGI("onEQConstantRequest: %d, %s", item.id, item.szValue);
+		}
+	};
+
+	m_hsmsPassive.setListener(listener);
 	m_hsmsPassive.setEquipmentModelType((LPTSTR)(LPCTSTR)strModeType);
 	m_hsmsPassive.setSoftRev((LPTSTR)(LPCTSTR)strSoftRev);
 	m_hsmsPassive.init(this, "APP", 7000);
 
+
+	SERVO::MasterListener masterListener;
+	masterListener.onEqAlive = [&](void* pMaster, SERVO::CEquipment* pEquipment, BOOL bAlive) -> void {
+		LOGI("<CModel>Equipment onAlive:%s(%s).\n", 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(),
+			bOn ? _T("ON") : _T("OFF"));
+		notifyPtr(RX_CODE_EQ_ALIVE, pEquipment);
+
+	};
+	masterListener.onEqStepEvent = [&](SERVO::CStep* pStep, int code, void* pData) -> void {
+		if (code == STEP_EVENT_READDATA) {
+			LOGI("<CModel>onEqStepEvent,数据变化:%s(%s, 0x%x).\n", pStep->getEquipment()->getName().c_str(),
+				pStep->getName().c_str(), pData);
+			notifyPtr(RX_CODE_STEP_EVENT_READDATA, pStep);
+			
+		}
+	};
+
+	m_master.setListener(masterListener);
 
 	return 0;
 }
@@ -69,6 +120,8 @@
 {
 	m_hsmsPassive.term();
 	CLog::GetLog()->SetOnLogCallback(nullptr);
+	m_master.term();
+
 	return 0;
 }
 

--
Gitblit v1.9.3