fix: update wireless signal strength calculation and improve speed retrieval

Updated the signal strength calculation to provide a more accurate representation based on the signal level. Introduced a new method to retrieve wireless speed using the 'iw' command, replacing the previous method that relied on 'iwlist'.

Log: as above.

Bug: https://pms.uniontech.com/bug-view-315553.html
(cherry picked from commit 5644445)

Author: itsXuSt

deepin-system-monitor-main/gui/netif_summary_view_widget.h

@@ -310,7 +310,10 @@ class NetInfoModel : public QAbstractTableModel
 
                 // 信号强度
                 stInfo.strKey = QApplication::translate("NetInfoModel", "Signal strength");
-                stInfo.strValue = QString("%1 dBm").arg(stNetifInfo->signalLevel());
+                auto strenth = stNetifInfo->signalLevel();
+                // 这个算法可能不是最准确的，后续如果有更准确的算法，可以替换，信号强度转信号等级
+                auto level = -100 + 70 * (1 - strenth / 100.0);
+                stInfo.strValue = QString("%1 dBm").arg(level);
                 m_listInfo << stInfo;
 
                 // 底噪

deepin-system-monitor-main/system/netif.cpp

@@ -7,173 +7,160 @@
 #include "ddlog.h"
 
 #include "nl_addr.h"
+#include "nl_hwaddr.h"
 #include "nl_link.h"
 #include "wireless.h"
-#include "nl_hwaddr.h"
 
 #include <QProcess>
+#include <QRegularExpression>
+#include <QRegularExpressionMatch>
 
-#include <netlink/route/link.h>
-#include <netlink/addr.h>
 #include <linux/sockios.h>
