From 8294c107676c18538c6e06fe8eab2d209604ac6a Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期一, 19 一月 2026 18:34:06 +0800
Subject: [PATCH] 1.完善和优化界面显示,数据懒加载,等待光标等,修复启动时界面卡的问题。 2.SVData的Push的限制和检查,因发现Glass呆在机器中时,不管机台是否运行都在不停压入数据。

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

diff --git a/SourceCode/Bond/Servo/CWriteStep.cpp b/SourceCode/Bond/Servo/CWriteStep.cpp
index 0470421..2e79b5a 100644
--- a/SourceCode/Bond/Servo/CWriteStep.cpp
+++ b/SourceCode/Bond/Servo/CWriteStep.cpp
@@ -55,6 +55,18 @@
 		m_nWriteSignalDev = dev;
 	}
 
+	void CWriteStep::setRetDataDev(int dev, int size)
+	{
+		m_nReturnDevNo = dev;
+		m_nReturnDataSize = size;
+	}
+
+	int CWriteStep::getReturnData(const char*& pszData)
+	{
+		pszData = m_szReturnBuf;
+		return m_nReturnDataSize;
+	}
+
 	void CWriteStep::onRecvSignal(BOOL bSignal)
 	{
 		Lock();
@@ -111,6 +123,18 @@
 					goto RESET;
 				}
 				ResetEvent(m_hRecvSignalOn);
+
+
+				// 3.9读数据,如果有
+				if (m_nReturnDataSize > 0) {
+					int nRet = m_pCclink->ReadData2(m_station, DeviceType::W, m_nReturnDevNo,
+						(long)min(READ_BUFFER_MAX, m_nReturnDataSize), m_szReturnBuf);
+					if (0 != nRet) {
+						LOGI("<CEqReadStep>Read return data error.");
+						onReadRetDataError();
+						return -1;
+					}
+				}
 
 
 				// 4.写OFF
@@ -196,4 +220,9 @@
 	{
 		return 0;
 	}
+
+	int CWriteStep::onReadRetDataError()
+	{
+		return 0;
+	}
 }

--
Gitblit v1.9.3