From aabaff9cdcf9bb279b762891aedda5a03571fbb5 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期二, 01 七月 2025 08:55:07 +0800
Subject: [PATCH] 1.修改Glass的JobDataS的更新逻辑,在收到OnReceiveJob时,机器内未保存和管理Glass, 此时Glass在Arm上,应通过Arm来更新JobDataS;

---
 SourceCode/Bond/Servo/CDoubleGlass.cpp |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/SourceCode/Bond/Servo/CDoubleGlass.cpp b/SourceCode/Bond/Servo/CDoubleGlass.cpp
index 1701145..782685a 100644
--- a/SourceCode/Bond/Servo/CDoubleGlass.cpp
+++ b/SourceCode/Bond/Servo/CDoubleGlass.cpp
@@ -1,5 +1,7 @@
 #include "stdafx.h"
+#include "Servo.h"
 #include "CDoubleGlass.h"
+#include "CGlassPool.h"
 
 
 namespace SERVO {
@@ -72,11 +74,11 @@
 			ULONGLONG ulGlass1;
 			ar >> ulGlass1;
 			if (ulGlass1 != 0) {
-				m_pGlass1 = new CGlass();
+				m_pGlass1 = theApp.m_model.m_glassPool.allocaGlass();
 				m_pGlass1->serialize(ar);
 			}
 			if (ulGlass1 != 0) {
-				m_pGlass2 = new CGlass();
+				m_pGlass2 = theApp.m_model.m_glassPool.allocaGlass();
 				m_pGlass2->serialize(ar);
 			}
 

--
Gitblit v1.9.3