feat: Enhance time tracking in DiskBadSectorsDialog

Changes:
1. Added real-time tracking for elapsed time during disk checks.
2. Implemented pause functionality to accurately account for time spent paused.
3. Updated progress calculation based on actual elapsed time.

Log: Improved time management for disk sector checks, providing a more accurate user experience.

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

Author: itsXuSt

.gitignore

@@ -4,4 +4,5 @@ build
 .qmake.stash
 *.qm
 .cache/*
-.claude/*
+.claude/*
+.cursor/*

application/widgets/diskbadsectorsdialog.cpp

@@ -22,6 +22,7 @@
 #include <QStackedWidget>
 #include <QSettings>
 #include <QFile>
+#include <QDateTime>
 
 DiskBadSectorsDialog::DiskBadSectorsDialog(QWidget *parent) : DDialog(parent)
 {
@@ -583,6 +584,11 @@ void DiskBadSectorsDialog::onStartVerifyButtonClicked()
     m_usedTimeLabel->setText(tr("Time elapsed:") + "00:00:00");
     m_unusedTimeLabel->setText(tr("Time left:") + "00:00:00");
 
+    // 初始化实际时间跟踪
+    m_realStartTime = QDateTime::currentMSecsSinceEpoch();
+    m_totalPausedTime = 0;
+    m_isPaused = false;
+
     QFile file("/tmp/CheckData.conf");
     if (file.open(QIODevice::ReadWrite | QIODevice::Truncate)) {
         QTextStream out(&file);
@@ -726,18 +732,45 @@ void DiskBadSectorsDialog::onCheckTimeOut()
         m_settings->setValue("CurCylinder",lst.at(1));
         m_settings->endGroup();
 
-        qint64 totalTime = m_curCheckTime / m_curCheckNumber * m_totalCheckNumber;
-        int value = QString::number((float)m_curCheckTime / totalTime,'f', 2).toFloat() * 100;
-        value > 99 ? value = 99 : value;
-
-        m_progressBar->setValue(value);
-        qint64 remainingTime = totalTime - m_curCheckTime;
-        remainingTime < 1000 ? remainingTime = 1000 : remainingTime;
+        // 使用实际经过时间计算已用时间
+        qint64 currentTime = QDateTime::currentMSecsSinceEpoch();
+        qint64 realElapsedTime = currentTime - m_realStartTime - m_totalPausedTime;
+        
+        // 如果当前是暂停状态，不包括当前暂停期间的时间
+        if (m_isPaused && m_pauseStartTime > 0) {
+            qint64 currentPauseDuration = currentTime - m_pauseStartTime;
+            realElapsedTime -= currentPauseDuration;
+        }
+        
+        // 确保已用时间不为负数
+        if (realElapsedTime < 0) realElapsedTime = 0;
+
+        // 基于柱面检测时间估算总时间（用于剩余时间计算）
+        qint64 estimatedTotalTime = m_curCheckTime / m_curCheckNumber * m_totalCheckNumber;
+        
+        // 计算进度百分比（基于检测数量）
+        int progressValue = (m_curCheckNumber * 100) / m_totalCheckNumber;
+        if (progressValue > 99) progressValue = 99;
+        m_progressBar->setValue(progressValue);
+        
+        // 基于实际时间和进度估算剩余时间
+        qint64 remainingTime = 0;
+        if (m_curCheckNumber > 0 && realElapsedTime > 0) {
+            // 使用实际已用时间来估算剩余时间
+            qint64 avgTimePerCylinder = realElapsedTime / m_curCheckNumber;
+            remainingTime = avgTimePerCylinder * (m_totalCheckNumber - m_curCheckNumber);
+        } else {
+            // 回退到基于柱面时间的估算
+            remainingTime = estimatedTotalTime - m_curCheckTime;
+        }
+        
+        if (remainingTime < 1000) remainingTime = 1000;
 
+        // 显示实际已用时间
         qint64 usedHour = 0;
         qint64 usedMinute = 0;
         qint64 usedSecond = 0;
-        mSecsToTime(m_curCheckTime, usedHour, usedMinute, usedSecond);
+        mSecsToTime(realElapsedTime, usedHour, usedMinute, usedSecond);
         m_usedTimeLabel->setText(tr("Time elapsed:") + QString("%1:%2:%3").arg(usedHour, 2, 10, QLatin1Char('0')).arg(usedMinute, 2, 10, QLatin1Char('0')).arg(usedSecond, 2, 10, QLatin1Char('0'))); // 时、分、秒为一位数时，十位自动补0
 
         qint64 remainingHour = 0;
@@ -793,6 +826,10 @@ void DiskBadSectorsDialog::onStopButtonClicked()
         m_curType = StatusType::StopCheck;
         m_cylinderInfoWidget->setChecked(false);
 
+        // 记录暂停开始时间
+        m_pauseStartTime = QDateTime::currentMSecsSinceEpoch();
+        m_isPaused = true;
+
         int checkSize = m_settings->value("SettingData/CheckSize").toInt();
         int blockStart = m_settings->value("SettingData/BlockStart").toInt();
         int blockEnd = m_settings->value("SettingData/BlockEnd").toInt();
@@ -828,6 +865,14 @@ void DiskBadSectorsDialog::onContinueButtonClicked()
         m_curType = StatusType::Check;
         m_cylinderInfoWidget->setChecked(true);
 
+        // 累加暂停时间
+        if (m_isPaused && m_pauseStartTime > 0) {
+            qint64 pauseDuration = QDateTime::currentMSecsSinceEpoch() - m_pauseStartTime;
+            m_totalPausedTime += pauseDuration;
+            m_isPaused = false;
+            m_pauseStartTime = 0;
+        }
+
         int checkSize = m_settings->value("SettingData/CheckSize").toInt();
         int blockEnd = m_settings->value("SettingData/BlockEnd").toInt();
         int checkNumber = m_settings->value("SettingData/CheckNumber").toInt();
@@ -873,6 +918,12 @@ void DiskBadSectorsDialog::onAgainVerifyButtonClicked()
     m_curCheckNumber = 0;
     m_curCheckTime = 0;
 
+    // 重置实际时间跟踪
+    m_realStartTime = QDateTime::currentMSecsSinceEpoch();
+    m_totalPausedTime = 0;
+    m_isPaused = false;
+    m_pauseStartTime = 0;
+
     int checkSize = m_settings->value("SettingData/CheckSize").toInt();
     m_blockStart = m_settings->value("SettingData/BlockStart").toInt();
     m_blockEnd = m_settings->value("SettingData/BlockEnd").toInt();
@@ -926,6 +977,12 @@ void DiskBadSectorsDialog::onResetButtonClicked()
     m_curRepairTime = 0;
     m_cylinderInfoWidget->setChecked(false);
 
+    // 重置实际时间跟踪
+    m_realStartTime = 0;
+    m_totalPausedTime = 0;
+    m_isPaused = false;
+    m_pauseStartTime = 0;
+
     m_verifyComboBox->setCurrentIndex(0);
     m_startLineEdit->setText("0");
     m_startLineEdit->lineEdit()->setPlaceholderText("0");

application/widgets/diskbadsectorsdialog.h

@@ -239,6 +239,12 @@ private slots:
     int m_blockStart = 0;
     int m_blockEnd = 0;
     DeviceInfo m_deviceInfo;
+    
+    // 实际时间跟踪
+    qint64 m_realStartTime = 0;     // 检测开始的实际时间戳
+    qint64 m_pauseStartTime = 0;    // 暂停开始时间戳  
+    qint64 m_totalPausedTime = 0;   // 总的暂停时间
+    bool m_isPaused = false;        // 是否处于暂停状态
 };
 
 #endif // DISKBADSECTORSDIALOG_H