WolfSpirit/EJM_Display
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

修改画面载入逻辑(未成功)

Browse Source
This commit is contained in:
陈俊鹏
2025-09-30 17:42:22 +08:00
parent 64831f1e40
commit faf921afc7
77 changed files with 8687 additions and 937 deletions
Download Patch File Download Diff File Expand all files Collapse all files

292
LaunchPage.cpp
View File

@@ -1,6 +1,6 @@
#include "LaunchPage.h"
#include "ui_LaunchPage.h"
#include <QHBoxLayout>
#if CONFIG_EN_SUB_THREAD //是否开启子进程
@@ -15,17 +15,13 @@ LaunchPage::LaunchPage(QWidget *parent)
setWindowFlag(Qt::FramelessWindowHint); // 设置窗口无边框，设置后窗口无法移动
setAttribute(Qt::WA_TranslucentBackground, true);
TrayIconInit();
/* ============= 2. 延迟创建子页面 ============= */
m_delayInitTimer = new QTimer(this);
m_delayInitTimer->setSingleShot(true);
connect(m_delayInitTimer, &QTimer::timeout, this, &LaunchPage::createPages);
m_delayInitTimer->start(100); // 0 ms 即可，让事件循环先跑一帧
WinInit();
QTimer::singleShot(100, this, &LaunchPage::createPages);
#if CONFIG_EN_SUB_THREAD //是否开启子进程
LP_ST.start();
#endif
@@ -38,6 +34,149 @@ LaunchPage::~LaunchPage()
#endif
delete ui;
}
// 加载下一个窗口的函数
void LaunchPage::loadNextWindow(QWidget *container,QHBoxLayout *hLayout) {
QTimer::singleShot(50, this, [=]() {
switch (m_loadingStep) {
case 0: {
P01_MianPage *p01 = new P01_MianPage(container);
ui->LoaderList->addItem("窗口创建->P01_MianPage窗口...");
p01->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
hLayout->addWidget(p01);
ui->LoaderList->addItem("窗口载入布局->P01_MianPage 窗口...");
break;
}
case 1: {
P02_ShieldPage *p02 = new P02_ShieldPage(container);
ui->LoaderList->addItem("窗口创建->P02_ShieldPage窗口...");
p02->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
hLayout->addWidget(p02);
ui->LoaderList->addItem("窗口载入布局->P02_ShieldPage 窗口...");
break;
}
case 2: {
P301_PumpPage *p301 = new P301_PumpPage(container);
ui->LoaderList->addItem("窗口创建->P301_PumpPage窗口...");
p301->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
hLayout->addWidget(p301);
ui->LoaderList->addItem("窗口载入布局->P301_PumpPage 窗口...");
break;
}
case 3: {
P401_CuttingPage *p401 = new P401_CuttingPage(container);
ui->LoaderList->addItem("窗口创建->P401_CuttingPage窗口...");
p401->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
hLayout->addWidget(p401);
ui->LoaderList->addItem("窗口载入布局->P401_CuttingPage 窗口...");
break;
}
case 4: {
P501_LoaderPage *p501 = new P501_LoaderPage(container);
ui->LoaderList->addItem("窗口创建->P501_LoaderPage窗口...");
p501->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
hLayout->addWidget(p501);
ui->LoaderList->addItem("窗口载入布局->P501_LoaderPage 窗口...");
break;
}
case 5: {
P601_TransportPage *p601 = new P601_TransportPage(container);
ui->LoaderList->addItem("窗口创建->P601_TransportPage窗口...");
p601->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
hLayout->addWidget(p601);
ui->LoaderList->addItem("窗口载入布局->P601_TransportPage 窗口...");
break;
}
case 6: {
P07_CylinderPage *p07 = new P07_CylinderPage(container);
ui->LoaderList->addItem("窗口创建->P07_CylinderPage窗口...");
p07->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
hLayout->addWidget(p07);
ui->LoaderList->addItem("窗口载入布局->P07_CylinderPage 窗口...");
break;
}
case 7: {
P08_AlarmPage *p08 = new P08_AlarmPage(container);
ui->LoaderList->addItem("窗口创建->P08_AlarmPage窗口...");
p08->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
hLayout->addWidget(p08);
ui->LoaderList->addItem("窗口载入布局->P08_AlarmPage 窗口...");
break;
}
case 8: {
P09_RemotePage *p09 = new P09_RemotePage(container);
ui->LoaderList->addItem("窗口创建->P09_RemotePage窗口...");
p09->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
hLayout->addWidget(p09);
ui->LoaderList->addItem("窗口载入布局->P09_RemotePage 窗口...");
break;
}
case 9: {
P10_IntelligentPage *p10 = new P10_IntelligentPage(container);
ui->LoaderList->addItem("窗口创建->P10_IntelligentPage窗口...");
p10->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
hLayout->addWidget(p10);
ui->LoaderList->addItem("窗口载入布局->P10_IntelligentPage 窗口...");
break;
}
case 10: {
P11_IsolationPage *p11 = new P11_IsolationPage(container);
ui->LoaderList->addItem("窗口创建->P11_IsolationPage窗口...");
p11->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
hLayout->addWidget(p11);
ui->LoaderList->addItem("窗口载入布局->P11_IsolationPage 窗口...");
break;
}
case 11: {
P12_NetworkPage *p12 = new P12_NetworkPage(container);
ui->LoaderList->addItem("窗口创建->P12_NetworkPage窗口...");
p12->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
hLayout->addWidget(p12);
ui->LoaderList->addItem("窗口载入布局->P12_NetworkPage 窗口...");
break;
}
case 12: {
P13_InsPage *p13 = new P13_InsPage(container);
ui->LoaderList->addItem("窗口创建->P13_InsPage窗口...");
p13->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
hLayout->addWidget(p13);
ui->LoaderList->addItem("窗口载入布局->P13_InsPage 窗口...");
break;
}
case 13: {
P14_AtlasPage *p14 = new P14_AtlasPage(container);
ui->LoaderList->addItem("窗口创建->P14_AtlasPage窗口...");
p14->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
hLayout->addWidget(p14);
ui->LoaderList->addItem("窗口载入布局->P14_AtlasPage 窗口...");
break;
}
case 14: {
P15_ParameterPage *p15 = new P15_ParameterPage(container);
ui->LoaderList->addItem("窗口创建->P15_ParameterPage窗口...");
p15->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
hLayout->addWidget(p15);
ui->LoaderList->addItem("窗口载入布局->P15_ParameterPage 窗口...");
break;
}
case 15: {
P16_SettingPage *p16 = new P16_SettingPage(container);
ui->LoaderList->addItem("窗口创建->P16_SettingPage窗口...");
p16->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
hLayout->addWidget(p16);
ui->LoaderList->addItem("窗口载入布局->P16_SettingPage 窗口...");
break;
}
default:
// 所有窗口加载完成，可以添加完成提示
ui->LoaderList->addItem("所有窗口加载完成");
return; // 结束加载过程
}
// 准备加载下一个窗口
m_loadingStep++;
loadNextWindow(container,hLayout); // 递归调用，继续加载下一个
});
}
void LaunchPage::TrayIconInit()
{
//托盘初始化
@@ -114,60 +253,85 @@ void LaunchPage::createPages(){
QHBoxLayout *hLayout = new QHBoxLayout(container);
hLayout->setSpacing(10); // 窗口之间的间距
hLayout->setContentsMargins(0, 0, 0, 0); // 容器内边距
loadNextWindow(container,hLayout);
// QTimer::singleShot(100, this, [=]() {
// switch (m_loadingStep) {
// case 0:
// P01_MianPage *p01 = new P01_MianPage(container);
// ui->LoaderList->addItem("窗口创建->P01_MianPage窗口...");
// p01->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
// hLayout->addWidget(p01);
// ui->LoaderList->addItem("窗口载入布局->P01_MianPage 窗口...");
// break;
// case 1:
// P02_ShieldPage *p02 = new P02_ShieldPage (container);
// ui->LoaderList->addItem("窗口创建->P02_ShieldPage窗口...");
// p02->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
// hLayout->addWidget(p02);
// ui->LoaderList->addItem("窗口载入布局->P02_ShieldPage 窗口...");
// break;
// case 2:
// break;
// case 3:
// break;
// case 4:
// break;
// case 5:
// break;
// }
// }
// 创建并添加子窗口，不设置固定大小
P01_MianPage *p01 = new P01_MianPage (container); ui->LoaderList->addItem("窗口创建->P01_MianPage窗口...");
P02_ShieldPage *p02 = new P02_ShieldPage (container); ui->LoaderList->addItem("窗口创建->P02_ShieldPage窗口...");
P301_PumpPage *p301 = new P301_PumpPage (container); ui->LoaderList->addItem("窗口创建->P301_PumpPage窗口...");
P401_CuttingPage *p401 = new P401_CuttingPage (container); ui->LoaderList->addItem("窗口创建->P401_CuttingPage窗口...");
P501_LoaderPage *p501 = new P501_LoaderPage (container); ui->LoaderList->addItem("窗口创建->P501_LoaderPage窗口...");
P601_TransportPage *p601 = new P601_TransportPage (container); ui->LoaderList->addItem("窗口创建->P601_TransportPage窗口...");
P07_CylinderPage *p07 = new P07_CylinderPage (container); ui->LoaderList->addItem("窗口创建->P07_CylinderPage窗口...");
P08_AlarmPage *p08 = new P08_AlarmPage (container); ui->LoaderList->addItem("窗口创建->P08_AlarmPage窗口...");
P09_RemotePage *p09 = new P09_RemotePage (container); ui->LoaderList->addItem("窗口创建->P09_RemotePage窗口...");
P10_IntelligentPage *p10 = new P10_IntelligentPage (container); ui->LoaderList->addItem("窗口创建->P10_IntelligentPage窗口...");
P11_IsolationPage *p11 = new P11_IsolationPage (container); ui->LoaderList->addItem("窗口创建->P11_IsolationPage窗口...");
P12_NetworkPage *p12 = new P12_NetworkPage (container); ui->LoaderList->addItem("窗口创建->P12_NetworkPage窗口...");
P13_InsPage *p13 = new P13_InsPage (container); ui->LoaderList->addItem("窗口创建->P13_InsPage窗口...");
P14_AtlasPage *p14 = new P14_AtlasPage (container); ui->LoaderList->addItem("窗口创建->P14_AtlasPage窗口...");
P15_ParameterPage *p15 = new P15_ParameterPage (container); ui->LoaderList->addItem("窗口创建->P15_ParameterPage窗口...");
P16_SettingPage *p16 = new P16_SettingPage (container); ui->LoaderList->addItem("窗口创建->P16_SettingPage窗口...");
// // 创建并添加子窗口，不设置固定大小
// P301_PumpPage *p301 = new P301_PumpPage (container); ui->LoaderList->addItem("窗口创建->P301_PumpPage窗口...");
// P401_CuttingPage *p401 = new P401_CuttingPage (container); ui->LoaderList->addItem("窗口创建->P401_CuttingPage窗口...");
// P501_LoaderPage *p501 = new P501_LoaderPage (container); ui->LoaderList->addItem("窗口创建->P501_LoaderPage窗口...");
// P601_TransportPage *p601 = new P601_TransportPage (container); ui->LoaderList->addItem("窗口创建->P601_TransportPage窗口...");
// P07_CylinderPage *p07 = new P07_CylinderPage (container); ui->LoaderList->addItem("窗口创建->P07_CylinderPage窗口...");
// P08_AlarmPage *p08 = new P08_AlarmPage (container); ui->LoaderList->addItem("窗口创建->P08_AlarmPage窗口...");
// P09_RemotePage *p09 = new P09_RemotePage (container); ui->LoaderList->addItem("窗口创建->P09_RemotePage窗口...");
// P10_IntelligentPage *p10 = new P10_IntelligentPage (container); ui->LoaderList->addItem("窗口创建->P10_IntelligentPage窗口...");
// P11_IsolationPage *p11 = new P11_IsolationPage (container); ui->LoaderList->addItem("窗口创建->P11_IsolationPage窗口...");
// P12_NetworkPage *p12 = new P12_NetworkPage (container); ui->LoaderList->addItem("窗口创建->P12_NetworkPage窗口...");
// P13_InsPage *p13 = new P13_InsPage (container); ui->LoaderList->addItem("窗口创建->P13_InsPage窗口...");
// P14_AtlasPage *p14 = new P14_AtlasPage (container); ui->LoaderList->addItem("窗口创建->P14_AtlasPage窗口...");
// P15_ParameterPage *p15 = new P15_ParameterPage (container); ui->LoaderList->addItem("窗口创建->P15_ParameterPage窗口...");
// P16_SettingPage *p16 = new P16_SettingPage (container); ui->LoaderList->addItem("窗口创建->P16_SettingPage窗口...");
// 让子窗口使用自身的首选大小
p01->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
p02->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
p301->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
p401->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
p501->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
p601->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
p07->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
p08->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
p09->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
p10->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
p11->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
p12->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
p13->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
p14->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
p15->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
p16->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
// // 让子窗口使用自身的首选大小
hLayout->addWidget(p01); ui->LoaderList->addItem("窗口载入布局->P01_MianPage 窗口...");
hLayout->addWidget(p02); ui->LoaderList->addItem("窗口载入布局->P02_ShieldPage 窗口...");
hLayout->addWidget(p301); ui->LoaderList->addItem("窗口载入布局->P301_PumpPage 窗口...");
hLayout->addWidget(p401); ui->LoaderList->addItem("窗口载入布局->P401_CuttingPage 窗口...");
hLayout->addWidget(p501); ui->LoaderList->addItem("窗口载入布局->P501_LoaderPage 窗口...");
hLayout->addWidget(p601); ui->LoaderList->addItem("窗口载入布局->P601_TransportPage 窗口...");
hLayout->addWidget(p07); ui->LoaderList->addItem("窗口载入布局->P07_CylinderPage 窗口...");
hLayout->addWidget(p08); ui->LoaderList->addItem("窗口载入布局->P08_AlarmPage 窗口...");
hLayout->addWidget(p09); ui->LoaderList->addItem("窗口载入布局->P09_RemotePage 窗口...");
hLayout->addWidget(p10); ui->LoaderList->addItem("窗口载入布局->P10_IntelligentPage 窗口...");
hLayout->addWidget(p11); ui->LoaderList->addItem("窗口载入布局->P11_IsolationPage 窗口...");
hLayout->addWidget(p12); ui->LoaderList->addItem("窗口载入布局->P12_NetworkPage 窗口...");
hLayout->addWidget(p13); ui->LoaderList->addItem("窗口载入布局->P13_InsPage 窗口...");
hLayout->addWidget(p14); ui->LoaderList->addItem("窗口载入布局->P14_AtlasPage 窗口...");
hLayout->addWidget(p15); ui->LoaderList->addItem("窗口载入布局->P15_ParameterPage 窗口...");
hLayout->addWidget(p16); ui->LoaderList->addItem("窗口载入布局->P16_SettingPage 窗口...");
// p301->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
// p401->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
// p501->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
// p601->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
// p07->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
// p08->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
// p09->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
// p10->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
// p11->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
// p12->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
// p13->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
// p14->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
// p15->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
// p16->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
// hLayout->addWidget(p301); ui->LoaderList->addItem("窗口载入布局->P301_PumpPage 窗口...");
// hLayout->addWidget(p401); ui->LoaderList->addItem("窗口载入布局->P401_CuttingPage 窗口...");
// hLayout->addWidget(p501); ui->LoaderList->addItem("窗口载入布局->P501_LoaderPage 窗口...");
// hLayout->addWidget(p601); ui->LoaderList->addItem("窗口载入布局->P601_TransportPage 窗口...");
// hLayout->addWidget(p07); ui->LoaderList->addItem("窗口载入布局->P07_CylinderPage 窗口...");
// hLayout->addWidget(p08); ui->LoaderList->addItem("窗口载入布局->P08_AlarmPage 窗口...");
// hLayout->addWidget(p09); ui->LoaderList->addItem("窗口载入布局->P09_RemotePage 窗口...");
// hLayout->addWidget(p10); ui->LoaderList->addItem("窗口载入布局->P10_IntelligentPage 窗口...");
// hLayout->addWidget(p11); ui->LoaderList->addItem("窗口载入布局->P11_IsolationPage 窗口...");
// hLayout->addWidget(p12); ui->LoaderList->addItem("窗口载入布局->P12_NetworkPage 窗口...");
// hLayout->addWidget(p13); ui->LoaderList->addItem("窗口载入布局->P13_InsPage 窗口...");
// hLayout->addWidget(p14); ui->LoaderList->addItem("窗口载入布局->P14_AtlasPage 窗口...");
// hLayout->addWidget(p15); ui->LoaderList->addItem("窗口载入布局->P15_ParameterPage 窗口...");
// hLayout->addWidget(p16); ui->LoaderList->addItem("窗口载入布局->P16_SettingPage 窗口...");
// 隐藏滚动条（如果需要）
@@ -175,7 +339,6 @@ void LaunchPage::createPages(){
scrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); // 隐藏垂直滚动条
// 设置滚动区域的内容部件
scrollArea->setWidget(container);
qDebug()<<p301->size();
// 确保scrollArea被正确添加到PublicWin中
if (isNewScrollArea) {
// 为PublicWin设置布局（如果没有）
@@ -194,6 +357,11 @@ void LaunchPage::createPages(){
void LaunchPage::WinInit(){
//ui->LoaderList->addItem("读取配置->")
PumpConditionConfigFile = ConfigFiles().ReadFile_Csv("./ProgramConfig/UI_油泵界面启停条件_配置.csv");
CutConditionConfigFile = ConfigFiles().ReadFile_Csv("./ProgramConfig/UI_截割界面启停条件_配置.csv");
LoaderConditionConfigFile = ConfigFiles().ReadFile_Csv("./ProgramConfig/UI_装载界面启停条件_配置.csv");
TransportConditionConfigFile = ConfigFiles().ReadFile_Csv("./ProgramConfig/UI_运输界面启停条件_配置.csv");
StandbyConditionConfigFile = ConfigFiles().ReadFile_Csv("./ProgramConfig/UI_备用界面启停条件_配置.csv");
QList<QStringList> FileData = ConfigFiles().ReadFile_Csv("./ProgramConfig/UI_报警内容文本_配置.csv");
for (int row = 1; row < FileData.size()-1; ++row)
{