From 702b614519289b33aee26c456dc22ffde0c09dda Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期四, 16 一月 2025 11:32:15 +0800
Subject: [PATCH] 1.终端信息显示；
---
SourceCode/Bond/Servo/ServoDlg.cpp | 71 +++++++++++++++++++++++++++++++++++
1 files changed, 71 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/Servo/ServoDlg.cpp b/SourceCode/Bond/Servo/ServoDlg.cpp
index 7d7b5ad..bea9cf1 100644
--- a/SourceCode/Bond/Servo/ServoDlg.cpp
+++ b/SourceCode/Bond/Servo/ServoDlg.cpp
@@ -31,6 +31,10 @@
#define INDICATE_MEASUREMENT 13
+/* 创建终端的定时器 */
+#define TIMER_ID_CREATE_TERMINAL 1
+
+
// 用于应用程序“关于”菜单项的 CAboutDlg 对话框
class CAboutDlg : public CDialogEx
@@ -76,6 +80,8 @@
m_hbrBkgnd = nullptr;
m_bShowLogWnd = FALSE;
m_pLogDlg = nullptr;
+ m_pTerminalDisplayDlg = nullptr;
+ m_pObserver = nullptr;
}
void CServoDlg::DoDataExchange(CDataExchange* pDX)
@@ -108,10 +114,41 @@
ON_UPDATE_COMMAND_UI(ID_MENU_WND_LOG, &CServoDlg::OnUpdateMenuWndLog)
ON_COMMAND(ID_MENU_HELP_ABOUT, &CServoDlg::OnMenuHelpAbout)
ON_WM_INITMENUPOPUP()
+ ON_WM_TIMER()
END_MESSAGE_MAP()
// CServoDlg 消息处理程序
+
+void CServoDlg::InitRxWindows()
+{
+ /* code */
+ // 订阅数据
+ IRxWindows* pRxWindows = RX_GetRxWindows();
+ pRxWindows->enableLog(5);
+ if (m_pObserver == NULL) {
+ m_pObserver = pRxWindows->allocObserver([&](IAny* pAny) -> void {
+ // onNext
+ pAny->addRef();
+ int code = pAny->getCode();
+ if (RX_HSMS_TERMINAL_TEXT == code) {
+ const char* pszText;
+ if (pAny->getStringValue("text", pszText)) {
+ ShowTerminalText(pszText);
+ }
+ }
+ pAny->release();
+ }, [&]() -> void {
+ // onComplete
+ }, [&](IThrowable* pThrowable) -> void {
+ // onErrorm
+ pThrowable->printf();
+ });
+
+ theApp.m_model.getObservable()->observeOn(pRxWindows->mainThread())
+ ->subscribe(m_pObserver);
+ }
+}
BOOL CServoDlg::OnInitDialog()
{
@@ -242,6 +279,8 @@
theApp.m_model.init();
+ SetTimer(TIMER_ID_CREATE_TERMINAL, 3000, nullptr);
+ InitRxWindows();
UpdateLogBtn();
Resize();
return TRUE; // 除非将焦点设置到控件，否则返回 TRUE
@@ -452,10 +491,21 @@
delete m_pLogDlg;
m_pLogDlg = nullptr;
}
+ if (m_pTerminalDisplayDlg != nullptr) {
+ m_pTerminalDisplayDlg->DestroyWindow();
+ delete m_pTerminalDisplayDlg;
+ m_pTerminalDisplayDlg = nullptr;
+ }
if (m_hbrBkgnd != nullptr) {
::DeleteObject(m_hbrBkgnd);
}
+
+ if (m_pObserver != nullptr) {
+ m_pObserver->unsubscribe();
+ m_pObserver = NULL;
+ }
+
}
void CServoDlg::OnBnClickedButtonLog()
@@ -544,3 +594,24 @@
CDialogEx::OnMove(x, y);
}
+
+void CServoDlg::ShowTerminalText(const char* pszText, unsigned int duration/* = -1*/)
+{
+ ASSERT(m_pTerminalDisplayDlg);
+ m_pTerminalDisplayDlg->ShowText(pszText, duration);
+}
+
+void CServoDlg::OnTimer(UINT_PTR nIDEvent)
+{
+ if (TIMER_ID_CREATE_TERMINAL == nIDEvent) {
+ // 预先创建终端窗口
+ KillTimer(TIMER_ID_CREATE_TERMINAL);
+ char szBuffer[MAX_PATH];
+ sprintf_s(szBuffer, MAX_PATH, "%s\\RES\\TeminalMsg.html", (LPTSTR)(LPCTSTR)theApp.m_strAppDir);
+ m_pTerminalDisplayDlg = new CTerminalDisplayDlg();
+ m_pTerminalDisplayDlg->SetTemplateHtml(szBuffer);
+ m_pTerminalDisplayDlg->Create(IDD_DIALOG_TERMINAL_DISPLAY, this);
+ }
+
+ CDialogEx::OnTimer(nIDEvent);
+}
--
Gitblit v1.9.3