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/EAPSimulator/EAPSimulatorDlg.h |   32 ++++++++++++++++++++++++++++++++
 1 files changed, 32 insertions(+), 0 deletions(-)

diff --git a/SourceCode/Bond/EAPSimulator/EAPSimulatorDlg.h b/SourceCode/Bond/EAPSimulator/EAPSimulatorDlg.h
index 03da904..e10cf1a 100644
--- a/SourceCode/Bond/EAPSimulator/EAPSimulatorDlg.h
+++ b/SourceCode/Bond/EAPSimulator/EAPSimulatorDlg.h
@@ -3,6 +3,7 @@
 //
 
 #pragma once
+#include "LogEdit.h"
 
 
 // CEAPSimulatorDlg 瀵硅瘽妗�
@@ -11,6 +12,14 @@
 // 鏋勯��
 public:
 	CEAPSimulatorDlg(CWnd* pParent = nullptr);	// 鏍囧噯鏋勯�犲嚱鏁�
+
+
+private:
+	void AppendLog(int level, const char* pszText);
+	void InitRxWindow();
+	void SetGroup1Enabled(bool enabled);
+	void SetGroup2Enabled(bool enabled);
+
 
 // 瀵硅瘽妗嗘暟鎹�
 #ifdef AFX_DESIGN_TIME
@@ -24,6 +33,8 @@
 // 瀹炵幇
 protected:
 	HICON m_hIcon;
+	CLogEdit m_logEdit;
+	IObserver* m_pObserver;
 
 	// 鐢熸垚鐨勬秷鎭槧灏勫嚱鏁�
 	virtual BOOL OnInitDialog();
@@ -31,4 +42,25 @@
 	afx_msg void OnPaint();
 	afx_msg HCURSOR OnQueryDragIcon();
 	DECLARE_MESSAGE_MAP()
+public:
+	afx_msg void OnDestroy();
+	afx_msg void OnBnClickedButtonConnect();
+	afx_msg void OnBnClickedButtonDisconnect();
+	afx_msg void OnBnClickedButtonAreYouThere();
+	afx_msg void OnBnClickedButtonDatetimeSync();
+	afx_msg void OnBnClickedButtonTerminalDisplay();
+	afx_msg void OnBnClickedButtonEdEventReport();
+	afx_msg void OnBnClickedButtonEdAlarmReport();
+	afx_msg void OnBnClickedButtonDefineReport();
+	afx_msg void OnBnClickedButtonLineReport();
+	afx_msg void OnBnClickedButtonConfigureSpooling();
+	afx_msg void OnBnClickedButtonTransmitSpooledData();
+	afx_msg void OnBnClickedButtonPurgeSpooledData();
+	afx_msg void OnBnClickedButtonQueryPpidList();
+	afx_msg void OnBnClickedButtonProceedWithCarrier();
+	afx_msg void OnBnClickedButtonCarrierRelease();
+	afx_msg void OnBnClickedButtonQueryCjSpace();
+	afx_msg void OnBnClickedButtonQueryPjSpace();
+	afx_msg void OnBnClickedButtonCreatePj();
+	afx_msg void OnBnClickedButtonCreateCj();
 };

--
Gitblit v1.9.3