From 84925ada39fdef3f5bd7266005010103897713a6 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 11 七月 2025 17:49:15 +0800
Subject: [PATCH] 1.EAP模拟器，启用或禁用警告上报功能实现和模拟测试； 2.Master端，收到EAP的启用或警告消息上报消息后，保存相关配置，如后续机器发生警告，根据配置决定是否上报警告消息；
---
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