openkylin
/
kylin-nm
mirror of https://gitee.com/openkylin/kylin-nm.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

解决BUG 180430，【wifi】开启移动热点后，手动睡眠机器，然后再唤醒，控制面板卡死

This commit is contained in:
chenxuechao 2023-07-11 18:29:11 +08:00
parent b9cb85a271
commit 8a4c39afab
7 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/mobilehotspot/mobilehotspotwidget.cpp
View File

@ -262,7 +262,7 @@ void MobileHotspotWidget::initDbusConnect()
if(m_interface->isValid()) {
connect(m_interface,SIGNAL(activateFailed(QString)), this, SLOT(onActivateFailed(QString)), Qt::QueuedConnection);
connect(m_interface,SIGNAL(deactivateFailed(QString)), this, SLOT(onDeactivateFailed(QString)), Qt::QueuedConnection);
connect(m_interface,SIGNAL(deviceStatusChanged()), this, SLOT(onDeviceStatusChanged()), Qt::QueuedConnection);
connect(m_interface,SIGNAL(wirelessDeviceStatusChanged()), this, SLOT(onDeviceStatusChanged()), Qt::QueuedConnection);
connect(m_interface,SIGNAL(deviceNameChanged(QString, QString, int)), this, SLOT(onDeviceNameChanged(QString, QString, int)), Qt::QueuedConnection);
connect(m_interface,SIGNAL(hotspotDeactivated(QString, QString)), this, SLOT(onHotspotDeactivated(QString, QString)), Qt::QueuedConnection);
connect(m_interface,SIGNAL(hotspotActivated(QString, QString, QString, QString, QString)), this, SLOT(onHotspotActivated(QString, QString, QString, QString, QString)), Qt::QueuedConnection);
@ -272,7 +272,6 @@ void MobileHotspotWidget::initDbusConnect()
connect(m_interface, SIGNAL(wirelessSwitchBtnChanged(bool)), this, SLOT(onWirelessBtnChanged(bool)), Qt::QueuedConnection);
}
connect(m_apNameLine, &QLineEdit::textEdited, this, &MobileHotspotWidget::onApLineEditTextEdit);
#ifdef HOTSPOT_CONTROL
connect(m_connectDevPage, SIGNAL(setStaIntoBlacklist(QString, QString)), m_blacklistPage, SLOT(onsetStaIntoBlacklist(QString, QString)));
@ -396,7 +395,6 @@ void MobileHotspotWidget::initInterfaceInfo()
}
QMap<QString, int> devCapMap = capReply.value();
if (devMap.isEmpty()) {
qDebug() << LOG_HEAD << "no wireless device";
setWidgetHidden(true);

2
plugins/wlanconnect/wlanconnect.cpp
View File

@ -273,7 +273,7 @@ void WlanConnect::initComponent() {
//删除无线网络
connect(m_interface, SIGNAL(wlanRemove(QString, QString)), this, SLOT(onNetworkRemove(QString, QString)), Qt::QueuedConnection);
//网卡插拔处理
connect(m_interface, SIGNAL(deviceStatusChanged()), this, SLOT(onDeviceStatusChanged()), Qt::QueuedConnection);
connect(m_interface, SIGNAL(wirelessDeviceStatusChanged()), this, SLOT(onDeviceStatusChanged()), Qt::QueuedConnection);
//信号更新处理 改为每过固定时间 主动获取
// connect(m_interface, SIGNAL(signalStrengthChange(QString, QString, int)), this, SLOT(updateStrengthList(QString, QString, int)));
//网卡name处理

1
src/backend/dbusadaptor.h
View File

@ -110,6 +110,7 @@ Q_SIGNALS: // SIGNALS
void deactivateFailed(QString errorMessage);
//设备插拔
void deviceStatusChanged();
void wirelessDeviceStatusChanged();
void deviceNameChanged(QString oldName, QString newName, int type);
void wirelessSwitchBtnChanged(bool state);
//热点断开

4
src/frontend/mainwindow.cpp
View File

@ -348,7 +348,7 @@ void MainWindow::initDbusConnnect()
{
connect(m_lanWidget, &LanPage::deviceStatusChanged, this, &MainWindow::deviceStatusChanged);
connect(m_lanWidget, &LanPage::deviceNameChanged, this, &MainWindow::deviceNameChanged);
connect(m_wlanWidget, &WlanPage::deviceStatusChanged, this, &MainWindow::deviceStatusChanged);
connect(m_wlanWidget, &WlanPage::wirelessDeviceStatusChanged, this, &MainWindow::wirelessDeviceStatusChanged);
connect(m_wlanWidget, &WlanPage::deviceNameChanged, this, &MainWindow::deviceNameChanged);
connect(m_wlanWidget, &WlanPage::wirelessSwitchBtnChanged, this, &MainWindow::wirelessSwitchBtnChanged);
@ -380,7 +380,7 @@ void MainWindow::initDbusConnnect()
connect(m_lanWidget, &LanPage::lanConnectChanged, this, &MainWindow::onRefreshTrayIconTooltip);
connect(m_lanWidget, &LanPage::deviceStatusChanged, this, &MainWindow::onRefreshTrayIconTooltip);
connect(m_wlanWidget, &WlanPage::wlanConnectChanged, this, &MainWindow::onRefreshTrayIconTooltip);
connect(m_wlanWidget, &WlanPage::deviceStatusChanged, this, &MainWindow::onRefreshTrayIconTooltip);
connect(m_wlanWidget, &WlanPage::wirelessDeviceStatusChanged, this, &MainWindow::onRefreshTrayIconTooltip);
//模式切换
QDBusConnection::sessionBus().connect(QString("com.kylin.statusmanager.interfacer"),

1
src/frontend/mainwindow.h
View File

@ -113,6 +113,7 @@ public:
Q_SIGNALS:
//设备插拔
void deviceStatusChanged();
void wirelessDeviceStatusChanged();
//设备名称变化
void deviceNameChanged(QString oldName, QString newName, int type);
void wirelessSwitchBtnChanged(bool state);

1
src/frontend/tab-pages/tabpage.h
View File

@ -109,6 +109,7 @@ public:
Q_SIGNALS:
void deviceStatusChanged();
void wirelessDeviceStatusChanged();
void deviceNameChanged(QString oldName, QString newName, int type);
void activateFailed(QString errorMessage);
void deactivateFailed(QString errorMessage);

4
src/frontend/tab-pages/wlanpage.cpp
View File

@ -755,7 +755,7 @@ void WlanPage::onDeviceAdd(QString deviceName, NetworkManager::Device::Type devi
initWlanArea();
}
Q_EMIT deviceStatusChanged();
Q_EMIT wirelessDeviceStatusChanged();
return;
}
@ -820,7 +820,7 @@ void WlanPage::onDeviceRemove(QString deviceName)
initWlanArea();
}
Q_EMIT deviceStatusChanged();
Q_EMIT wirelessDeviceStatusChanged();
}
void WlanPage::updateDeviceForCombox(QString oldDeviceName, QString newDeviceName)