Merge branch 'clh'

LAPTOP-SNT8I5JK\Boounion

2025-05-13 2d69213b1b41b5b039e5dc6f6b7c55d53fd03037

 SourceCode/Bond/Servo/PageLog.cpp

ÎļþÃû´Ó SourceCode/Bond/Servo/LogDlg.cpp ÐÞ¸Ä
@@ -3,17 +3,17 @@

#include "stdafx.h"
#include "Servo.h"
#include "LogDlg.h"
#include "PageLog.h"
#include "afxdialogex.h"
#include "Common.h"
#include <regex>


// CLogDlg å¯¹è¯æ¡†
// CPageLog å¯¹è¯æ¡†

IMPLEMENT_DYNAMIC(CLogDlg, CDialogEx)
IMPLEMENT_DYNAMIC(CPageLog, CDialogEx)

CLogDlg::CLogDlg(CWnd* pParent /*=NULL*/)
CPageLog::CPageLog(CWnd* pParent /*=NULL*/)
   : CDialogEx(IDD_DIALOG_LOG, pParent)
{
   m_crBkgnd = LOGDLG_BACKGROUND_COLOR;
@@ -24,11 +24,11 @@
   m_bIncludeRegex = FALSE;
}

CLogDlg::~CLogDlg()
CPageLog::~CPageLog()
{
}

void CLogDlg::DoDataExchange(CDataExchange* pDX)
void CPageLog::DoDataExchange(CDataExchange* pDX)
{
   CDialogEx::DoDataExchange(pDX);
   DDX_Control(pDX, IDC_BUTTON_LEVEL, m_btnLevel);
@@ -37,22 +37,22 @@
}


BEGIN_MESSAGE_MAP(CLogDlg, CDialogEx)
BEGIN_MESSAGE_MAP(CPageLog, CDialogEx)
   ON_WM_CTLCOLOR()
   ON_WM_SIZE()
   ON_WM_DESTROY()
   ON_WM_CLOSE()
   ON_NOTIFY(BLBUTTON_MENU_ITEM_CLICKED, IDC_BUTTON_LEVEL, &CLogDlg::OnButtonLevelMenuClicked)
   ON_NOTIFY(BLBUTTON_MENU_ITEM_CLICKED, IDC_BUTTON_INCLUDE, &CLogDlg::OnButtonIncludeMenuClicked)
   ON_EN_CHANGE(IDC_EDIT_INCLUDE, &CLogDlg::OnEnChangeEditInclude)
   ON_BN_CLICKED(IDC_CHECK_REGEX, &CLogDlg::OnBnClickedCheckRegex)
   ON_NOTIFY(BLBUTTON_MENU_ITEM_CLICKED, IDC_BUTTON_LEVEL, &CPageLog::OnButtonLevelMenuClicked)
   ON_NOTIFY(BLBUTTON_MENU_ITEM_CLICKED, IDC_BUTTON_INCLUDE, &CPageLog::OnButtonIncludeMenuClicked)
   ON_EN_CHANGE(IDC_EDIT_INCLUDE, &CPageLog::OnEnChangeEditInclude)
   ON_BN_CLICKED(IDC_CHECK_REGEX, &CPageLog::OnBnClickedCheckRegex)
END_MESSAGE_MAP()


// CLogDlg æ¶ˆæ¯å¤„理程序


void CLogDlg::InitRxWindow()
void CPageLog::InitRxWindow()
{
   /* code */
   // è®¢é˜…数据
@@ -102,9 +102,10 @@
   }
}

BOOL CLogDlg::OnInitDialog()
BOOL CPageLog::OnInitDialog()
{
   CDialogEx::OnInitDialog();
   InitRxWindow();


   // ç¼“å­˜
@@ -158,6 +159,7 @@
   m_logEdit.SetLimitText(-1);


<<<<<<< HEAD:SourceCode/Bond/Servo/LogDlg.cpp
   std::thread([this]() {
      constexpr int nMaxWaitMs = 3000;  // æœ€å¤šç­‰å¾… 3 ç§’
      constexpr int nStepMs = 1;        // æ¯æ¬¡ç­‰å¾… 1ms
@@ -177,6 +179,8 @@
   }).detach();


=======
>>>>>>> clh:SourceCode/Bond/Servo/PageLog.cpp
   Resize();


@@ -184,21 +188,21 @@
              // å¼‚常: OCX å±žæ€§é¡µåº”返回 FALSE
}

