From e01ce3a0f95eaa984d88de81ba3d01c614d236f2 Mon Sep 17 00:00:00 2001
From: Fan PengCheng <fanpengcheng@uniontech.com>
Date: Sun, 25 Apr 2021 11:40:30 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E6=8A=8A=E9=83=A8=E5=88=86=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E4=BA=A4=E7=94=B1=E4=BB=BB=E5=8A=A1=E6=A0=8F=E5=8D=95?=
 =?UTF-8?q?=E7=8B=AC=E5=AE=89=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

防止任务栏运行找不到配置报错

Log:
Change-Id: I0dbcdd5da742494b0d00425fc4681fdc1961302c
---
 gschema/com.deepin.dde.dock.module.gschema.xml |  7 +++++++
 plugins/network/networkitem.cpp                | 15 +++++++++------
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/gschema/com.deepin.dde.dock.module.gschema.xml b/gschema/com.deepin.dde.dock.module.gschema.xml
index 5e3551f6e..1b5f22057 100644
--- a/gschema/com.deepin.dde.dock.module.gschema.xml
+++ b/gschema/com.deepin.dde.dock.module.gschema.xml
@@ -509,4 +509,11 @@
       <description>Determine to show dock only in primary monitor</description>
     </key>
   </schema>
+ <schema path="/com/deepin/dde/dock/" id="com.deepin.dde.dock" gettext-domain="DDE">
+   <key type="i" name="wireless-scan-interval">
+     <default>5</default>
+     <summary></summary>
+     <description>wireless scan interval</description>
+   </key>
+  </schema>
 </schemalist>
diff --git a/plugins/network/networkitem.cpp b/plugins/network/networkitem.cpp
index ae09f05c9..21214114e 100644
--- a/plugins/network/networkitem.cpp
+++ b/plugins/network/networkitem.cpp
@@ -3,6 +3,7 @@
 #include "item/wirelessitem.h"
 #include "../../widgets/tipswidget.h"
 #include "../frame/util/imageutil.h"
+#include "utils.h"
 
 #include <DHiDPIHelper>
 #include <DApplicationHelper>
@@ -48,7 +49,7 @@ NetworkItem::NetworkItem(QWidget *parent)
     , m_timer(new QTimer(this))
     , m_switchWireTimer(new QTimer(this))
     , m_wirelessScanTimer(new QTimer(this))
-    , m_wirelessScanInterval(10)
+    , m_wirelessScanInterval(Utils::SettingValue("com.deepin.dde.dock", QByteArray(), "wireless-scan-interval", 10).toInt())
 {
     m_timer->setInterval(100);
 
@@ -146,11 +147,12 @@ NetworkItem::NetworkItem(QWidget *parent)
     connect(m_switchWirelessBtn, &DSwitchButton::toggled, this, &NetworkItem::wirelessEnable);
     connect(DGuiApplicationHelper::instance(), &DGuiApplicationHelper::themeTypeChanged, this, &NetworkItem::onThemeTypeChanged);
 
-    QGSettings *gsetting = new QGSettings("com.deepin.dde.dock", QByteArray(), this);
-    connect(gsetting, &QGSettings::changed, [&](const QString &key) {
+    const QGSettings *gsetting = Utils::SettingsPtr("com.deepin.dde.dock", "wireless-scan-interval", this);
+    if (gsetting)
+        connect(gsetting, &QGSettings::changed, [&](const QString &key) {
         if (key == "wireless-scan-interval") {
-            m_wirelessScanInterval = gsetting->get("wireless-scan-interval").toInt();
-            m_wirelessScanTimer->setInterval(m_wirelessScanInterval * 1000);
+            m_wirelessScanInterval = gsetting->get("wireless-scan-interval").toInt() * 1000;
+            m_wirelessScanTimer->setInterval(m_wirelessScanInterval);
         }
     });
     connect(m_wirelessScanTimer, &QTimer::timeout, [&] {
@@ -160,7 +162,8 @@ NetworkItem::NetworkItem(QWidget *parent)
             }
         }
     });
-    m_wirelessScanInterval = gsetting->get("wireless-scan-interval").toInt();
+
+    m_wirelessScanTimer->setInterval(m_wirelessScanInterval);
 }
 
 QWidget *NetworkItem::itemApplet()