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

网线插拔对默认网卡的设置

This commit is contained in:
jzxc95 2021-08-26 14:19:18 +08:00
parent fefc33372d
commit a700ca7ee5
13 changed files with 222 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/backend/dbus-interface/kylinnetworkdeviceresource.cpp
View File

@ -7,10 +7,20 @@ KyNetworkDeviceResourse::KyNetworkDeviceResourse(QObject *parent) : QObject(pare
// m_activeConnectUuidList.clear();
m_activeConnectUuidMap.clear();
m_deviceMap.clear();
//TODO::get uuid from settings for system reboot;
connect(m_networkResourceInstance, &KyNetworkResourceManager::deviceAdd, this, &KyNetworkDeviceResourse::deviceAdd);
connect(m_networkResourceInstance, &KyNetworkResourceManager::deviceRemove, this, &KyNetworkDeviceResourse::deviceRemove);
initDeviceMap();
connect(m_networkResourceInstance, &KyNetworkResourceManager::deviceAdd, this, [=](QString deviceName, QString uni, NetworkManager::Device::Type deviceType) {
m_deviceMap.insert(uni,deviceName);
emit deviceAdd(deviceName, deviceType);
});
connect(m_networkResourceInstance, &KyNetworkResourceManager::deviceRemove, this, [=](QString deviceName, QString uni) {
m_deviceMap.remove(uni);
emit deviceRemove(deviceName);
});
connect(m_networkResourceInstance, &KyNetworkResourceManager::deviceUpdate, this, &KyNetworkDeviceResourse::onDeviceUpdate);
connect(m_networkResourceInstance, &KyNetworkResourceManager::deviceCarrierChanage, this, &KyNetworkDeviceResourse::carrierChanage);
connect(m_networkResourceInstance, &KyNetworkResourceManager::deviceBitRateChanage, this, &KyNetworkDeviceResourse::deviceBitRateChanage);
@ -23,6 +33,22 @@ KyNetworkDeviceResourse::~KyNetworkDeviceResourse()
m_networkResourceInstance = nullptr;
}
void KyNetworkDeviceResourse::initDeviceMap()
{
NetworkManager::Device::List deviceList
= m_networkResourceInstance->getNetworkDeviceList();
if (deviceList.isEmpty()) {;
return;
}
NetworkManager::Device::Ptr devicePtr = nullptr;
for (int index = 0; index < deviceList.size(); ++index) {
devicePtr = deviceList.at(index);
m_deviceMap.insert(devicePtr->uni(), devicePtr->interfaceName());
}
}
void KyNetworkDeviceResourse::getNetworkDeviceList(
NetworkManager::Device::Type deviceType,
QStringList &networkDeviceList)
@ -213,3 +239,15 @@ void KyNetworkDeviceResourse::setDeviceAutoConnect()
return;
}
void KyNetworkDeviceResourse::onDeviceUpdate(NetworkManager::Device * dev)
{
QString dbusPath = dev->uni();
QString interface = dev->interfaceName();
if (m_deviceMap.contains(dbusPath)) {
if (m_deviceMap[dbusPath] != interface) {
QString oldName = m_deviceMap[dbusPath];
m_deviceMap[dbusPath] = interface;
emit deviceNameUpdate(oldName, interface);
}
}
}

9
src/backend/dbus-interface/kylinnetworkdeviceresource.h
View File

@ -16,6 +16,7 @@ public:
signals:
void deviceAdd(QString deviceName, NetworkManager::Device::Type deviceType);
void deviceUpdate(QString deviceName);
void deviceNameUpdate(QString oldName, QString newName);
void deviceRemove(QString deviceName);
void stateChange(QString deviceName, int state);
@ -23,6 +24,9 @@ signals:
void deviceBitRateChanage(QString deviceName, int bitRate);
void deviceMacAddressChanaged(QString deviceName, const QString &hwAddress);
public slots:
void onDeviceUpdate(NetworkManager::Device * dev);
public:
void getNetworkDeviceList(NetworkManager::Device::Type deviceType, QStringList &networkDeviceList);
void getHardwareInfo(QString ifaceName, QString &hardAddress, int &bandWith);
@ -37,6 +41,9 @@ private:
KyWiredConnectOperation wiredOperation;
KyNetworkResourceManager *m_networkResourceInstance = nullptr;
QStringList m_activeConnectUuidList;
QMap<QString , QString> m_activeConnectUuidMap;
QMap<QString, QString> m_activeConnectUuidMap;
QMap<QString, QString> m_deviceMap;
void initDeviceMap();
};
#endif // KYLINNETORKDEVICERESOURCE_H

4
src/backend/dbus-interface/kylinnetworkresourcemanager.cpp
View File

