fix: support GBK-encoded SSID display and match

net-view/operation/private/nethotspotcontroller.cpp

@@ -5,12 +5,14 @@
 
 #include <NetworkManagerQt/Ipv4Setting>
 #include <NetworkManagerQt/Manager>
 #include <NetworkManagerQt/Settings>
 #include <NetworkManagerQt/WirelessSecuritySetting>
 #include <NetworkManagerQt/WirelessSetting>
+
 #include <hotspotcontroller.h>
 #include <networkcontroller.h>
+#include <netutils.h>
 #include <wirelessdevice.h>
 
 namespace dde {
 namespace network {
@@ -186,6 +188,14 @@
         config.insert(it.key(), it.value());
     }
     QVariantMap typeMap = config["802-11-wireless"].value<QVariantMap>();
+    // ssid 在 NM 侧是原始字节(可能 GBK 编码),转为 UTF-8 字符串后交给 UI 显示,
+    // 避免 QML 按 UTF-8 直读 QByteArray 产生乱码(参考 nm_utils_ssid_to_utf8 语义)
+    QByteArray rawSsid;
+    if (typeMap.contains("ssid")) {
+        rawSsid = typeMap.value("ssid").toByteArray();
+        if (!rawSsid.isEmpty())
+            typeMap["ssid"] = ssidToUtf8(rawSsid);
+    }
     typeMap.insert("optionalDevice", m_optionalDevice);
     config["802-11-wireless"] = typeMap;
     m_config = config;

net-view/operation/private/netmanagerthreadprivate.cpp

@@ -17,9 +17,11 @@
 #include "networkdetails.h"
 #include "networkdevicebase.h"
 #include "networkmanagerqt/manager.h"
 #include "private/vpnparameterschecker.h"
 #include "wireddevice.h"
 #include "wirelessdevice.h"
+#include <netutils.h>
+
 
 #include <NetworkManagerQt/AccessPoint>
 #include <NetworkManagerQt/Ipv6Setting>
@@ -717,7 +719,7 @@
     if (!wirelessDevice)
         return;
     NetWirelessConnect wConnect(wirelessDevice, nullptr, this);
-    wConnect.setSsid(ssid);
+    wConnect.setRawSsid(ssid.toUtf8());
     wConnect.initConnection();
     wConnect.connectNetwork();
 }
@@ -779,7 +781,7 @@
         return;
     }
     NetWirelessConnect wConnect(wirelessDevice, ap, this);
-    wConnect.setSsid(ap->ssid());
+    wConnect.setRawSsid(ap->rawSsid());
     wConnect.initConnection();
     QString secret = wConnect.needSecrets();
 
