Merge branch 'yhkylin/v101-fork' into 'yhkylin/v101'

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

See merge request kylinos-src/kylin-nm!213

debian/changelog

@@ -1,3 +1,13 @@
+kylin-nm (3.24.0.0-0k2.6) v101; urgency=medium
+
+  * BUG号：
+     -#180430 【wifi】开启移动热点后，手动睡眠机器，然后再唤醒，控制面板卡死
+  * 需求号：
+  * 其他改动：
+  * 影响域：自身
+
+ -- cxc <chenxuechao@kylinos.cn>  Tue, 11 Jul 2023 18:20:41 +0800
+
 kylin-nm (3.24.0.0-0k2.5) v101; urgency=medium
 
   * BUG号：

plugins/mobilehotspot/mobilehotspotwidget.cpp

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

plugins/wlanconnect/wlanconnect.cpp

@@ -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处理

src/backend/dbusadaptor.h

@@ -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);
     //热点断开

src/frontend/mainwindow.cpp

@@ -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"),

src/frontend/mainwindow.h

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

src/frontend/tab-pages/tabpage.h

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

src/frontend/tab-pages/wlanpage.cpp

@@ -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)