From 4a1d72850cf1d28c3f5f99f93dcb0136089a0918 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期二, 03 十二月 2024 16:34:33 +0800
Subject: [PATCH] 1.IO页面，上一页、下一页按钮根据页号禁用或启用； 2.PLC页，修复在连接前打开闪退的问题。同进根据连接状态启用或禁用按钮组；

---
 SourceCode/Bond/BondEq/Model.h |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/SourceCode/Bond/BondEq/Model.h b/SourceCode/Bond/BondEq/Model.h
index 9a74296..1d243a3 100644
--- a/SourceCode/Bond/BondEq/Model.h
+++ b/SourceCode/Bond/BondEq/Model.h
@@ -1,6 +1,8 @@
 #pragma once
-#include "Bonder.h"
+#include "CBonder.h"
 #include "Configuration.h"
+#include "CPanel.h"
+#include "GB2860SQLite.h"
 
 
 class CModel
@@ -15,9 +17,8 @@
 	int init();
 	int term();
 	void onTimer(UINT nTimerid);
-	int createRemoteEqs();
 	CBonder& getBonder();
-	BEQ::IRemoteEquipment* getBond1();
+	BEQ::IEquipment* getEquipment();
 
 public:
 	int notify(int code);
@@ -31,6 +32,9 @@
 	int notifyTextAndInt(int code, const char* pszText, int exCode);
 	int notifyMesMsg(int code, int stream, int function, const char* pszText);
 
+private:
+	int savePanel(CPanel* pPanel, CComponent* pComponent);
+
 public:
 	CConfiguration m_configuration;
 
@@ -43,8 +47,8 @@
 
 private:
 	CBonder m_bonder;
-	BEQ::IServo* m_pServo;
-	BEQ::IRemoteEquipment* m_pEqBond1;
+	BEQ::IEquipment* m_pEquipment;
 	int m_nTimerID;
+	CGB2860SQLite m_sqlite;
 };
 

--
Gitblit v1.9.3