From bdf0dc4cb183d3fec40e1d51b3bb94b7e53d0a55 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期日, 04 一月 2026 10:45:07 +0800
Subject: [PATCH] 1.修复报文字段差异风险： S1F3：项目用 getSubItemU4(0) 取 SVID；日志里有 U2 的情况，可能导致解析失败后回退成 SV=0。 S6F11：项目发送 DATAID(U4) + CEID(U4)；日志样例里第一个字段是 U2，可能存在类型/字段定义不一致。
---
SourceCode/Bond/Servo/CSlot.cpp | 34 ++++++++++++++++++++--------------
1 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/SourceCode/Bond/Servo/CSlot.cpp b/SourceCode/Bond/Servo/CSlot.cpp
index 8972986..629f7ac 100644
--- a/SourceCode/Bond/Servo/CSlot.cpp
+++ b/SourceCode/Bond/Servo/CSlot.cpp
@@ -11,6 +11,8 @@
m_bEnable = FALSE;
m_bLock = FALSE;
m_pContext = nullptr;
+ m_pTempContext = nullptr;
+ m_nLinkSignalPath = 0;
}
CSlot::~CSlot()
@@ -98,8 +100,8 @@
void CSlot::setContext(CContext* pContext)
{
- if (pContext != nullptr) {
- pContext->release();
+ if (m_pContext != nullptr) {
+ m_pContext->release();
}
m_pContext = pContext;
@@ -113,26 +115,30 @@
return m_pContext;
}
+ CContext* CSlot::getTempContext()
+ {
+ return m_pTempContext;
+ }
+
+ void CSlot::setLinkSignalPath(int path)
+ {
+ m_nLinkSignalPath = path;
+ }
+
+ int CSlot::getLinkSignalPath()
+ {
+ return m_nLinkSignalPath;
+ }
+
void CSlot::serialize(CArchive& ar)
{
if (ar.IsStoring()) {
- ar << m_nPosition;
- ar << m_nNo;
- ar << (int)m_materialsType;
- WriteString(ar, m_strName);
ar << (__int64)m_pContext;
- ar << m_bEnable;
ar << m_bLock;
}
else {
- int i32;
__int64 i64;
- ar >> m_nPosition;
- ar >> m_nNo;
- ar >> i32; m_materialsType = (MaterialsType)i32;
- ReadString(ar, m_strName);
- ar >> i64; m_pContext = (CContext*)i64;
- ar >> m_bEnable;
+ ar >> i64; m_pTempContext = (CContext*)i64;
ar >> m_bLock;
}
}
--
Gitblit v1.9.3