1.合并后修复；

LAPTOP-SNT8I5JK\Boounion

2025-05-13 d3c3d619a2fc92c8d5b2929031cf7e946d57b44a

1.合并后修复；

 SourceCode/Bond/Servo/PageAlarm.cpp

@@ -115,11 +115,7 @@
    GetDlgItem(IDC_BUTTON_NEXT_PAGE)->EnableWindow(m_nCurPage < m_nTotalPages);
}

<<<<<<< HEAD:SourceCode/Bond/Servo/AlarmDlg.cpp
void CAlarmDlg::FillDataToListCtrl(CListCtrl* pListCtrl, const std::vector<AlarmData>& vecData)
=======
void CPageAlarm::FillDataToListCtrl(CListCtrl* pListCtrl, const std::vector<AlarmData>& vecData)
>>>>>>> clh:SourceCode/Bond/Servo/PageAlarm.cpp
{
    if (pListCtrl == nullptr || pListCtrl->m_hWnd == nullptr) {
        return;
@@ -139,11 +135,7 @@
}

static char* pszAlarmLevel[] = { "Warning", "Error" };
<<<<<<< HEAD:SourceCode/Bond/Servo/AlarmDlg.cpp
void CAlarmDlg::InsertAlarmData(CListCtrl* pListCtrl, const AlarmData& alarmData)
=======
void CPageAlarm::InsertAlarmData(CListCtrl* pListCtrl, const AlarmData& alarmData)
>>>>>>> clh:SourceCode/Bond/Servo/PageAlarm.cpp
{
    if (pListCtrl == nullptr || pListCtrl->m_hWnd == nullptr) {
        return;
@@ -195,20 +187,11 @@
    ON_WM_DESTROY()
    ON_WM_CLOSE()
    ON_WM_SIZE()
<<<<<<< HEAD:SourceCode/Bond/Servo/AlarmDlg.cpp
    ON_WM_TIMER()
    ON_CBN_SELCHANGE(IDC_COMBO_DATETIME, &CAlarmDlg::OnCbnSelchangeComboDatetime)
    ON_BN_CLICKED(IDC_BUTTON_SEARCH, &CAlarmDlg::OnBnClickedButtonSearch)
    ON_BN_CLICKED(IDC_BUTTON_EXPORT, &CAlarmDlg::OnBnClickedButtonExport)
    ON_BN_CLICKED(IDC_BUTTON_PREV_PAGE, &CAlarmDlg::OnBnClickedButtonPrevPage)
    ON_BN_CLICKED(IDC_BUTTON_NEXT_PAGE, &CAlarmDlg::OnBnClickedButtonNextPage)
=======
    ON_CBN_SELCHANGE(IDC_COMBO_DATETIME, &CPageAlarm::OnCbnSelchangeComboDatetime)
    ON_BN_CLICKED(IDC_BUTTON_SEARCH, &CPageAlarm::OnBnClickedButtonSearch)
    ON_BN_CLICKED(IDC_BUTTON_EXPORT, &CPageAlarm::OnBnClickedButtonExport)
    ON_BN_CLICKED(IDC_BUTTON_PREV_PAGE, &CPageAlarm::OnBnClickedButtonPrevPage)
    ON_BN_CLICKED(IDC_BUTTON_NEXT_PAGE, &CPageAlarm::OnBnClickedButtonNextPage)
>>>>>>> clh:SourceCode/Bond/Servo/PageAlarm.cpp
END_MESSAGE_MAP()


@@ -331,19 +314,7 @@
    Resize();
}

<<<<<<< HEAD:SourceCode/Bond/Servo/AlarmDlg.cpp
void CAlarmDlg::OnTimer(UINT_PTR nIDEvent)
{
    if (1 == nIDEvent) {
        KillTimer(1);
        InitRxWindow();
    }
}

void CAlarmDlg::OnCbnSelchangeComboDatetime()
=======
void CPageAlarm::OnCbnSelchangeComboDatetime()
>>>>>>> clh:SourceCode/Bond/Servo/PageAlarm.cpp
{
    CComboBox* pComboBox = (CComboBox*)GetDlgItem(IDC_COMBO_DATETIME);
    int nIndex = pComboBox->GetCurSel();

 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();



 SourceCode/Bond/Servo/ProductionLogDlg.cpp

ÎļþÒÑɾ³ý

 SourceCode/Bond/Servo/ProductionLogDlg.h

ÎļþÒÑɾ³ý

 SourceCode/Bond/Servo/Servo.vcxproj

@@ -275,7 +275,6 @@
    <ClInclude Include="LogEdit.h" />
    <ClInclude Include="MapPosWnd.h" />
    <ClInclude Include="Model.h" />
    <ClInclude Include="ProductionLogDlg.h" />
    <ClInclude Include="ProductionLogManager.h" />
    <ClInclude Include="Resource.h" />
    <ClInclude Include="SECSRuntimeManager.h" />
@@ -369,7 +368,6 @@
    <ClCompile Include="LogEdit.cpp" />
    <ClCompile Include="MapPosWnd.cpp" />
    <ClCompile Include="Model.cpp" />
    <ClCompile Include="ProductionLogDlg.cpp" />
    <ClCompile Include="ProductionLogManager.cpp" />
    <ClCompile Include="SECSRuntimeManager.cpp" />
    <ClCompile Include="SecsTestDlg.cpp" />

 SourceCode/Bond/Servo/Servo.vcxproj.filters

@@ -99,7 +99,6 @@
    <ClCompile Include="CRecipeList.cpp" />
    <ClCompile Include="CArm.cpp" />
    <ClCompile Include="CArmTray.cpp" />
    <ClCompile Include="ProductionLogDlg.cpp" />
    <ClCompile Include="ProductionLogManager.cpp" />
  </ItemGroup>
  <ItemGroup>
@@ -198,7 +197,6 @@
    <ClInclude Include="CRecipeList.h" />
    <ClInclude Include="CArm.h" />
    <ClInclude Include="CArmTray.h" />
    <ClInclude Include="ProductionLogDlg.h" />
    <ClInclude Include="ProductionLogManager.h" />
  </ItemGroup>
  <ItemGroup>