From 1c080b5ca821ef6e1d40025289195b18fa2973b5 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期一, 26 一月 2026 22:46:48 +0800
Subject: [PATCH] 1.把 m_bufGlass 的释放提前到 CMaster::term()，确保在 m_glassPool.term() 之前完成，避免析构时再触碰已被回收的 Glass。析构里仍保留原逻辑，若 term() 已清空则不会重复释放。
---
SourceCode/Bond/BondEq/CBonder.h | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/BondEq/CBonder.h b/SourceCode/Bond/BondEq/CBonder.h
index 25969f4..b72a3c3 100644
--- a/SourceCode/Bond/BondEq/CBonder.h
+++ b/SourceCode/Bond/BondEq/CBonder.h
@@ -34,6 +34,7 @@
ONRECVBROADCAST onRecvBroadcast;
} BondListener;
+class CModel;
class CBonder
{
public:
@@ -45,6 +46,7 @@
void setListener(BondListener& listener);
void setWorkDir(const char* pszWorkDir);
const std::vector<CComponent*>& getComponents();
+ void setModel(CModel* pModel);
CPLC* getPLC(const char* pszName);
int init();
int term();
@@ -69,6 +71,10 @@
int loadReady(BEQ::IUnit* pUnit, const char* pszMaterielId, const char* pszRecipeId);
int loadComplete(BEQ::IUnit* pUnit, int layer);
int unloadComplete(BEQ::IUnit* pUnit, int layer);
+ double getTackTime();
+ bool isMute();
+ void setMute(bool bMute);
+ void readTaktTime();
public:
int writeInt(int unitId, int addr, int value);
@@ -111,9 +117,18 @@
BOOL m_bAreYouThereRequest;
private:
+ CModel* m_pModel;
char* m_pPlcData;
BEQ::IEquipment* m_pEquipment;
std::map<int, CRecipe*> m_recipes;
std::string m_strCurRecipeName;
+
+private:
+ bool m_bMute;
+ bool m_bBlBtnsStates[7]; // 主页面按钮状态
+ int m_nVelocityRatio; // 速度比
+ double m_dTactTime; // 周期时间
+ int m_nDayShiftCapacity;
+ int m_nNightShiftCapacity;
};
--
Gitblit v1.9.3