@ -634,7 +634,7 @@ void KyNetworkResourceManager::onDeviceAdded(QString const & uni)
if (0 > m_devices.indexOf(networkDevice)) {
addDevice(networkDevice);
emit deviceAdd(networkDevice->interfaceName(), networkDevice->type());
emit deviceAdd(networkDevice->interfaceName(), networkDevice->uni(), networkDevice->type());
} else {
qWarning() << networkDevice->interfaceName() <<"the device is exist in network device list.";
}
@ -656,7 +656,7 @@ void KyNetworkResourceManager::onDeviceRemoved(QString const & uni)
if (m_devices.cend() != index) {
const int pos = index - m_devices.cbegin();
removeDevice(pos);
emit deviceRemove(networkDevice->interfaceName());
emit deviceRemove(networkDevice->interfaceName(), networkDevice->uni());
}
return;

4
src/backend/dbus-interface/kylinnetworkresourcemanager.h
View File

@ -105,9 +105,9 @@ signals:
void connectionUpdate(QString uuid);
void connectionRemove(QString path);
void deviceAdd(QString deviceName, NetworkManager::Device::Type deviceType);
void deviceAdd(QString deviceName, QString uni, NetworkManager::Device::Type deviceType);
void deviceUpdate(NetworkManager::Device * dev);
void deviceRemove(QString deviceName);
void deviceRemove(QString deviceName, QString uni);
void deviceCarrierChanage(QString deviceName, bool pluged);
void deviceBitRateChanage(QString deviceName, int bitRate);

29
src/backend/dbusadaptor.cpp
View File

@ -97,6 +97,29 @@ void setDefaultDevice(KyDeviceType deviceType, QString deviceName)
return;
}
bool checkDeviceExist(KyDeviceType deviceType, QString deviceName)
{
NetworkManager::Device::Type type;
switch (deviceType) {
case WIRED:
type = NetworkManager::Device::Type::Ethernet;
break;
case WIRELESS:
type = NetworkManager::Device::Type::Wifi;
break;
default:
return false;
break;
}
KyNetworkDeviceResourse * kdr = new KyNetworkDeviceResourse();
QStringList devList;
devList.clear();
kdr->getNetworkDeviceList(type, devList);
return devList.contains(deviceName);
}
/*
* Implementation of adaptor class DbusAdaptor
*/
@ -166,6 +189,9 @@ void DbusAdaptor::setDeviceEnable(QString devName, bool enable)
//设置默认网卡
void DbusAdaptor::setDefaultWiredDevice(QString deviceName)
{
if (!checkDeviceExist(WIRED, deviceName)) {
return;
}
setDefaultDevice(WIRED, deviceName);
parent()->setWiredDefaultDevice(deviceName);
return;
@ -185,6 +211,9 @@ QString DbusAdaptor::getDefaultWiredDevice()
void DbusAdaptor::setDefaultWirelessDevice(QString deviceName)
{
if (!checkDeviceExist(WIRED, deviceName)) {
return;
}
setDefaultDevice(WIRELESS, deviceName);
parent()->setWirelessDefaultDevice(deviceName);
return;

2
src/backend/dbusadaptor.h
View File

@ -90,6 +90,7 @@ enum KyDeviceType
WIRELESS
};
bool checkDeviceExist(KyDeviceType deviceType, QString deviceName);
void setDefaultDevice(KyDeviceType deviceType, QString deviceName);
class DbusAdaptor: public QDBusAbstractAdaptor
@ -137,6 +138,7 @@ Q_SIGNALS: // SIGNALS
void activateFinish(QString devName, QString ssid);
//设备插拔
void deviceStatusChanged();
void deviceNameUpdate(QString oldName, QString newName);
};
#endif

2
src/frontend/new-mainwindow.cpp
View File

