From e8a27bb203fe2aff70390a5eca002d7438da9b0f Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期三, 22 十月 2025 14:24:34 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang

---
 SourceCode/Bond/BondEq/Model.h |   20 +++++++++++++-------
 1 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/SourceCode/Bond/BondEq/Model.h b/SourceCode/Bond/BondEq/Model.h
index db77ee0..58bb762 100644
--- a/SourceCode/Bond/BondEq/Model.h
+++ b/SourceCode/Bond/BondEq/Model.h
@@ -1,6 +1,8 @@
 #pragma once
-#include "Servo.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();
-	CServo& getServo();
-	BEQ::IRemoteEquipment* getBond1();
+	CBonder& getBonder();
+	BEQ::IEquipment* getEquipment();
 
 public:
 	int notify(int code);
@@ -26,10 +27,15 @@
 	int notifyObjAndPtr(int code, IRxObject* pObj, void* ptr);
 	int notifyObjAndInt(int code, IRxObject* pObj1, IRxObject* pObj2, int exCode);
 	int notifyInt(int code, int exCode);
+	int notifyInt2(int code, int exCode, int exCode2);
+	int notifyDouble(int code, double dValue);
 	int notifyText(int code, const char* pszText);
 	int notifyPtrAndInt(int code, void* ptr1, void* ptr2, int exCode);
 	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;
@@ -42,9 +48,9 @@
 	CString m_strDataDir;
 
 private:
-	CServo m_servo;
-	BEQ::IServo* m_pServo;
-	BEQ::IRemoteEquipment* m_pEqBond1;
+	CBonder m_bonder;
+	BEQ::IEquipment* m_pEquipment;
 	int m_nTimerID;
+	CGB2860SQLite m_sqlite;
 };
 

--
Gitblit v1.9.3