fix: 修复窗口偶现闪退

 调用DApplication setOverrideCursor窗口偶现闪退

Log:  修复窗口偶现闪退

Bug: https://pms.uniontech.com/bug-view-251039.html

Author: shuaijie

deepin-devicemanager/src/GenerateDevice/LoadInfoThread.cpp

@@ -19,6 +19,7 @@
 
 DWIDGET_USE_NAMESPACE
 static bool firstLoadFlag = true;
+
 LoadInfoThread::LoadInfoThread()
     : mp_ReadFilePool()
     , mp_GenerateDevicePool()
@@ -99,8 +100,6 @@ void LoadInfoThread::run()
 
     emit finished("finish");
     m_Running = false;
-    // 一定要有否则指针一直显示圆圈与setOverrideCursor成对使用
-    DApplication::restoreOverrideCursor();
 }
 
 void LoadInfoThread::slotFinishedReadFilePool(const QString &)
@@ -109,11 +108,7 @@ void LoadInfoThread::slotFinishedReadFilePool(const QString &)
     // 首次加载刷新
     if (firstLoadFlag) {
         firstLoadFlag = false;
-        DBusInterface::getInstance()->refreshInfo();
-        QTimer::singleShot(2000, this, [ = ]() {  //test the x86 the fast desktop PC need 2s
-            DApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
-            start();
-        });
+        emit finishedReadFilePool();
     }
 }
 

deepin-devicemanager/src/GenerateDevice/LoadInfoThread.h

@@ -26,6 +26,7 @@ class LoadInfoThread : public QThread
 
 signals:
     void finished(const QString &message);
+    void finishedReadFilePool();
 
 protected:
     void run() override;

deepin-devicemanager/src/Page/MainWindow.cpp

@@ -122,6 +122,17 @@ MainWindow::MainWindow(QWidget *parent)
     txgpu.start();
     txgpu.wait();
     monitorNumber = txgpu.getMonitorNumber();
+    connect(mp_WorkingThread, &LoadInfoThread::finishedReadFilePool, this, [ = ]() {
+        refreshDataBaseLater();
+    });
+}
+void MainWindow::refreshDataBaseLater()
+{
+    DBusInterface::getInstance()->refreshInfo();
+    QTimer::singleShot(2000, this, [ = ]() {  //test the x86 the fast desktop PC need 2s
+        // 加载设备信息
+        refreshDataBase();
+    });
 }
 
 MainWindow::~MainWindow()
@@ -408,11 +419,14 @@ void MainWindow::initWidgets()
 
 void MainWindow::refreshDataBase()
 {
-    // 设置应用程序强制光标为cursor
-    DApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
-
-    if (mp_WorkingThread)
+    if (mp_WorkingThread) {
+        /* 一定要与 restoreOverrideCursor 成对使用*/
+        if(!m_statusCursorIsWait) {
+            DApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
+            m_statusCursorIsWait = true;
+        }
         mp_WorkingThread->start();
+    }
 }
 
 void MainWindow::slotSetPage(QString page)
@@ -437,8 +451,11 @@ void MainWindow::slotLoadingFinish(const QString &message)
     if (message == "finish") {
         begin = true;
 
-        // 一定要有否则指针一直显示圆圈与setOverrideCursor成对使用
+    /* 一定要有与 setOverrideCursor 成对使用 否则指针一直显示圆圈*/
+    if( m_statusCursorIsWait) {
+        m_statusCursorIsWait = false;
         DApplication::restoreOverrideCursor();
+    }
 
         // 信息显示界面
         // 获取设备类型列表
@@ -523,11 +540,7 @@ void MainWindow::slotListItemClicked(const QString &itemStr)
             DBusInterface::getInstance()->getInfo("is_server_running", info);
             //请求后台更新信息
             if (!info.toInt()) {
-                DBusInterface::getInstance()->refreshInfo();
-                QTimer::singleShot(2000, this, [ = ]() {
-                    // 加载设备信息
-                    refreshDataBase();
-                });
+                refreshDataBaseLater();
             }
             qDebug()<< "Monitor refreshInfo" << __LINE__  << QDateTime::currentDateTime().toString("hh:mm:ss") << info << monitorNumber;
             monitorNumber = txgpu.getMonitorNumber();

deepin-devicemanager/src/Page/MainWindow.h

@@ -117,7 +117,10 @@ class MainWindow : public DMainWindow
      * @brief refreshDataBase:刷新设备信息
      */
     void refreshDataBase();
-
+    /**
+     * @brief refreshDataBaseLater:刷新设备信息
+     */
+    void refreshDataBaseLater();
 private slots:
     /**
      * @brief slotSetPage
@@ -170,6 +173,7 @@ private slots:
     bool                  m_refreshing = false;        // 判断界面是否正在刷新
     bool                  m_IsFirstRefresh = true;
     bool                  m_ShowDriverPage = false;
+    bool                  m_statusCursorIsWait = false;
 };
 
 #endif // MAINWINDOW_H