fix: Synchronize dss-network-plugin 107x interface

Synchronize dss-network-plugin 107x interface

pms: TASK-361719

Author: caixr23

dss-network-plugin/networkmodule.cpp

@@ -13,13 +13,19 @@
 
 #include <QApplication>
 #include <QDBusConnection>
+#include <QDBusConnectionInterface>
 #include <QDBusInterface>
 #include <QDBusMessage>
+#include <QDBusServiceWatcher>
 #include <QTime>
 #include <QWidget>
 
 #define NETWORK_KEY "network-item-key"
 
+static QString networkService = "org.deepin.service.SystemNetwork";
+static QString networkPath = "/org/deepin/service/SystemNetwork";
+static QString networkInterface = "org.deepin.service.SystemNetwork";
+
 const int CONTENT_SPACING = 10;
 
 static Q_LOGGING_CATEGORY(DNC, "org.deepin.dde.session-shell.network");
@@ -167,7 +173,7 @@ void NetworkModule::installTranslator(const QString &locale)
     QApplication::removeTranslator(&translator);
     translator.load(QString("/usr/share/dss-network-plugin/translations/dss-network-plugin_%1").arg(locale));
     QApplication::installTranslator(&translator);
-    // m_manager->updateLanguage(localTmp);
+    m_manager->updateLanguage(localTmp);
 }
 
 NetworkPlugin::NetworkPlugin(QObject *parent)
@@ -279,5 +285,49 @@ void NetworkPlugin::setMessage(bool visible)
     qCInfo(DNC) << "Set message:" << doc.toJson();
 }
 
+QString NetworkPlugin::message(const QString &msgData)
+{
+    qDebug() << "message" << msgData;
+    QJsonDocument json = QJsonDocument::fromJson(msgData.toLatin1());
+    QJsonObject jsonObject = json.object();
+    if (!jsonObject.contains("data")) {
+        qWarning() << "msgData don't containt data" << msgData;
+        QJsonDocument jsonResult;
+        QJsonObject resultObject;
+        resultObject.insert("data", QString("msgData don't containt data %1").arg(msgData));
+        jsonResult.setObject(resultObject);
+        return jsonResult.toJson();
+    }
+    QJsonObject dataObject = jsonObject.value("data").toObject();
+    QString locale = dataObject.value("locale").toString();
+    qDebug() << "read locale" << locale;
+    m_network->installTranslator(locale);
+    // 同时更新网络服务的语言
+    if (QDBusConnection::systemBus().interface()->isServiceRegistered(networkService)) {
+        qDebug() << "update SystemNetworm Language" << locale;
+        QDBusInterface dbusInter(networkService, networkPath, networkInterface, QDBusConnection::systemBus());
+        QDBusPendingCall reply = dbusInter.asyncCall("UpdateLanguage", locale);
+        reply.waitForFinished();
+    } else {
+        qWarning() << networkService << "don't start, wait for it start";
+        QDBusServiceWatcher *serviceWatcher = new QDBusServiceWatcher(this);
+        serviceWatcher->setConnection(QDBusConnection::systemBus());
+        serviceWatcher->addWatchedService(networkService);
+        connect(serviceWatcher, &QDBusServiceWatcher::serviceRegistered, this, [locale](const QString &service) {
+            if (service == networkService) {
+                QDBusInterface dbusInter(networkService, networkPath, networkInterface, QDBusConnection::systemBus());
+                QDBusPendingCall reply = dbusInter.asyncCall("UpdateLanguage", locale);
+                reply.waitForFinished();
+            }
+        });
+    }
+
+    QJsonDocument jsonResult;
+    QJsonObject resultObject;
+    resultObject.insert("data", "success");
+    jsonResult.setObject(resultObject);
+    return jsonResult.toJson();
+}
+
 } // namespace network
 } // namespace dde

dss-network-plugin/networkmodule.h

@@ -32,6 +32,7 @@ class NetworkModule : public QObject
     virtual QWidget *itemTipsWidget() const;
     virtual const QString itemContextMenu() const;
     virtual void invokedMenuItem(const QString &menuId, const bool checked) const;
+    void installTranslator(const QString &locale);
 
     inline dde::network::NetStatus *netStatus() const { return m_netStatus; }
 
@@ -44,9 +45,6 @@ protected Q_SLOTS:
     void onUserChanged(const QString &json);
     void onNotify(uint replacesId);
 
-private:
-    void installTranslator(const QString &locale);
-
 protected:
     QWidget *m_contentWidget;
     dde::network::NetManager *m_manager;
@@ -93,6 +91,7 @@ class NetworkPlugin : public QObject, public dss::module::TrayModuleInterface
 
     void requestShowContent();
     void setMessage(bool visible);
+    QString message(const QString &msgData) override;
 
 Q_SIGNALS:
     void notifyNetworkStateChanged(bool);

net-view/operation/netmanager.cpp

@@ -835,9 +835,13 @@ void NetManagerPrivate::clearPasswordRequest(const QString &id)
 
 void NetManagerPrivate::retranslateUi()
 {
-    // for (auto &&item : m_dataMap) {
-    //     item->retranslateUi();
-    // }
+    QVector<NetItem *> items;
+    items.append(m_root->item());
+    while (!items.isEmpty()) {
+        NetItem *item = items.takeFirst();
+        Q_EMIT item->nameChanged(item->name());
+        items.append(item->getChildren());
+    }
 }
 
 void NetManagerPrivate::onItemDestroyed(QObject *obj)

net-view/operation/private/netmanagerthreadprivate.cpp

@@ -299,7 +299,7 @@ void NetManagerThreadPrivate::userCancelRequest(const QString &id)
 
 void NetManagerThreadPrivate::retranslate(const QString &locale)
 {
-    NetworkController::installTranslator(QLocale().name());
+    NetworkController::installTranslator(locale);
     if (m_isInitialized)
         QMetaObject::invokeMethod(this, "doRetranslate", Qt::QueuedConnection, Q_ARG(QString, locale));
 }