void CLogDlg::OnSize(UINT nType, int cx, int cy)
void CPageLog::OnSize(UINT nType, int cx, int cy)
{
   CDialogEx::OnSize(nType, cx, cy);
   if (GetDlgItem(IDC_EDIT_LOG) == nullptr) return;
   Resize();
}

void CLogDlg::Resize()
void CPageLog::Resize()
{
   int x, y, y2, temp;
   CRect rcClient, rcItem;
   CWnd* pItem;
   GetClientRect(&rcClient);

   y = 0;
   y = 12;
   x = 8;
   pItem = GetDlgItem(IDC_BUTTON_LEVEL);
   pItem->GetWindowRect(&rcItem);
@@ -231,7 +235,7 @@
   pItem->MoveWindow(x, y2, rcClient.Width() - 16, rcClient.Height() - 5 - y2);
}

void CLogDlg::OnDestroy()
void CPageLog::OnDestroy()
{
   CDialogEx::OnDestroy();

@@ -259,7 +263,7 @@
   }
}

HBRUSH CLogDlg::OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor)
HBRUSH CPageLog::OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor)
{
   HBRUSH hbr = CDialogEx::OnCtlColor(pDC, pWnd, nCtlColor);

@@ -274,13 +278,13 @@
   return m_hbrBkgnd;
}

void CLogDlg::OnClose()
void CPageLog::OnClose()
{
   ShowWindow(SW_HIDE);
   GetParent()->PostMessage(ID_MSG_LOGDLG_HIDE, 0, 0);
}

BOOL CLogDlg::PreTranslateMessage(MSG* pMsg)
BOOL CPageLog::PreTranslateMessage(MSG* pMsg)
{
   if (pMsg->wParam == VK_RETURN || pMsg->wParam == VK_ESCAPE) {
      return TRUE;
@@ -289,7 +293,7 @@
   return CDialogEx::PreTranslateMessage(pMsg);
}

void CLogDlg::AppendLog(int level, const char* pszText)
void CPageLog::AppendLog(int level, const char* pszText)
{
   if (!::IsWindow(m_logEdit.m_hWnd)) {
      return;
@@ -297,7 +301,7 @@
   m_logEdit.AppendText(pszText);
}

void CLogDlg::OnButtonLevelMenuClicked(NMHDR* pNMHDR, LRESULT* pResult)
void CPageLog::OnButtonLevelMenuClicked(NMHDR* pNMHDR, LRESULT* pResult)
{
   BLBUTTON_NMHDR* pblbNmhdr = reinterpret_cast<BLBUTTON_NMHDR*>(pNMHDR);
   m_nLevel = (int)pblbNmhdr->dwData;
@@ -307,7 +311,7 @@
   *pResult = 0;
}

void CLogDlg::OnButtonIncludeMenuClicked(NMHDR* pNMHDR, LRESULT* pResult)
void CPageLog::OnButtonIncludeMenuClicked(NMHDR* pNMHDR, LRESULT* pResult)
{
   BLBUTTON_NMHDR* pblbNmhdr = reinterpret_cast<BLBUTTON_NMHDR*>(pNMHDR);
   int position = (int)pblbNmhdr->dwData;
@@ -323,13 +327,13 @@
   *pResult = 0;
}

void CLogDlg::OnEnChangeEditInclude()
void CPageLog::OnEnChangeEditInclude()
{
   GetDlgItemText(IDC_EDIT_INCLUDE, m_strIncludeText);
   theApp.m_model.m_configuration.setLogcatIncludeText(m_strIncludeText);
}

void CLogDlg::OnBnClickedCheckRegex()
void CPageLog::OnBnClickedCheckRegex()
{
   CButton* pCheckBox = (CButton*)GetDlgItem(IDC_CHECK_REGEX);
   m_bIncludeRegex = pCheckBox->GetCheck();