From 944e8f3dea723404e21168e97116cca2c09c70cb Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期二, 27 一月 2026 15:26:29 +0800
Subject: [PATCH] 1.扫码事件上报,之前只上报OK一种情况,现在有事种状态。 2.Port事件上报关联PortID, 统一修改为VID:PortID,之前分开很多种。
---
SourceCode/Bond/Servo/PageTransferLog.cpp | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/SourceCode/Bond/Servo/PageTransferLog.cpp b/SourceCode/Bond/Servo/PageTransferLog.cpp
index 978a8e0..9ec52d4 100644
--- a/SourceCode/Bond/Servo/PageTransferLog.cpp
+++ b/SourceCode/Bond/Servo/PageTransferLog.cpp
@@ -51,7 +51,7 @@
CDialogEx::DoDataExchange(pDX);
}
-void CPageTransferLog::InitRxWindow()
+void CPageTransferLog::InitRxWindows()
{
/* code */
// 璁㈤槄鏁版嵁
@@ -408,7 +408,7 @@
{
if (nIDEvent == 1) {
KillTimer(1);
- InitRxWindow();
+ InitRxWindows();
}
CDialogEx::OnTimer(nIDEvent);
}
@@ -497,4 +497,13 @@
m_nCurPage++;
UpdatePageData();
}
+}
+
+BOOL CPageTransferLog::PreTranslateMessage(MSG* pMsg)
+{
+ if (pMsg->wParam == VK_RETURN || pMsg->wParam == VK_ESCAPE) {
+ return TRUE;
+ }
+
+ return CDialogEx::PreTranslateMessage(pMsg);
}
\ No newline at end of file
--
Gitblit v1.9.3