@ -114,7 +114,9 @@ void MainWindow::initUI()
m_centralWidget->addTab(m_wlanWidget, QIcon::fromTheme("network-wireless-signal-excellent-symbolic", QIcon(":/res/x/wifi-list-bg.svg")), tr("WLAN"));
connect(m_lanWidget, &LanPage::deviceStatusChanged, this, &MainWindow::deviceStatusChanged);
connect(m_lanWidget, &LanPage::deviceNameChanged, this, &MainWindow::deviceNameChanged);
connect(m_wlanWidget, &WlanPage::deviceStatusChanged, this, &MainWindow::deviceStatusChanged);
connect(m_wlanWidget, &WlanPage::deviceNameChanged, this, &MainWindow::deviceNameChanged);
}
/**

1
src/frontend/new-mainwindow.h
View File

@ -24,6 +24,7 @@ public:
void setWirelessDefaultDevice(QString deviceName);
signals:
void deviceStatusChanged();
void deviceNameChanged(QString oldName, QString newName);
public slots:

98
src/frontend/tab-pages/lanpage.cpp
View File

@ -5,38 +5,13 @@
LanPage::LanPage(QWidget *parent) : TabPage(parent)
{
m_device = new KyNetworkDeviceResourse(this);
devList.empty();
initDevice();
initLanUI();
connect(m_device, &KyNetworkDeviceResourse::deviceAdd, this , [=](QString deviceName, NetworkManager::Device::Type deviceType) {
qDebug() << "deviceAdd";
if (deviceType != NetworkManager::Device::Type::Ethernet) {
return;
}
if (getDefaultDevice().isEmpty())
{
updateDefaultDevice(deviceName);
setDefaultDevice(WIRED, deviceName);
}
emit deviceStatusChanged();
});
connect(m_device, &KyNetworkDeviceResourse::deviceRemove, this , [=](QString deviceName) {
//todo:check device type
if (getDefaultDevice() == deviceName)
{
QStringList list;
QString newDefaultDevice = "";
list.empty();
m_device->getNetworkDeviceList(NetworkManager::Device::Type::Ethernet, list);
if (!list.isEmpty()) {
newDefaultDevice = list.at(0);
}
updateDefaultDevice(newDefaultDevice);
setDefaultDevice(WIRED, newDefaultDevice);
}
emit deviceStatusChanged();
});
connect(m_device, &KyNetworkDeviceResourse::deviceAdd, this, &LanPage::onDeviceAdd);
connect(m_device, &KyNetworkDeviceResourse::deviceRemove, this, &LanPage::onDeviceRemove);
connect(m_device, &KyNetworkDeviceResourse::deviceNameUpdate, this, &LanPage::onDeviceNameUpdate);
}
@ -66,13 +41,11 @@ void LanPage::initDevice()
m_settings->beginGroup("DEFAULTCARD");
QString key("wired");
QString deviceName = m_settings->value(key, "").toString();
m_device->getNetworkDeviceList(NetworkManager::Device::Type::Ethernet, devList);
if (deviceName.isEmpty()) {
qDebug() << "initDevice but defalut wired card is null";
QStringList list;
list.empty();
m_device->getNetworkDeviceList(NetworkManager::Device::Type::Ethernet, list);
if (!list.isEmpty()) {
deviceName = list.at(0);
if (!devList.isEmpty()) {
deviceName = devList.at(0);
m_settings->setValue(key, deviceName);
}
}
@ -84,4 +57,61 @@ void LanPage::initDevice()
delete m_settings;
m_settings = nullptr;
for (int i = 0; i < devList.size(); ++i)
{
qDebug() << devList.at(i);
}
}
void LanPage::onDeviceAdd(QString deviceName, NetworkManager::Device::Type deviceType)
{
qDebug() << "deviceAdd" << deviceName;
if (deviceType != NetworkManager::Device::Type::Ethernet) {
return;
}
devList << deviceName;
if (getDefaultDevice().isEmpty())
{
updateDefaultDevice(deviceName);
setDefaultDevice(WIRED, deviceName);
}
emit deviceStatusChanged();
}
void LanPage::onDeviceRemove(QString deviceName)
{
qDebug() << "deviceRemove" << deviceName;
if (getDefaultDevice() == deviceName)
{
QStringList list;
QString newDefaultDevice = "";
list.empty();
m_device->getNetworkDeviceList(NetworkManager::Device::Type::Ethernet, list);
if (!list.isEmpty()) {
newDefaultDevice = list.at(0);
}
updateDefaultDevice(newDefaultDevice);
setDefaultDevice(WIRED, newDefaultDevice);
}
if (devList.contains(deviceName)) {
devList.removeOne(deviceName);
emit deviceStatusChanged();
}
}
void LanPage::onDeviceNameUpdate(QString oldName, QString newName)
{
if (getDefaultDevice() == oldName) {
updateDefaultDevice(newName);
setDefaultDevice(WIRED, newName);
}
if (devList.contains(oldName)) {
devList.removeOne(oldName);
devList.append(newName);
qDebug() << "LanPage emit deviceNameUpdate " << oldName << newName;
emit deviceNameChanged(oldName, newName);
}
}

6
src/frontend/tab-pages/lanpage.h
View File

@ -13,9 +13,15 @@ public:
private:
KyNetworkDeviceResourse *m_device = nullptr;
QStringList devList;
void initLanUI();
void initDevice();//初始化默认设备
private slots:
void onDeviceAdd(QString deviceName, NetworkManager::Device::Type deviceType);
void onDeviceRemove(QString deviceName);
void onDeviceNameUpdate(QString oldName, QString newName);
};
#endif // LANPAGE_H

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

@ -37,6 +37,7 @@ public:
signals:
void deviceStatusChanged();
void deviceNameChanged(QString oldName, QString newName);
protected:
void initUI();

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

@ -11,39 +11,16 @@ WlanPage::WlanPage(QWidget *parent) : TabPage(parent)
{
m_resource = new KyWirelessNetResource(this);
m_device = new KyNetworkDeviceResourse(this);
devList.empty();
initDevice();
initWlanUI();
initConnections();
getActiveWlan();
getAllWlan();
connect(m_device, &KyNetworkDeviceResourse::deviceAdd, this , [=](QString deviceName, NetworkManager::Device::Type deviceType) {
if (deviceType != NetworkManager::Device::Type::Wifi) {
return;
}
if (getDefaultDevice().isEmpty())
{
updateDefaultDevice(deviceName);
setDefaultDevice(WIRELESS, deviceName);
}
emit deviceStatusChanged();
});
connect(m_device, &KyNetworkDeviceResourse::deviceRemove, this , [=](QString deviceName) {
//todo:check device type
if (getDefaultDevice() == deviceName)
{
QStringList list;
QString newDefaultDevice = "";
list.empty();
m_device->getNetworkDeviceList(NetworkManager::Device::Type::Wifi, list);
if (!list.isEmpty()) {
newDefaultDevice = list.at(0);
}
updateDefaultDevice(newDefaultDevice);
setDefaultDevice(WIRELESS, newDefaultDevice);
}
emit deviceStatusChanged();
});
connect(m_device, &KyNetworkDeviceResourse::deviceAdd, this, &WlanPage::onDeviceAdd);
connect(m_device, &KyNetworkDeviceResourse::deviceRemove, this, &WlanPage::onDeviceRemove);
connect(m_device, &KyNetworkDeviceResourse::deviceNameUpdate, this, &WlanPage::onDeviceNameUpdate);
}
bool WlanPage::eventFilter(QObject *w, QEvent *e)
@ -116,13 +93,11 @@ void WlanPage::initDevice()
m_settings->beginGroup("DEFAULTCARD");
QString key("wireless");
QString deviceName = m_settings->value(key, "").toString();
m_device->getNetworkDeviceList(NetworkManager::Device::Type::Wifi, devList);
if (deviceName.isEmpty()) {
qDebug() << "initDevice but defalut wireless card is null";
QStringList list;
list.empty();
m_device->getNetworkDeviceList(NetworkManager::Device::Type::Wifi, list);
if (!list.isEmpty()) {
deviceName = list.at(0);
if (!devList.isEmpty()) {
deviceName = devList.at(0);
m_settings->setValue(key, deviceName);
}
}
@ -244,3 +219,55 @@ void WlanPage::onWlanUpdated()
//ZJP_TODO 某些特定情况下不可重绘整个列表，此处代码需要修改
getAllWlan();
}
void WlanPage::onDeviceAdd(QString deviceName, NetworkManager::Device::Type deviceType)
{
qDebug() << "deviceAdd" << deviceName;
if (deviceType != NetworkManager::Device::Type::Wifi) {
return;
}
devList << deviceName;
if (getDefaultDevice().isEmpty())
{
updateDefaultDevice(deviceName);
setDefaultDevice(WIRELESS, deviceName);
}
emit deviceStatusChanged();
}
void WlanPage::onDeviceRemove(QString deviceName)
{
qDebug() << "deviceRemove" << deviceName;
if (getDefaultDevice() == deviceName)
{
QStringList list;
QString newDefaultDevice = "";
list.empty();
m_device->getNetworkDeviceList(NetworkManager::Device::Type::Wifi, list);
if (!list.isEmpty()) {
newDefaultDevice = list.at(0);
}
updateDefaultDevice(newDefaultDevice);
setDefaultDevice(WIRELESS, newDefaultDevice);
}
if (devList.contains(deviceName)) {
devList.removeOne(deviceName);
emit deviceStatusChanged();
}
}
void WlanPage::onDeviceNameUpdate(QString oldName, QString newName)
{
if (getDefaultDevice() == oldName) {
updateDefaultDevice(newName);
setDefaultDevice(WIRELESS, newName);
}
if (devList.contains(oldName)) {
devList.removeOne(oldName);
devList.append(newName);
qDebug() << "WlanPage emit deviceNameUpdate " << oldName << newName;
emit deviceNameChanged(oldName, newName);
}
}

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

@ -32,14 +32,20 @@ private:
QLabel * m_hiddenWlanLabel = nullptr;
QString m_activatedWlanSSid;
QStringList devList;
KyWirelessNetResource *m_resource = nullptr;
KyNetworkDeviceResourse *m_device = nullptr;
private slots:
void onWlanAdded(QString interface, KyWirelessNetItem &item);
void onWlanRemoved(QString interface, QString ssid);
void onWlanUpdated();
void onDeviceAdd(QString deviceName, NetworkManager::Device::Type deviceType);
void onDeviceRemove(QString deviceName);
void onDeviceNameUpdate(QString oldName, QString newName);
};
#endif // WLANPAGE_H