Merge branch '0821' into 'yhkylin/v101'

fix(kylin-nm):ingore different display command && fix(UI):空白wifi异常问题(#182913)

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

src/backend/dbus-interface/kywirelessnetitem.cpp

@@ -59,15 +59,31 @@ void KyWirelessNetItem::init(NetworkManager::WirelessNetwork::Ptr net)
    // m_NetSsid = net->ssid();
 
     NetworkManager::AccessPoint::Ptr accessPointPtr = net->referenceAccessPoint();
+    if (accessPointPtr->ssid().isEmpty()) {
+        qDebug() << accessPointPtr->uni() << "ssid isEmpty";
+        NetworkManager::AccessPoint::List list = net->accessPoints();
+        if (list.size() > 1) {
+            for (int i = 0; i < list.size(); ++i) {
+                if (!list.at(i)->ssid().isEmpty()) {
+                    qDebug() << "use" << accessPointPtr->uni();
+                    accessPointPtr = list.at(i);
+                    break;
+                }
+            }
+        }
+    }
+    if (accessPointPtr->ssid().isEmpty()) {
+        return;
+    }
     QByteArray rawSsid = accessPointPtr->rawSsid();
     m_NetSsid = getSsidFromByteArray(rawSsid);
 
-    m_signalStrength = net->signalStrength();
-    m_frequency = net->referenceAccessPoint()->frequency();
+    m_signalStrength = accessPointPtr->signalStrength();
+    m_frequency = accessPointPtr->frequency();
     m_channel = NetworkManager::findChannel(m_frequency);
-    NetworkManager::AccessPoint::Capabilities cap = net->referenceAccessPoint()->capabilities();
-    NetworkManager::AccessPoint::WpaFlags wpaFlag = net->referenceAccessPoint()->wpaFlags();
-    NetworkManager::AccessPoint::WpaFlags rsnFlag = net->referenceAccessPoint()->rsnFlags();
+    NetworkManager::AccessPoint::Capabilities cap = accessPointPtr->capabilities();
+    NetworkManager::AccessPoint::WpaFlags wpaFlag = accessPointPtr->wpaFlags();
+    NetworkManager::AccessPoint::WpaFlags rsnFlag = accessPointPtr->rsnFlags();
     m_secuType = enumToQstring(cap, wpaFlag, rsnFlag);
 //    if (m_secuType.indexOf(ENTERPRICE_TYPE) >= 0) {
 //            m_kySecuType = WPA_AND_WPA2_ENTERPRISE;
@@ -77,9 +93,9 @@ void KyWirelessNetItem::init(NetworkManager::WirelessNetwork::Ptr net)
 //            m_kySecuType = WPA_AND_WPA2_PERSONAL;
 //    }
     setKySecuType(m_secuType);
-    m_bssid = net->referenceAccessPoint()->hardwareAddress();
+    m_bssid = accessPointPtr->hardwareAddress();
     m_device = net->device();
-    m_uni = net->referenceAccessPoint()->uni();
+    m_uni = accessPointPtr->uni();
 
     NetworkManager::Device::Ptr devicePtr = nullptr;
     devicePtr = m_networkResourceInstance->findDeviceInterface(m_device);

src/backend/dbus-interface/kywirelessnetresource.cpp

@@ -358,6 +358,9 @@ void KyWirelessNetResource::kyWirelessNetItemListInit()
         }
 
         KyWirelessNetItem item(net);
+        if (item.m_NetSsid.isEmpty()) {
+            continue;
+        }
         if (!m_WifiNetworkList.contains(devIface)){
             QList<KyWirelessNetItem> list;
             list.append(item);

src/main.cpp

@@ -25,6 +25,7 @@
 #include <QDebug>
 #include <QDesktopWidget>
 #include <QFile>
+#include <KWindowSystem>
 #include <ukui-log4qt.h>
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 12, 0))
 #include "xatom-helper.h"
@@ -78,6 +79,27 @@ void messageOutput(QtMsgType type, const QMessageLogContext &context, const QStr
         fclose(log_file);
 }
 
+QString displayFromPid(uint pid)
+{
+    QFile environFile(QStringLiteral("/proc/%1/environ").arg(QString::number(pid)));
+    if (environFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
+        const QByteArray DISPLAY  = KWindowSystem::isPlatformWayland() ? QByteArrayLiteral("WAYLAND_DISPLAY") : QByteArrayLiteral("DISPLAY");
+        const auto lines = environFile.readAll().split('\0');
+        for (const QByteArray &line : lines) {
+            const int equalsIdx = line.indexOf('=');
+            if (equalsIdx <= 0) {
+                continue;
+            }
+            const QByteArray key = line.left(equalsIdx);
+            if (key == DISPLAY) {
+                const QByteArray value = line.mid(equalsIdx + 1);
+                return value;
+            }
+        }
+    }
+    return {};
+}
+
 int main(int argc, char *argv[])
 {
     initUkuiLog4qt("kylin-nm");
@@ -110,12 +132,20 @@ int main(int argc, char *argv[])
     if(interface.isValid()) {
         if (parser.isSet(swOption))
         {
-            interface.call(QStringLiteral("showKylinNM"),1);
+            interface.call(QStringLiteral("showKylinNM"), 1);
+        } else if (parser.isSet(snOption)){
+            interface.call(QStringLiteral("showKylinNM"), 0);
         } else {
-            interface.call(QStringLiteral("showKylinNM"),0);
-        }
+            const QString serviceName = "com.kylin.network";
+            QDBusConnectionInterface *interface1 = QDBusConnection::sessionBus().interface();
+            QDBusReply<uint> pid = interface1->servicePid(serviceName);
+            qDebug() << "current display " << getenv("DISPLAY") << QApplication::applicationPid()
+                     << "exist kylin-nm display" << displayFromPid(pid.value());
+            if (getenv("DISPLAY") != displayFromPid(pid.value())) {
                 return 0;
             }
+        }
+    }
 
     QThread thread;
     KyNetworkResourceManager *p_networkResource = KyNetworkResourceManager::getInstance();