openkylin
/
kylin-nm
mirror of https://gitee.com/openkylin/kylin-nm.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

fix bug 157003 前端界面显示未托管无线网卡问题

See merge request kylinos-src/kylin-nm!141
This commit is contained in:
赵世旭 2023-04-17 07:33:23 +00:00
parent e352f8073e ddf74e12b4
commit 3256e0d20f
4 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/wlanconnect/wlanconnect.cpp
View File

@ -991,7 +991,7 @@ void WlanConnect::removeDeviceFrame(QString devName)
while ((layoutItem = item->lanItemFrame->layout()->takeAt(0)) != NULL) {
delete layoutItem->widget();
delete layoutItem;
item = nullptr;
layoutItem = nullptr;
}
item->itemMap.clear();
}

4
src/frontend/tab-pages/tabpage.cpp
View File

@ -434,7 +434,9 @@ void getDeviceEnableState(int type, QMap<QString, bool> &map)
if (!wirelessDevList.isEmpty()) {
for (int i = 0; i < wirelessDevList.size(); ++i) {
QString devName = wirelessDevList.at(i);
map.insert(devName, kdr->getDeviceManaged(devName));
if (kdr->getDeviceManaged(devName)) {
map.insert(devName, kdr->getDeviceManaged(devName));
}
}
}
}

30
src/frontend/tab-pages/wlanpage.cpp
View File

@ -70,6 +70,7 @@ WlanPage::WlanPage(QWidget *parent) : TabPage(parent)
connect(m_netDeviceResource, &KyNetworkDeviceResourse::deviceRemove, this, &WlanPage::onDeviceRemove);
connect(m_netDeviceResource, &KyNetworkDeviceResourse::deviceNameUpdate, this, &WlanPage::onDeviceNameUpdate);
connect(m_netDeviceResource, &KyNetworkDeviceResourse::deviceManagedChange, this, &WlanPage::onDeviceManagedChanged);
connect(m_netDeviceResource, &KyNetworkDeviceResourse::stateChanged, this, &WlanPage::onWlanStateChanged);
connect(m_wirelessConnectOpreation, &KyWirelessConnectOperation::activateConnectionError, this, &WlanPage::activateFailed);
@ -241,6 +242,17 @@ void WlanPage::initDevice()
m_netDeviceResource->getNetworkDeviceList(NetworkManager::Device::Type::Wifi, m_devList);
m_currentDevice = getDefaultDeviceName(WIRELESS);
if (m_devList.count() == 0) {
return;
}
for (int index = m_devList.count() - 1; index >= 0; --index) {
if (!m_netDeviceResource->getDeviceManaged(m_devList.at(index))) {
//删除未托管网卡
qDebug() << LOG_FLAG << "delete unmanaged device" << m_devList.at(index);
m_devList.removeOne(m_devList.at(index));
}
}
return;
}
@ -703,7 +715,7 @@ void WlanPage::addDeviceToCombox(QString deviceName)
m_deviceFrame->hide();
m_currentDevice = deviceName;
setDefaultDevice(WIRELESS, m_currentDevice);
} else if (m_deviceComboBox->count() == 0) {
} else if (m_deviceComboBox->count() == 0 && m_currentDevice != deviceName) {
m_deviceComboBox->addItem(m_currentDevice);
m_deviceComboBox->addItem(deviceName);
m_deviceFrame->show();
@ -762,7 +774,7 @@ void WlanPage::deleteDeviceFromCombox(QString deviceName)
m_currentDevice = m_devList.at(0);
setDefaultDevice(WIRELESS, m_currentDevice);
} else {
int index = m_deviceComboBox->findData(deviceName);
int index = m_deviceComboBox->findText(deviceName);
if (-1 != index) {
m_deviceComboBox->removeItem(index);
m_currentDevice = m_deviceComboBox->currentText();
@ -856,6 +868,20 @@ void WlanPage::onWlanStateChanged(NetworkManager::Device::State newstate, Networ
Q_EMIT wirelessSwitchBtnChanged(getSwitchBtnState());
}
void WlanPage::onDeviceManagedChanged(QString deviceName, bool managed)
{
if (managed && !m_devList.contains(deviceName)) {
//添加新增托管网卡
onDeviceAdd(deviceName, NetworkManager::Device::Type::Wifi);
qDebug() << LOG_FLAG << "add managed device" << deviceName;
}
if (!managed && m_devList.contains(deviceName)) {
//删除未托管网卡
onDeviceRemove(deviceName);
qDebug() << LOG_FLAG << "delete unmanaged device" << deviceName;
}
}
void WlanPage::sendApStateChangeSignal(QString uuid,
QString ssid,
QString deviceName,

1
src/frontend/tab-pages/wlanpage.h
View File

@ -129,6 +129,7 @@ private Q_SLOTS:
void onRefreshIconTimer();
void onWlanStateChanged(NetworkManager::Device::State newstate, NetworkManager::Device::State oldstate, NetworkManager::Device::StateChangeReason reason);
void onDeviceManagedChanged(QString deviceName, bool managed);
protected:
bool eventFilter(QObject *watched, QEvent *event);