@@ -954,9 +956,8 @@
         ConnectionSettings::Ptr settings;
         for (const NetworkManager::Connection::Ptr &con : netDevice->availableConnections()) {
             NetworkManager::WirelessSetting::Ptr wSetting = con->settings()->setting(NetworkManager::Setting::SettingType::Wireless).staticCast<NetworkManager::WirelessSetting>();
-            if (wSetting->ssid() != ap->ssid()) {
+            if (!ssidBytesMatch(wSetting->ssid(), ap->rawSsid(), ap->ssid()))
                 continue;
-            }
             settings = con->settings();
 
             WirelessSecuritySetting::Ptr const sSetting = settings->setting(Setting::SettingType::WirelessSecurity).staticCast<WirelessSecuritySetting>();
@@ -980,7 +981,7 @@
                 NetworkManager::ConnectionSettings::Ptr settings = NetworkManager::ConnectionSettings::Ptr(new ConnectionSettings(ConnectionSettings::Wireless));
                 settings->setId(ap->ssid());
                 NetworkManager::WirelessSetting::Ptr wSetting = settings->setting(Setting::SettingType::Wireless).staticCast<WirelessSetting>();
-                wSetting->setSsid(ap->ssid().toUtf8());
+                wSetting->setSsid(ssidForSave(ap->rawSsid(), ap->ssid()));
                 wSetting->setInitialized(true);
                 WirelessSecuritySetting::Ptr wsSetting = settings->setting(Setting::WirelessSecurity).dynamicCast<WirelessSecuritySetting>();
                 switch (keyMgmt) {
@@ -1186,9 +1187,8 @@
         ConnectionSettings::Ptr settings;
         for (const NetworkManager::Connection::Ptr &con : netDevice->availableConnections()) {
             NetworkManager::WirelessSetting::Ptr wSetting = con->settings()->setting(NetworkManager::Setting::SettingType::Wireless).staticCast<NetworkManager::WirelessSetting>();
-            if (wSetting->ssid() != ap->ssid()) {
+            if (!ssidBytesMatch(wSetting->ssid(), ap->rawSsid(), ap->ssid()))
                 continue;
-            }
             settings = con->settings();
 
             WirelessSecuritySetting::Ptr sSetting = settings->setting(Setting::SettingType::WirelessSecurity).staticCast<WirelessSecuritySetting>();
@@ -1283,7 +1283,7 @@
             NetworkManager::ConnectionSettings::Ptr settings = NetworkManager::ConnectionSettings::Ptr(new ConnectionSettings(ConnectionSettings::Wireless));
             settings->setId(ap->ssid());
             NetworkManager::WirelessSetting::Ptr wSetting = settings->setting(Setting::SettingType::Wireless).staticCast<WirelessSetting>();
-            wSetting->setSsid(ap->ssid().toUtf8());
+            wSetting->setSsid(ssidForSave(ap->rawSsid(), ap->ssid()));
             wSetting->setHidden(hidden);
             wSetting->setInitialized(true);
             WirelessSecuritySetting::Ptr wsSetting = settings->setting(Setting::WirelessSecurity).dynamicCast<WirelessSecuritySetting>();
@@ -2176,7 +2176,8 @@
             NetworkManager::WirelessSetting::Ptr wirelessSetting = connection->settings()->setting(NetworkManager::Setting::SettingType::Wireless).dynamicCast<NetworkManager::WirelessSetting>();
             if (wirelessSetting.isNull())
                 return false;
-            return wirelessSetting->ssid() == ap->ssid() && !connection->isUnsaved();
+            return ssidBytesMatch(wirelessSetting->ssid(), ap->rawSsid(), ap->ssid())
+                && !connection->isUnsaved();
         });
         item->updatehasConnection(itConnection != connections.end());
         Q_EMIT itemAdded(device->path(), item);
@@ -2290,7 +2291,8 @@
                 NetworkManager::WirelessSetting::Ptr wirelessSetting = connection->settings()->setting(NetworkManager::Setting::SettingType::Wireless).dynamicCast<NetworkManager::WirelessSetting>();
                 if (wirelessSetting.isNull())
                     return false;
-                return wirelessSetting->ssid() == tmpAp->ssid() && !connection->isUnsaved();
+                return ssidBytesMatch(wirelessSetting->ssid(), tmpAp->rawSsid(), tmpAp->ssid())
+                    && !connection->isUnsaved();
             });
             if (itConnection != connections.end()) {
                 availableAccessPoints.append(apID(tmpAp));
@@ -2811,7 +2813,8 @@
                 NetworkManager::WirelessSecuritySetting::Ptr const wsSetting = connSettings->setting(NetworkManager::Setting::SettingType::WirelessSecurity).staticCast<NetworkManager::WirelessSecuritySetting>();
                 if ((wsSetting) && NetworkManager::WirelessSecuritySetting::KeyMgmt::Unknown == wsSetting->keyMgmt()) {
                     for (auto *ap : wireless->accessPointItems()) {
-                        if (ap->ssid() == wSetting->ssid() && ap->secured() && ap->strength() > 0) {
+                        if (ssidBytesMatch(wSetting->ssid(), ap->rawSsid(), ap->ssid())
+                                && ap->secured() && ap->strength() > 0) {
                             handleAccessPointSecure(ap);
                         }
                     }
@@ -2957,7 +2960,7 @@
             return;
 
         NetWirelessConnect wConnect(dynamic_cast<WirelessDevice *>(*it), accessPoint, this);
-        wConnect.setSsid(accessPoint->ssid());
+        wConnect.setRawSsid(accessPoint->rawSsid());
         wConnect.initConnection();
         QVariantMap param;
         param.insert("secrets", { wConnect.needSecrets() });
@@ -3057,7 +3060,7 @@
         dde::network::WirelessDevice *wirelessDevice = static_cast<dde::network::WirelessDevice *>(networkDevice);
         // 找到无线连接对应那个网络
         for (dde::network::AccessPoints *ap : wirelessDevice->accessPointItems()) {
-            if (ap->ssid() != wirelessSetting->ssid())
+            if (!ssidBytesMatch(wirelessSetting->ssid(), ap->rawSsid(), ap->ssid()))
                 continue;
 
             Q_EMIT dataChanged(DataChanged::portalUrlChanged, apID(ap), portalUrl);

net-view/operation/private/netwirelessconnect.cpp

@@ -1,11 +1,12 @@
-// SPDX-FileCopyrightText: 2018 - 2022 UnionTech Software Technology Co., Ltd.
+// SPDX-FileCopyrightText: 2018 - 2026 UnionTech Software Technology Co., Ltd.
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 #include "netwirelessconnect.h"
 
 #include "configsetting.h"
 #include "nmnetworkmanager.h"
+#include <netutils.h>
 
 #include <NetworkManagerQt/AccessPoint>
 #include <NetworkManagerQt/ActiveConnection>
@@ -38,9 +39,9 @@ NetWirelessConnect::NetWirelessConnect(dde::network::WirelessDevice *device, dde
 
 NetWirelessConnect::~NetWirelessConnect() = default;
 
-void NetWirelessConnect::setSsid(const QString &ssid)
+void NetWirelessConnect::setRawSsid(const QByteArray &rawSsid)
 {
-    m_ssid = ssid;
+    m_rawSsid = rawSsid;
     m_connectionSettings.clear();
 }
 
@@ -187,12 +188,12 @@ bool NetWirelessConnect::initConnection()
     if (m_accessPoint) {
         NetworkManager::Connection::Ptr conn;
         for (const ActiveConnection::Ptr &con : NetworkManager::activeConnections()) {
-            if (con->type() != ConnectionSettings::ConnectionType::Wireless || con->id() != m_ssid)
+            if (con->type() != ConnectionSettings::ConnectionType::Wireless)
                 continue;
 
             NetworkManager::ConnectionSettings::Ptr connSettings = con->connection()->settings();
             NetworkManager::WirelessSetting::Ptr wSetting = connSettings->setting(NetworkManager::Setting::SettingType::Wireless).staticCast<NetworkManager::WirelessSetting>();
-            if (wSetting.isNull())
+            if (wSetting.isNull() || wSetting->ssid() != m_rawSsid)
                 continue;
 
             QString settingMacAddress = wSetting->macAddress().toHex().toUpper();
@@ -208,7 +209,7 @@ bool NetWirelessConnect::initConnection()
             // 如果找到的conn是空的,当前的setting也需要重置
             m_connectionSettings.reset();
             for (auto item : m_device->items()) {
-                if (item->connection()->ssid() != m_ssid)
+                if (item->connection()->ssid() != m_rawSsid)
                     continue;
 
                 QString uuid = item->connection()->uuid();
@@ -237,11 +238,12 @@ bool NetWirelessConnect::initConnection()
             uuid.replace(24, QString::number(second).length(), QString::number(second));
         }
         m_connectionSettings->setUuid(uuid);
-        m_connectionSettings->setId(m_ssid);
+        QString ssid = ssidToUtf8(m_rawSsid);
+        m_connectionSettings->setId(ssid);
         if (!m_accessPoint) {
             m_connectionSettings->setting(Setting::SettingType::Wireless).staticCast<WirelessSetting>()->setHidden(true);
         }
-        qCInfo(DNC) << "Wireless connect init, create connect: ssid: " << m_ssid << ", uuid: " << uuid << ", access point: " << m_accessPoint;
+        qCInfo(DNC) << "Wireless connect init, create connect: ssid: " << ssid << ", uuid: " << uuid << ", access point: " << m_accessPoint;
         if (m_accessPoint) {
             WirelessSecuritySetting::Ptr wsSetting = m_connectionSettings->setting(Setting::WirelessSecurity).dynamicCast<WirelessSecuritySetting>();
             WirelessSecuritySetting::KeyMgmt keyMgmt = getKeyMgmtByAp(m_accessPoint);
@@ -261,7 +263,9 @@ bool NetWirelessConnect::initConnection()
             }
         }
         WirelessSetting::Ptr const wirelessSetting = m_connectionSettings->setting(Setting::Wireless).dynamicCast<WirelessSetting>();
-        wirelessSetting->setSsid(m_ssid.toUtf8());
+        // 优先保存 AP 原始字节(与 NM 字节匹配一致),rawSsid 为空(如隐藏网络)时回退 UTF-8
+        const QByteArray rawSsid = m_accessPoint ? m_accessPoint->rawSsid() : QByteArray();
+        wirelessSetting->setSsid(ssidForSave(rawSsid, m_rawSsid));
         wirelessSetting->setInitialized(true);
         m_needUpdate = true;
         if (m_needIdentify) {

net-view/operation/private/netwirelessconnect.h

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2018 - 2022 UnionTech Software Technology Co., Ltd.
+// SPDX-FileCopyrightText: 2018 - 2026 UnionTech Software Technology Co., Ltd.
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -27,7 +27,7 @@ class NetWirelessConnect : public QObject
     explicit NetWirelessConnect(dde::network::WirelessDevice *device, dde::network::AccessPoints *ap, QObject *parent = nullptr);
     ~NetWirelessConnect() Q_DECL_OVERRIDE;
 
-    void setSsid(const QString &ssid);
+    void setRawSsid(const QByteArray &rawSsid);
     bool initConnection();
 
     bool passwordIsValid(const QString &password);
@@ -53,7 +53,7 @@ public Q_SLOTS:
 private:
     dde::network::WirelessDevice *m_device;
     dde::network::AccessPoints *m_accessPoint;
-    QString m_ssid;
+    QByteArray m_rawSsid;
     bool m_needUpdate;
     bool m_needIdentify;
 

src/impl/netinterface.h

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2018 - 2022 UnionTech Software Technology Co., Ltd.
+// SPDX-FileCopyrightText: 2018 - 2026 UnionTech Software Technology Co., Ltd.
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -189,6 +189,7 @@ class AccessPointProxy : public QObject
     virtual ConnectionStatus status() const = 0;                                // 当前网络的连接状态
     virtual bool hidden() const = 0;                                            // 是否为隐藏网络
     virtual bool isWlan6() const = 0;
+    virtual QByteArray rawSsid() const { return QByteArray(); }                    // 网络SSID原始字节，用于与NM侧连接字节精确匹配
 
 Q_SIGNALS:
     void strengthChanged(const int);                                            // 当前信号强度变化

src/impl/networkmanager/accesspointproxynm.cpp

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2018 - 2023 UnionTech Software Technology Co., Ltd.
+// SPDX-FileCopyrightText: 2018 - 2026 UnionTech Software Technology Co., Ltd.
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -57,9 +57,21 @@ bool AccessPointProxyNM::contains(const QString &uni) const
 
 QString AccessPointProxyNM::ssid() const
 {
+    // 用原始字节做 locale 感知解码(对齐 nm_utils_ssid_to_utf8),避免依赖上游 qt6 的 fromUtf8
+    const QByteArray raw = rawSsid();
+    if (!raw.isEmpty())
+        return ssidToUtf8(raw);
     return m_network->ssid();
 }
 
+QByteArray AccessPointProxyNM::rawSsid() const
+{
+    if (m_network.isNull() || m_network->referenceAccessPoint().isNull())
+        return QByteArray();
+
+    return m_network->referenceAccessPoint()->rawSsid();
+}
+
 int AccessPointProxyNM::strength() const
 {
     return m_strength;
@@ -134,7 +146,7 @@ void AccessPointProxyNM::initState()
     if (wirelessSetting.isNull())
         return;
 
-    if (wirelessSetting->ssid() != m_network->ssid())
+    if (!ssidBytesMatch(wirelessSetting->ssid(), rawSsid(), ssid()))
         return;
 
     updateStatus(convertStateFromNetworkManager(activeConnection->state()));
@@ -180,8 +192,7 @@ void AccessPointProxyNM::updateHiddenInfo()
         NetworkManager::WirelessSetting::Ptr wirelessSetting = connection->settings()->setting(NetworkManager::Setting::SettingType::Wireless).dynamicCast<NetworkManager::WirelessSetting>();
         if (wirelessSetting.isNull())
             return false;
-
-        return wirelessSetting->ssid() == m_network->ssid();
+        return ssidBytesMatch(wirelessSetting->ssid(), rawSsid(), ssid());
     });
     // 如果没有找到连接，就是非隐藏网络
     if (itConnection == connections.end())

src/impl/networkmanager/accesspointproxynm.h

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2018 - 2023 UnionTech Software Technology Co., Ltd.
+// SPDX-FileCopyrightText: 2018 - 2026 UnionTech Software Technology Co., Ltd.
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -39,6 +39,7 @@ class AccessPointProxyNM : public AccessPointProxy
     ConnectionStatus status() const override;
     bool hidden() const override;
     bool isWlan6() const override;
+    QByteArray rawSsid() const override;
     void updateStrengthFromActiveAp(int strength);
 
 private: