From c1a535a0052ddb22f83835a8785da2dc54c2eac3 Mon Sep 17 00:00:00 2001
From: Jokul <wangshengshan011@163.com>
Date: Sun, 19 Jul 2026 19:22:54 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20version()=20=E7=94=A8=20value("Version")?=
 =?UTF-8?q?=20=E7=9B=B4=E6=8E=A5=E8=AF=BB=E5=8F=96=EF=BC=88DPluginMetaData?=
 =?UTF-8?q?=20=E5=B7=B2=E5=B1=95=E5=BC=80=20Plugin=20=E5=B1=82=E7=BA=A7?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/networkmonitorapplet.cpp | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/networkmonitorapplet.cpp b/src/networkmonitorapplet.cpp
index e865061..6294927 100644
--- a/src/networkmonitorapplet.cpp
+++ b/src/networkmonitorapplet.cpp
@@ -121,17 +121,10 @@ QString NetworkMonitorApplet::ipv6Address() const
 // dde-shell 加载时存入 DPluginMetaData，此处通过继承自 DApplet 的 pluginMetaData() 读取
 QString NetworkMonitorApplet::version() const
 {
-    // metadata.json 结构：{ "Plugin": { "Version": "x.y.z", ... } }
-    // DPluginMetaData 内部存储方式不确定：可能已展开 Plugin 层级（value("Version") 直接可用），
-    // 也可能保留原始嵌套结构（需 value("Plugin").toMap().value("Version")）
-    // 两种都尝试，取非空值
-    const DPluginMetaData meta = pluginMetaData();
-    QString v = meta.value("Version").toString();
-    if (v.isEmpty()) {
-        v = meta.value("Plugin").toMap().value("Version").toString();
-    }
-    qDebug() << "[JNetApplet] version() =" << v;
-    return v;
+    // DPluginMetaData::value() 已在 "Plugin" 层级内部查找（源码：frame/pluginmetadata.cpp）
+    // metadata.json 的 { "Plugin": { "Version": "x.y.z" } } 被 DPluginMetaData 加载后，
+    // value("Version") 直接返回版本号，无需再 .value("Plugin").toMap() 展开
+    return pluginMetaData().value("Version").toString();
 }
 
 void NetworkMonitorApplet::refresh()