-#include<unistd.h>
-#include<sys/ioctl.h>
+#include <netlink/addr.h>
+#include <netlink/route/link.h>
+#include <sys/ioctl.h>
+#include <unistd.h>
 
 using namespace DDLog;
 
 namespace core {
 namespace system {
 
-NetifInfo::NetifInfo()
-    : d(new NetifInfoPrivate())
-{
-    qCDebug(app) << "NetifInfo constructor";
+NetifInfo::NetifInfo() : d(new NetifInfoPrivate()) {
+  qCDebug(app) << "NetifInfo constructor";
 }
-NetifInfo::NetifInfo(const NetifInfo &other)
-    : d(other.d)
-{
-    qCDebug(app) << "NetifInfo copy constructor";
+NetifInfo::NetifInfo(const NetifInfo &other) : d(other.d) {
+  qCDebug(app) << "NetifInfo copy constructor";
 }
-NetifInfo &NetifInfo::operator=(const NetifInfo &rhs)
-{
-    qCDebug(app) << "NetifInfo assignment operator";
-    if (this == &rhs)
-        return *this;
-
-    d = rhs.d;
+NetifInfo &NetifInfo::operator=(const NetifInfo &rhs) {
+  qCDebug(app) << "NetifInfo assignment operator";
+  if (this == &rhs)
     return *this;
+
+  d = rhs.d;
+  return *this;
 }
-NetifInfo::~NetifInfo()
-{
-    // qCDebug(app) << "NetifInfo destructor";
+NetifInfo::~NetifInfo() {
+  // qCDebug(app) << "NetifInfo destructor";
 }
 
+void NetifInfo::set_recv_bps(qreal recv_bps) { d->recv_bps = recv_bps; }
 
-void NetifInfo::set_recv_bps(qreal recv_bps)
-{
-    d->recv_bps = recv_bps;
-}
+void NetifInfo::set_sent_bps(qreal sent_bps) { d->sent_bps = sent_bps; }
 
-void NetifInfo::set_sent_bps(qreal sent_bps)
-{
-    d->sent_bps = sent_bps;
+void NetifInfo::updateHWAddr(const QByteArray ifname) {
+  qCDebug(app) << "Updating HW address info for" << ifname;
+  NLHWAddr nl_hwaddr(ifname);
+  d->conn_type = nl_hwaddr.conn_type();
+  qCDebug(app) << "Connection type for" << ifname << "is" << d->conn_type;
 }
 
-void NetifInfo::updateHWAddr(const QByteArray ifname)
-{
-    qCDebug(app) << "Updating HW address info for" << ifname;
-    NLHWAddr nl_hwaddr(ifname);
-    d->conn_type = nl_hwaddr.conn_type();
-    qCDebug(app) << "Connection type for" << ifname << "is" << d->conn_type;
+void NetifInfo::updateLinkInfo(const NLLink *link) {
+  if (!link) {
+    qCWarning(app) << "updateLinkInfo called with null link";
+    return;
+  }
+
+  qCDebug(app) << "Updating link info for" << link->ifname();
+
+  d->index = link->ifindex();
+  d->ifname = link->ifname();
+  d->alias = link->alias();
+
+  d->mtu = link->mtu();
+  d->flags = link->flags();
+  d->arp_type = link->arp_type();
+  d->txqlen = link->txqlen();
+  d->carrier_changes = link->carrier_changes();
+  d->carrier = link->carrier();
+  d->oper_stat = link->oper_stat();
+  d->link_mode = link->link_mode();
+  d->hw_addr = link->addr();
+  d->hw_bcast = link->bcast();
+
+  // ====link params====
+
+  QByteArray conn_type;
+  QString brand;
+
+  // ====stats====
+
+  d->rx_packets = link->rx_packets();
+  d->rx_bytes = link->rx_bytes();
+  d->rx_errors = link->rx_errors();
+  d->rx_dropped = link->rx_dropped();
+  d->rx_fifo = link->rx_fifo();
+  d->rx_frame = link->rx_frame();
+
+  d->tx_packets = link->tx_packets();
+  d->tx_bytes = link->tx_bytes();
+  d->tx_errors = link->tx_errors();
+  d->tx_dropped = link->tx_dropped();
+  d->tx_fifo = link->tx_fifo();
+  d->tx_carrier = link->tx_carrier();
+  d->collisions = link->collisions();
+
+  this->updateWirelessInfo();
+  this->updateBrandInfo();
+  this->updateHWAddr(d->ifname);
+  qCDebug(app) << "Finished updating link info for" << d->ifname;
 }
 
-void NetifInfo::updateLinkInfo(const NLLink *link)
-{
-    if (!link) {
-        qCWarning(app) << "updateLinkInfo called with null link";
-        return;
-    }
-
-    qCDebug(app) << "Updating link info for" << link->ifname();
-
-    d->index = link->ifindex();
-    d->ifname = link->ifname();
-    d->alias = link->alias();
-
-    d->mtu = link->mtu();
-    d->flags = link->flags();
-    d->arp_type = link->arp_type();
-    d->txqlen = link->txqlen();
-    d->carrier_changes = link->carrier_changes();
-    d->carrier = link->carrier();
-    d->oper_stat = link->oper_stat();
-    d->link_mode = link->link_mode();
-    d->hw_addr = link->addr();
-    d->hw_bcast = link->bcast();
-
-    // ====link params====
-
-    QByteArray conn_type;
-    QString brand;
-
-    // ====stats====
-
-    d->rx_packets = link->rx_packets();
-    d->rx_bytes = link->rx_bytes();
-    d->rx_errors = link->rx_errors();
-    d->rx_dropped = link->rx_dropped();
-    d->rx_fifo = link->rx_fifo();
-    d->rx_frame = link->rx_frame();
-
-    d->tx_packets = link->tx_packets();
-    d->tx_bytes = link->tx_bytes();
-    d->tx_errors = link->tx_errors();
-    d->tx_dropped = link->tx_dropped();
-    d->tx_fifo = link->tx_fifo();
-    d->tx_carrier = link->tx_carrier();
-    d->collisions = link->collisions();
-
-    this->updateWirelessInfo();
-    this->updateBrandInfo();
-    this->updateHWAddr(d->ifname);
-    qCDebug(app) << "Finished updating link info for" << d->ifname;
+void NetifInfo::updateWirelessInfo() {
+  qCDebug(app) << "Updating wireless info for" << d->ifname;
+  wireless wireless1(d->ifname);
+  if (wireless1.is_wireless()) {
+    qCDebug(app) << d->ifname << "is a wireless device";
+    d->isWireless = true;
+    d->iw_info->essid = wireless1.essid();
+    d->iw_info->qual.qual = wireless1.link_quality();
+    d->iw_info->qual.level = wireless1.signal_levle();
+    d->iw_info->qual.noise = wireless1.noise_level();
+    // 速率
+    auto speed = getWirelessSpeed(d->ifname);
+    if (speed >= 0)
+      d->speed = static_cast<uint>(speed);
+  } else {
+    qCDebug(app) << d->ifname << "is not a wireless device";
+    d->isWireless = false;
+  }
 }
 
-void NetifInfo::updateWirelessInfo()
-{
-    qCDebug(app) << "Updating wireless info for" << d->ifname;
-    wireless wireless1(d->ifname);
-    if (wireless1.is_wireless()) {
-        qCDebug(app) << d->ifname << "is a wireless device";
-        d->isWireless = true;
-        d->iw_info->essid = wireless1.essid();
-        d->iw_info->qual.qual = wireless1.link_quality();
-        d->iw_info->qual.level = wireless1.signal_levle();
-        d->iw_info->qual.noise = wireless1.noise_level();
-        // 速率
-        //无线网速率ioctl没有提供相关接口，目前采用调用iwlist命令的方式获取 #bug 111694
-        QProcess process;
-        QString cmd = QString("iwlist ") + d.data()->ifname + QString(" rate");
-        qCDebug(app) << "Executing command:" << cmd;
-        process.start(cmd);
-        process.waitForFinished(-1);
-        //获取输出
-        QString data = process.readAllStandardOutput();
-        qCDebug(app) << "iwlist output:" << data.trimmed();
-        QStringList datalist = data.trimmed().split(":");
-        if (datalist.size() > 0) {
-            QString speedString = datalist[datalist.size() - 1];
-            float fspeed = 0;
-            QStringList  list = speedString.split(" ");
-            if (list.size() > 0) {
-                fspeed = list[0].toFloat();
-            }
-            d->speed = static_cast<uint>(fspeed);
-            qCDebug(app) << "Parsed wireless speed:" << d->speed << "Mb/s";
-        }
-    } else {
-        qCDebug(app) << d->ifname << "is not a wireless device";
-        d->isWireless = false;
-    }
+void NetifInfo::updateBrandInfo() {
+  qCDebug(app) << "Updating brand info for" << d->ifname;
+  struct ifreq ifr;
+  struct ethtool_cmd ecmd;
+
+  ecmd.cmd = 0x00000001;
+  memset(&ifr, 0, sizeof(ifr));
+  strcpy(ifr.ifr_name, d->ifname);
+
+  ifr.ifr_data = reinterpret_cast<caddr_t>(&ecmd);
+  int fd = socket(PF_INET, SOCK_DGRAM, 0);
+  if (ioctl(fd, SIOCETHTOOL, &ifr) == 0) {
+    d->speed = ecmd.speed;
+    qCDebug(app) << "Got speed via ioctl:" << d->speed;
+  }
+  close(fd);
 }
 
-void NetifInfo::updateBrandInfo()
-{
-    qCDebug(app) << "Updating brand info for" << d->ifname;
-    struct ifreq ifr;
-    struct ethtool_cmd ecmd;
-
-    ecmd.cmd = 0x00000001;
-    memset(&ifr, 0, sizeof(ifr));
-    strcpy(ifr.ifr_name, d->ifname);
-
-    ifr.ifr_data = reinterpret_cast<caddr_t>(&ecmd);
-    int fd = socket(PF_INET, SOCK_DGRAM, 0);
-    if (ioctl(fd, SIOCETHTOOL, &ifr) == 0) {
-        d->speed   = ecmd.speed;
-        qCDebug(app) << "Got speed via ioctl:" << d->speed;
-    }
-    close(fd);
+double NetifInfo::getWirelessSpeed(const QString &interface) {
+  QProcess process;
+  process.start("iw", QStringList() << "dev" << interface << "link");
+  process.waitForFinished();
+  QString output = process.readAllStandardOutput();
+
+  // 解析发送速率，实测发现控制中心显示的速率是 tx bitrate，所以这里只捕获 tx
+  // bitrate
+  QRegularExpression txRegex("tx bitrate:\\s+(\\d+\\.?\\d*)\\s+(\\w+)");
+  QRegularExpressionMatch txMatch = txRegex.match(output);
+
+  if (txMatch.hasMatch()) {
+    double rate = txMatch.captured(1).toDouble();
+    return static_cast<long>(rate);
+  }
+
+  return -1; // 表示无法获取速率
 }
 
 } // namespace system

deepin-system-monitor-main/system/netif.h

@@ -153,6 +153,7 @@ class NetifInfo
     void updateLinkInfo(const NLLink *link);
     void updateWirelessInfo(); // ioctl
     void updateBrandInfo(); // udev
+    double getWirelessSpeed(const QString &interface); // iw dev <interface> link
 
 private:
     QSharedDataPointer<NetifInfoPrivate> d;