fix: active connection info invalid

Change-Id: I96c040230ce47b3a4ccd0ac7a2a90af1dd2883b7
linuxdeepin · Jul 19, 2018 · e55d595 · e55d595
1 parent af5b7bf
commit e55d595
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/plugins/network/item/wirelessitem.cpp b/plugins/network/item/wirelessitem.cpp
@@ -48,7 +48,13 @@ WirelessItem::WirelessItem(WirelessDevice *device)
     connect(m_device, static_cast<void (NetworkDevice::*) (const QString &statStr) const>(&NetworkDevice::statusChanged), m_refershTimer, static_cast<void (QTimer::*) ()>(&QTimer::start));
     connect(static_cast<WirelessDevice *>(m_device), &WirelessDevice::activeApInfoChanged, m_refershTimer, static_cast<void (QTimer::*) ()>(&QTimer::start));
     connect(static_cast<WirelessDevice *>(m_device), &WirelessDevice::activeConnectionChanged, m_refershTimer, static_cast<void (QTimer::*) ()>(&QTimer::start));
-    connect(m_refershTimer, &QTimer::timeout, this, static_cast<void (WirelessItem::*)()>(&WirelessItem::update));
+    connect(m_refershTimer, &QTimer::timeout, [=] {
+        if (m_device->status() == NetworkDevice::Activated && static_cast<WirelessDevice *>(m_device)->activeApInfo().isEmpty()) {
+            Q_EMIT queryActiveConnInfo();
+            return;
+        }
+        update();
+    });
 
     //QMetaObject::invokeMethod(this, "init", Qt::QueuedConnection);
     init();
@@ -169,9 +175,7 @@ const QPixmap WirelessItem::iconPix(const Dock::DisplayMode displayMode, const i
         if (state == NetworkDevice::Activated)
         {
             const auto &activeApInfo = static_cast<WirelessDevice *>(m_device)->activeApInfo();
-            if (activeApInfo.isEmpty()) {
-                m_refershTimer->start();
-            } else {
+            if (!activeApInfo.isEmpty()) {
                 strength = activeApInfo.value("Strength").toInt();
                 m_refershTimer->stop();
             }

diff --git a/plugins/network/item/wirelessitem.h b/plugins/network/item/wirelessitem.h
@@ -56,6 +56,7 @@ public Q_SLOTS:
     void requestDeactiveAP(const QString &devPath) const;
     void feedSecret(const QString &connectionPath, const QString &settingName, const QString &password, const bool autoConnect);
     void cancelSecret(const QString &connectionPath, const QString &settingName);
+    void queryActiveConnInfo();
 
 protected:
     bool eventFilter(QObject *o, QEvent *e);

diff --git a/plugins/network/networkplugin.cpp b/plugins/network/networkplugin.cpp
@@ -175,6 +175,8 @@ void NetworkPlugin::onDeviceListChanged(const QList<NetworkDevice *> devices)
                     item = new WirelessItem(static_cast<WirelessDevice *>(device));
                     wirelessItems.append(static_cast<WirelessItem *>(item));
 
+                    connect(static_cast<WirelessItem *>(item), &WirelessItem::queryActiveConnInfo,
+                            m_networkWorker, &NetworkWorker::queryActiveConnInfo);
                     connect(static_cast<WirelessItem *>(item), &WirelessItem::requestActiveAP,
                             m_networkWorker, &NetworkWorker::activateAccessPoint);
                     connect(static_cast<WirelessItem *>(item), &WirelessItem::requestDeactiveAP,
@@ -188,6 +190,7 @@ void NetworkPlugin::onDeviceListChanged(const QList<NetworkDevice *> devices)
                             static_cast<WirelessItem *>(item), &WirelessItem::onNeedSecrets);
                     connect(m_networkModel, &NetworkModel::needSecretsFinished,
                             static_cast<WirelessItem *>(item), &WirelessItem::onNeedSecretsFinished);
+
                     m_networkWorker->queryAccessPoints(path);
                     break;
                 default: