Skip to content

Commit 95539e9

Browse files
ut003640deepin-bot[bot]
authored andcommitted
fix: Fix airplane mode tips display logic
Fix the logic for displaying airplane mode tips by adding wireless support check. Only show the tips when airplane mode is enabled AND wireless is supported. Log: Fixed airplane mode tips display condition PMS: BUG-349721 fix: 修复飞行模式提示显示逻辑 修复飞行模式提示的显示逻辑,增加无线支持检查。仅在飞行模式启用且支持无线功能时显示提示。 Log: 修复飞行模式提示显示条件 PMS: BUG-349721
1 parent 3e2fce4 commit 95539e9

File tree

3 files changed

+15
-8
lines changed

3 files changed

+15
-8
lines changed

net-view/operation/netmanager.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1010,7 +1010,7 @@ void NetManagerPrivate::updateAirplaneMode(bool enabled)
10101010
Q_Q(NetManager);
10111011
Q_EMIT q->airplaneModeChanged(m_airplaneMode);
10121012
}
1013-
updateItemVisible("NetAirplaneModeTipsItem", enabled);
1013+
updateItemVisible("NetAirplaneModeTipsItem", enabled && m_managerThread->supportWireless());
10141014
if (enabled) {
10151015
updateItemVisible("NetWirelessDisabledItem", false);
10161016
updateItemVisible("NetWiredDisabledItem", false);

net-view/operation/private/netmanagerthreadprivate.cpp

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,17 @@ bool NetManagerThreadPrivate::CheckPasswordValid(const QString &key, const QStri
137137
return !password.isEmpty();
138138
}
139139

140+
bool NetManagerThreadPrivate::supportWireless() const
141+
{
142+
NetworkManager::Device::List devices = NetworkManager::networkInterfaces();
143+
for (NetworkManager::Device::Ptr device : devices) {
144+
if (device->type() == NetworkManager::Device::Type::Wifi && device->managed())
145+
return true;
146+
}
147+
148+
return false;
149+
}
150+
140151
void NetManagerThreadPrivate::getNetCheckAvailableFromDBus()
141152
{
142153
QDBusMessage message = QDBusMessage::createMethodCall("com.deepin.defender.netcheck", "/com/deepin/defender/netcheck", "org.freedesktop.DBus.Properties", "Get");
@@ -861,13 +872,7 @@ bool NetManagerThreadPrivate::supportAirplaneMode() const
861872
}
862873
}
863874

864-
NetworkManager::Device::List devices = NetworkManager::networkInterfaces();
865-
for (NetworkManager::Device::Ptr device : devices) {
866-
if (device->type() == NetworkManager::Device::Type::Wifi && device->managed())
867-
return true;
868-
}
869-
870-
return false;
875+
return supportWireless();
871876
}
872877

873878
void NetManagerThreadPrivate::doConnectOrInfo(const QString &id, NetType::NetItemType type, const QVariantMap &param)

net-view/operation/private/netmanagerthreadprivate.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ class NetManagerThreadPrivate : public QObject
5555

5656
inline bool AirplaneModeEnabled() const { return m_airplaneModeEnabled; }
5757

58+
bool supportWireless() const;
59+
5860
void setEnabled(bool enabled);
5961
void setAutoScanInterval(int ms);
6062
void setAutoScanEnabled(bool enabled);

0 commit comments

Comments
 (0)