From a549ad408c941bfebd863c8537bc30520659c293 Mon Sep 17 00:00:00 2001
From: LAPTOP-T815PCOQ\25526 <mr.liuyang@126.com>
Date: 星期二, 24 十二月 2024 17:47:41 +0800
Subject: [PATCH] 1.添加主页面 2.修复配方列表切换配方出现标签闪烁问题(主题颜色是白色,标签控件不是,所以刷新的时候先刷新成主题颜色)

---
 SourceCode/Bond/BondEq/CBonder.h |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/SourceCode/Bond/BondEq/CBonder.h b/SourceCode/Bond/BondEq/CBonder.h
index 295cac7..25969f4 100644
--- a/SourceCode/Bond/BondEq/CBonder.h
+++ b/SourceCode/Bond/BondEq/CBonder.h
@@ -18,9 +18,11 @@
 #define STATE_ERROR			3		/* 发生故障 */
 
 
+#define ALARM_MONITOR		_T("警告信息")
+
+
 typedef std::function<void(void* pFrom, int)> ONBONDSTATECHANGED;
 typedef std::function<void(void* pFrom, int)> ONPLCSTATECHANGED;
-typedef std::function<void(void* pFrom, int)> ONCIMSTATECHANGED;
 typedef std::function<void(void* pFrom, const char* pszAddr, int port, int)> ONEFEMSTATECHANGED;
 typedef std::function<void(void* pFrom, void*)> ONRECVBROADCAST;
 
@@ -28,7 +30,6 @@
 {
 	ONBONDSTATECHANGED		onStateChanged;
 	ONPLCSTATECHANGED		onPlcStateChanged;
-	ONCIMSTATECHANGED		onCimStateChanged;
 	ONEFEMSTATECHANGED		onEfemStateChanged;
 	ONRECVBROADCAST			onRecvBroadcast;
 } BondListener;
@@ -44,6 +45,7 @@
 	void setListener(BondListener& listener);
 	void setWorkDir(const char* pszWorkDir);
 	const std::vector<CComponent*>& getComponents();
+	CPLC* getPLC(const char* pszName);
 	int init();
 	int term();
 	void sendBroadcast(CComponent* pSender, CIntent* pIntent);

--
Gitblit v1.9.3