From d3c3d619a2fc92c8d5b2929031cf7e946d57b44a Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期二, 13 五月 2025 10:08:37 +0800
Subject: [PATCH] 1.合并后修复；
---
SourceCode/Bond/Servo/PageLog.cpp | 24 ------------------------
1 files changed, 0 insertions(+), 24 deletions(-)
diff --git a/SourceCode/Bond/Servo/PageLog.cpp b/SourceCode/Bond/Servo/PageLog.cpp
index 7af3e51..4729c34 100644
--- a/SourceCode/Bond/Servo/PageLog.cpp
+++ b/SourceCode/Bond/Servo/PageLog.cpp
@@ -157,30 +157,6 @@
// 内容
m_logEdit.SetMaxLineCount(500);
m_logEdit.SetLimitText(-1);
-
-
-<<<<<<< HEAD:SourceCode/Bond/Servo/LogDlg.cpp
- std::thread([this]() {
- constexpr int nMaxWaitMs = 3000; // 最多等待 3 秒
- constexpr int nStepMs = 1; // 每次等待 1ms
- int nElapsed = 0;
-
- while (nElapsed < nMaxWaitMs) {
- if (theApp.m_model.getObservable() != nullptr) {
- InitRxWindow();
- return;
- }
- std::this_thread::sleep_for(std::chrono::milliseconds(nStepMs));
- nElapsed += nStepMs;
- }
-
- // 超时也可以发消息记录下日志
- TRACE(_T("InitRxWindow 超时，未执行\n"));
- }).detach();
-
-
-=======
->>>>>>> clh:SourceCode/Bond/Servo/PageLog.cpp
Resize();
--
Gitblit v1.9.3