From 944e8f3dea723404e21168e97116cca2c09c70cb Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期二, 27 一月 2026 15:26:29 +0800
Subject: [PATCH] 1.扫码事件上报，之前只上报OK一种情况，现在有事种状态。 2.Port事件上报关联PortID, 统一修改为VID：PortID，之前分开很多种。
---
SourceCode/Bond/Servo/CEqReadStep.cpp | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEqReadStep.cpp b/SourceCode/Bond/Servo/CEqReadStep.cpp
index e94ba79..f4fe44f 100644
--- a/SourceCode/Bond/Servo/CEqReadStep.cpp
+++ b/SourceCode/Bond/Servo/CEqReadStep.cpp
@@ -38,18 +38,29 @@
CReadStep::onReadData();
+ // 20250620新增，有些场景是不需要读数据的，只要检测到信息就写数据给机器
+ if (m_nReadSize == 0) {
+ if (m_onReadBlock != nullptr) {
+ m_onReadBlock(this, ROK, nullptr, 0);
+ }
+
+ return 0;
+ }
+
+
+ // 读数据
char szBuffer[READ_BUFFER_MAX];
int nRet = m_pCclink->ReadData2(m_station, DeviceType::W, m_nDataDev,
(long)min(READ_BUFFER_MAX, m_nReadSize), szBuffer);
if (0 != nRet) {
- LOGI("<CEqReadStep>Read data error.");
+ LOGE("<CEqReadStep>Read data error.");
if (m_onReadBlock != nullptr) {
m_onReadBlock(this, RERROR, nullptr, 0);
}
return -1;
}
- LOGI("<CEqReadStep>read data succeed.");
+ LOGD("<CEqReadStep>read data succeed.");
if (m_onReadBlock != nullptr) {
m_onReadBlock(this, ROK, szBuffer, m_nReadSize);
}
@@ -61,7 +72,7 @@
int CEqReadStep::onComplete()
{
CReadStep::onComplete();
- LOGI("<CEqReadStep> onComplete.");
+ LOGD("<CEqReadStep> onComplete.");
if (m_onReadBlock != nullptr) {
m_onReadBlock(this, RCOMPLETE, nullptr, 0);
}
@@ -72,7 +83,7 @@
int CEqReadStep::onTimeout()
{
CReadStep::onTimeout();
- LOGI("<CEqReadStep> onTimeout.");
+ LOGE("<CEqReadStep> onTimeout.");
if (m_onReadBlock != nullptr) {
m_onReadBlock(this, RTIMEOUT, nullptr, 0);
}
--
Gitblit v1.9.3