From dcd5068d7faca4280da9f6f56c244a4b217dd909 Mon Sep 17 00:00:00 2001 From: wanghaoyu <1580258873@qq.com> Date: Thu, 27 Feb 2025 17:14:00 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E4=B8=BB?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E8=AF=BB=E5=8F=96=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=88=86=E9=85=8D=E7=BD=91=E7=BB=9C=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Src/GDDC/gddcdlg.cpp | 2 +- global.cpp | 2 +- mainwindow.cpp | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Src/GDDC/gddcdlg.cpp b/Src/GDDC/gddcdlg.cpp index d316c0c..bfd8a67 100644 --- a/Src/GDDC/gddcdlg.cpp +++ b/Src/GDDC/gddcdlg.cpp @@ -471,7 +471,7 @@ void GDDCdlg::resizeUI() { void GDDCdlg::setGlobalSetMap( std::unordered_map &gSetMap) { if (m_DlgGDDCSet) { - m_DlgGDDCSet->initPullURL(gSetMap["光电吊舱"].net.remoteIp); + m_DlgGDDCSet->initPullURL(gSetMap["Pod"].net.remoteIp); } } diff --git a/global.cpp b/global.cpp index 85a0d67..092c849 100644 --- a/global.cpp +++ b/global.cpp @@ -2,7 +2,7 @@ global::global() {} -QString g_SoftwareVersion = "版本号:V1.1.0.6_20250215"; +QString g_SoftwareVersion = "版本号:V1.1.0.7_20250218"; NotifyManager *g_notifyManager = nullptr; diff --git a/mainwindow.cpp b/mainwindow.cpp index 39ca936..9a71237 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -93,7 +93,7 @@ void MainWindow::initWindow() { // 使用类中的get方法获取配置文件中的IP m_allSetMap = m_HomePagedlg->settingWidget->getAllParam(); m_GDDCdlg->setGlobalSetMap(m_allSetMap); - qDebug() << "=============设备配置================"; + /*qDebug() << "=============设备配置================"; qDebug() << "光电吊舱------"; qDebug() << "远端ip" << m_allSetMap["光电吊舱"].net.remoteIp; qDebug() << "L链----------"; @@ -106,14 +106,14 @@ void MainWindow::initWindow() { qDebug() << "远端ip:" << m_allSetMap["三维建模"].net.remoteIp; qDebug() << "远端端口:" << m_allSetMap["三维建模"].net.remotePort; qDebug() << "本地ip:" << m_allSetMap["三维建模"].net.localIp; - qDebug() << "本地端口:" << m_allSetMap["三维建模"].net.localPort; + qDebug() << "本地端口:" << m_allSetMap["三维建模"].net.localPort;*/ // mWeb = new CWebEngineView(); // mWeb->setPage(new CustomWebEnginePage()); // mWeb->load(QUrl("http://192.168.150.1")); lLinkWeb = new CWebEngineView(); lLinkWeb->setPage(new CustomWebEnginePage()); - lLinkWeb->load(QUrl(m_allSetMap["L链"].url)); + lLinkWeb->load(QUrl(m_allSetMap["L-Link"].url)); connect(lLinkWeb->page(), &QWebEnginePage::loadFinished, this, [=]() { // QString jsScript = R"( // var usernameField = @@ -139,14 +139,14 @@ void MainWindow::initWindow() { adHocNetworkWeb = new CWebEngineView(); adHocNetworkWeb->setPage(new CustomWebEnginePage()); - adHocNetworkWeb->load(QUrl(m_allSetMap["宽带自组网"].url)); + adHocNetworkWeb->load(QUrl(m_allSetMap["HocNetwork"].url)); satelliteCommWeb = new CWebEngineView(); satelliteCommWeb->setPage(new CustomWebEnginePage()); - satelliteCommWeb->load(QUrl(m_allSetMap["机载卫通"].url)); + satelliteCommWeb->load(QUrl(m_allSetMap["SatelliteComm"].url)); m_ModelCameraDlg = new ModelCameraDlg(this); - emit m_ModelCameraDlg->sendNetParam_signal(m_allSetMap["三维建模"].net); + emit m_ModelCameraDlg->sendNetParam_signal(m_allSetMap["ModelCamera"].net); // 接收主页面设置窗口的url数据传递并设置 connect( m_HomePagedlg->settingWidget, &HomePageSetingWidget::sendOneSet, this,