Merge branch '2303bug-tray' into 'yhkylin/v101'

fix bug #172627  HW990已连接网络显示WiFi6/6+问题

See merge request kylinos-src/kylin-nm!173
This commit is contained in:
赵世旭 2023-05-26 03:30:52 +00:00
commit 3659e2067a
1 changed files with 5 additions and 3 deletions

View File

@ -456,9 +456,7 @@ void WlanListItem::refreshIcon(bool isActivated)
int signalStrength = 0; int signalStrength = 0;
QString uni = ""; QString uni = "";
QString secuType = ""; QString secuType = "";
if (m_isShowWifi6) {
category = m_wirelessNetItem.getCategory(m_wirelessNetItem.m_uni); category = m_wirelessNetItem.getCategory(m_wirelessNetItem.m_uni);
}
signalStrength = m_wirelessNetItem.m_signalStrength; signalStrength = m_wirelessNetItem.m_signalStrength;
if (isActivated) { if (isActivated) {
@ -468,6 +466,10 @@ void WlanListItem::refreshIcon(bool isActivated)
} }
} }
if (!m_isShowWifi6) {
category = 0;
}
QString iconPath = getIcon(m_hasPwd, signalStrength, category); QString iconPath = getIcon(m_hasPwd, signalStrength, category);
m_netButton->setButtonIcon(QIcon::fromTheme(iconPath)); m_netButton->setButtonIcon(QIcon::fromTheme(iconPath));