Merge branch '0928' into 'yhkylin/v101-2303'

fix(单例):使用QtSingleApplication处理单例

See merge request kylinos-src/kylin-nm!277

debian/changelog

@@ -1,3 +1,13 @@
+kylin-nm (3.24.0.0-0k2.21) v101; urgency=medium
+
+  * BUG:
+      - #194718 【网络连接】麒麟网络设置工具可固定到任务栏
+  * 需求号：无
+  * 其他改动说明: 弹窗跳过任务栏
+  * 其他改动影响域：单例 
+
+ -- zhaoshixu <zhaoshixu@kylinos.cn>  Thu, 28 Sep 2023 09:41:09 +0800
+
 kylin-nm (3.24.0.0-0k2.20) v101; urgency=medium
 
   * BUG:

src/main.cpp

@@ -135,7 +135,7 @@ int main(int argc, char *argv[])
             interface.call(QStringLiteral("showKylinNM"), 1);
         } else if (parser.isSet(snOption)){
             interface.call(QStringLiteral("showKylinNM"), 0);
-        } else {
+        } /*else {
             const QString serviceName = "com.kylin.network";
             QDBusConnectionInterface *interface1 = QDBusConnection::sessionBus().interface();
             QDBusReply<uint> pid = interface1->servicePid(serviceName);
@@ -145,6 +145,10 @@ int main(int argc, char *argv[])
                 interface.call(QStringLiteral("showKylinNM"), 2);
             }
         }
+        return 0;*/
+    }
+
+    if (a.isRunning()) {
         return 0;
     }