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/Servo/PageAlarm.cpp | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/PageAlarm.cpp b/SourceCode/Bond/Servo/PageAlarm.cpp
index af5b619..dd6a8e4 100644
--- a/SourceCode/Bond/Servo/PageAlarm.cpp
+++ b/SourceCode/Bond/Servo/PageAlarm.cpp
@@ -48,7 +48,7 @@
}
}
-void CPageAlarm::InitRxWindow()
+void CPageAlarm::InitRxWindows()
{
/* code */
// 璁㈤槄鏁版嵁
@@ -249,6 +249,7 @@
BOOL CPageAlarm::OnInitDialog()
{
CDialogEx::OnInitDialog();
+ InitRxWindows();
SetTimer(1, 3000, nullptr);
// 涓嬫媺妗嗘帶浠�
@@ -506,3 +507,12 @@
m_nCurPage++;
UpdatePageData(); // 璋冪敤鍒嗛〉鏇存柊鍑芥暟
}
+
+BOOL CPageAlarm::PreTranslateMessage(MSG* pMsg)
+{
+ if (pMsg->wParam == VK_RETURN || pMsg->wParam == VK_ESCAPE) {
+ return TRUE;
+ }
+
+ return CDialogEx::PreTranslateMessage(pMsg);
+}
--
Gitblit v1.9.3