1.添加主页面 2.修复配方列表切换配方出现标签闪烁问题（主题颜色是白色，标签控件不是，所以刷新的时候先刷新成主题颜色）

LAPTOP-T815PCOQ\25526

2024-12-24 a549ad408c941bfebd863c8537bc30520659c293

1.添加主页面
2.修复配方列表切换配方出现标签闪烁问题（主题颜色是白色，标签控件不是，所以刷新的时候先刷新成主题颜色）

 SourceCode/Bond/BondEq/BondEq.rc

Binary files differ

 SourceCode/Bond/BondEq/BondEq.vcxproj

@@ -212,6 +212,7 @@
    <ClInclude Include="CPanel.h" />
    <ClInclude Include="CParam.h" />
    <ClInclude Include="CProjectPageComponents.h" />
    <ClInclude Include="CProjectPageMain.h" />
    <ClInclude Include="CRemoteEqUnitView.h" />
    <ClInclude Include="CRemoteEqView.h" />
    <ClInclude Include="CHomeDialog.h" />
@@ -290,6 +291,7 @@
    <ClCompile Include="CPanel.cpp" />
    <ClCompile Include="CParam.cpp" />
    <ClCompile Include="CProjectPageComponents.cpp" />
    <ClCompile Include="CProjectPageMain.cpp" />
    <ClCompile Include="CRemoteEqUnitView.cpp" />
    <ClCompile Include="CRemoteEqView.cpp" />
    <ClCompile Include="CHomeDialog.cpp" />

 SourceCode/Bond/BondEq/CPanelProject.cpp

@@ -18,7 +18,8 @@
    m_hbrBkgnd = nullptr;
    m_nPanelWidth = int((double)GetSystemMetrics(SM_CXSCREEN) * 0.25);
    m_pAccordionWnd = nullptr;
    m_pPageRemoteEqs = nullptr;
    //m_pPageRemoteEqs = nullptr;
    m_pPageMain = nullptr;
    m_pPageComponents = nullptr;
}

@@ -71,10 +72,15 @@
    m_pAccordionWnd->Setpadding(PADDING_BOTTOM, 2);
    m_pAccordionWnd->LoadExpandIcon(strExpandIcon, strCloseIcon);
    
    m_pPageRemoteEqs = new CProjectPageRemoteEqs();
    m_pPageRemoteEqs->Create(IDD_PROJECT_PAGE_REMOTEEQS, GetDlgItem(IDC_ACCORDION_WND1));
    m_pPageRemoteEqs->ShowWindow(SW_SHOW);
    m_pAccordionWnd->AddItem("远程设备", m_pPageRemoteEqs, 0, TRUE, TRUE);
    //m_pPageRemoteEqs = new CProjectPageRemoteEqs();
    //m_pPageRemoteEqs->Create(IDD_PROJECT_PAGE_REMOTEEQS, GetDlgItem(IDC_ACCORDION_WND1));
    //m_pPageRemoteEqs->ShowWindow(SW_SHOW);
    //m_pAccordionWnd->AddItem("远程设备", m_pPageRemoteEqs, 0, TRUE, TRUE);

    m_pPageMain = new CProjectPageMain();
    m_pPageMain->Create(IDD_PROJECT_PAGE_MAIN, GetDlgItem(IDC_ACCORDION_WND1));
    m_pPageMain->ShowWindow(SW_SHOW);
    m_pAccordionWnd->AddItem("主页面", m_pPageMain, 0, TRUE, TRUE);
    
    m_pPageComponents = new CProjectPageComponents();
    m_pPageComponents->Create(IDD_PROJECT_PAGE_COMPONENTS, GetDlgItem(IDC_ACCORDION_WND1));
@@ -121,10 +127,16 @@
        m_pPageComponents = nullptr;
    }

    if (m_pPageRemoteEqs != nullptr) {
        m_pPageRemoteEqs->DestroyWindow();
        delete m_pPageRemoteEqs;
        m_pPageRemoteEqs = nullptr;
    //if (m_pPageRemoteEqs != nullptr) {
    //    m_pPageRemoteEqs->DestroyWindow();
    //    delete m_pPageRemoteEqs;
    //    m_pPageRemoteEqs = nullptr;
    //}

    if (m_pPageMain != nullptr) {
        m_pPageMain->DestroyWindow();
        delete m_pPageMain;
        m_pPageMain = nullptr;
    }
}


 SourceCode/Bond/BondEq/CPanelProject.h

@@ -1,6 +1,7 @@
#pragma once
#include "VerticalLine.h"
#include "CProjectPageRemoteEqs.h"
//#include "CProjectPageRemoteEqs.h"
#include "CProjectPageMain.h"
#include "CProjectPageComponents.h"
#include "AccordionWnd.h"

@@ -29,7 +30,8 @@
    HBRUSH m_hbrBkgnd;
    int m_nPanelWidth;
    CAccordionWnd* m_pAccordionWnd;
    CProjectPageRemoteEqs* m_pPageRemoteEqs;
    //CProjectPageRemoteEqs* m_pPageRemoteEqs;
    CProjectPageMain* m_pPageMain;
    CProjectPageComponents* m_pPageComponents;



 SourceCode/Bond/BondEq/Resource.h

Binary files differ

 SourceCode/Bond/BondEq/View/RecipeListDlg.cpp

@@ -426,6 +426,7 @@
    CString strSelectedRecipe = m_grid.GetItemText(nSelect, 1);
    if (RecipeManager::getInstance().loadRecipe(std::string(CT2A(strSelectedRecipe)))) {
        m_staticCurrRecipe->SetWindowText(strSelectedRecipe);
        m_staticCurrRecipe->SetBkColor(RGB(0, 110, 110));
    }
    else {
        AfxMessageBox(_T("加载配方失败！"));