From 217f07665553605caa3f3339321d04bd2c3e8256 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期四, 15 五月 2025 17:18:58 +0800
Subject: [PATCH] 1.Bonder 处理ProcessDataReport, 并将G1与G2绑定一起。
---
SourceCode/Bond/Servo/CGlass.cpp | 41 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 39 insertions(+), 2 deletions(-)
diff --git a/SourceCode/Bond/Servo/CGlass.cpp b/SourceCode/Bond/Servo/CGlass.cpp
index 410868a..e2b6259 100644
--- a/SourceCode/Bond/Servo/CGlass.cpp
+++ b/SourceCode/Bond/Servo/CGlass.cpp
@@ -7,6 +7,7 @@
{
m_pPath = nullptr;
m_type = MaterialsType::G1;
+ m_pBuddy = nullptr;
}
CGlass::~CGlass()
@@ -18,6 +19,10 @@
pPath = pTemp;
}
m_pPath = nullptr;
+
+ if (m_pBuddy != nullptr && m_type == MaterialsType::G1) {
+ m_pBuddy->release();
+ }
}
std::string& CGlass::getClassName()
@@ -90,6 +95,7 @@
if (ar.IsStoring())
{
Lock();
+ ar << (int)m_type;
WriteString(ar, m_strID);
ar << (ULONGLONG)m_pPath;
if (m_pPath != nullptr) {
@@ -100,13 +106,19 @@
ar.Write(temp, JOBDATAB_SIZE);
m_jobDataS.serialize(temp, JOBDATAS_SIZE);
ar.Write(temp, JOBDATAS_SIZE);
+ ar << (ULONGLONG)m_pBuddy;
+ WriteString(ar, m_strBuddyId);
Unlock();
}
else
{
- Lock();
- ReadString(ar, m_strID);
ULONGLONG ullPath;
+ int type;
+
+ Lock();
+ ar >> type;
+ m_type = (MaterialsType)type;
+ ReadString(ar, m_strID);
ar >> ullPath;
if (ullPath != 0) {
m_pPath = new CPath();
@@ -117,6 +129,8 @@
m_jobDataB.unserialize(temp, JOBDATAB_SIZE);
ar.Read(temp, JOBDATAS_SIZE);
m_jobDataS.unserialize(temp, JOBDATAS_SIZE);
+ ar >> ullPath; // 这是m_pBuddy, 用不上
+ ReadString(ar, m_strBuddyId);
Unlock();
}
}
@@ -140,4 +154,27 @@
{
return &m_jobDataS;
}
+
+ BOOL CGlass::setBuddy(CGlass* pGlass)
+ {
+ if (m_pBuddy != nullptr) return FALSE;
+ if (pGlass->getType() == this->getType()) return FALSE;
+ m_pBuddy = pGlass;
+ if (m_type == MaterialsType::G1) {
+ m_pBuddy->addRef();
+ }
+ m_strBuddyId = m_pBuddy->getID();
+
+ return TRUE;
+ }
+
+ CGlass* CGlass::getBuddy()
+ {
+ return m_pBuddy;
+ }
+
+ std::string& CGlass::getBuddyId()
+ {
+ return m_strBuddyId;
+ }
}
--
Gitblit v1.9.3