From 65a0adb2fb0a54d86364767c2e0352334aa6b272 Mon Sep 17 00:00:00 2001
From: tanyulong2021 <tanyulong@kylinos.cn>
Date: Thu, 28 Oct 2021 15:54:35 +0800
Subject: [PATCH]  fix(net) sort wifi strength

---
 0015-fix-net-sort-wifi-strength.patch | 51 +++++++++++++++++++++++++++
 ukui-control-center.spec              |  7 +++-
 2 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 0015-fix-net-sort-wifi-strength.patch

diff --git a/0015-fix-net-sort-wifi-strength.patch b/0015-fix-net-sort-wifi-strength.patch
new file mode 100644
index 0000000..22ccb29
--- /dev/null
+++ b/0015-fix-net-sort-wifi-strength.patch
@@ -0,0 +1,51 @@
+From 62d168b58a73df914ad2b1f339f60d11dbc81bd1 Mon Sep 17 00:00:00 2001
+From: tanyulong <tanyulong@kylinos.cn>
+Date: Thu, 28 Oct 2021 15:41:57 +0800
+Subject: [PATCH] fix net sort wifi strength
+
+---
+ plugins/network/netconnect/netconnect.cpp | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/plugins/network/netconnect/netconnect.cpp b/plugins/network/netconnect/netconnect.cpp
+index ce0eb22..5d868d4 100755
+--- a/plugins/network/netconnect/netconnect.cpp
++++ b/plugins/network/netconnect/netconnect.cpp
+@@ -35,7 +35,7 @@
+ #define CONTROL_CENTER_WIFI "org.ukui.control-center.wifi.switch"
+ 
+ bool sortByVal(const QPair<QString, int> &l, const QPair<QString, int> &r) {
+-    return (l.second > r.second);
++    return (l.second < r.second);
+ }
+ 
+ NetConnect::NetConnect():m_wifiList(new Wifi)
+@@ -123,7 +123,6 @@ void NetConnect::initSearchText() {
+ 
+ void NetConnect::initComponent(){
+ 
+-//    ui->RefreshBtn->hide();
+ 
+     //把判断列表是否已刷新的bool值初始化为true
+     this->is_refreshed = true;
+@@ -331,8 +330,6 @@ void NetConnect::rebuildAvailComponent(QString iconPath, QString netName){
+     devFrame->setMinimumHeight(50);
+     devFrame->setMaximumHeight(50);
+ 
+-//        devFrame->setFixedHeight(50);
+-//    devFrame->setStyleSheet("QWidget{background: #F4F4F4; border-radius: 6px;}");
+     QHBoxLayout * devHorLayout = new QHBoxLayout(devFrame);
+     devHorLayout->setSpacing(8);
+     devHorLayout->setContentsMargins(16, 0, 0, 0);
+@@ -562,7 +559,7 @@ bool NetConnect::getInitStatus()
+     //获取当前wifi是否连接
+     QDBusReply<QVariant> m_result = interface.call("Get", "org.freedesktop.NetworkManager", "WirelessEnabled");
+ 
+-    if (m_result.isValid()){
++    if (m_result.isValid()) {
+         bool status = m_result.value().toBool();
+         return status;
+     } else {
+-- 
+2.30.0
+
diff --git a/ukui-control-center.spec b/ukui-control-center.spec
index 7967727..797a3f0 100644
--- a/ukui-control-center.spec
+++ b/ukui-control-center.spec
@@ -1,7 +1,7 @@
 %define debug_package %{nil}
 Name:           ukui-control-center
 Version:        3.0.1
-Release:        20
+Release:        21
 Summary:        utilities to configure the UKUI desktop
 License:        GPL-2+
 URL:            http://www.ukui.org
@@ -90,6 +90,7 @@ patch16: fix_user_passwd_valid_time_setting_failed_issue.patch
 patch17: 0013-cpuinfo-in-arm-system-is-null.patch
 patch18: fix_user_passwd_valid_issue.patch
 patch19: 0014-modify-the-error-of-ukui-control-center-open.patch
+patch20: 0015-fix-net-sort-wifi-strength.patch
 
 Recommends: qt5-qtquickcontrols
 
@@ -130,6 +131,7 @@ Suggests: ukui-settings-daemon
 %patch17 -p1
 %patch18 -p1
 %patch19 -p1
+%patch20 -p1
 
 %build
 qmake-qt5
@@ -171,6 +173,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/xdg/autostart/ukui-group-manager.desktop
 
 %changelog
+* Thu Oct 28 2021 tanyulong <tanyulong@kylinos.cn> - 3.0.1-21
+- fix net sort wifi strength
+
 * Tue Oct 19 2021 peijiankang <peijiankang@kylinos.cn> - 3.0.1-20
 - add 0014-modify-the-error-of-ukui-control-center-open.patch