提交修改

daodaoliang · May 16, 2017 · d34fe1c · d34fe1c
1 parent 50b622b
commit d34fe1c
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 0 deletions.
diff --git a/Example/nbaseuikittest.h b/Example/nbaseuikittest.h
@@ -146,6 +146,9 @@ private slots:
      */
     void on_pushButton_26_clicked();
 
+    /**
+     * @brief on_pushButton_27_clicked 倒计时按钮
+     */
     void on_pushButton_27_clicked();
 
 private:

diff --git a/NBaseUiKit/inc/nbasecountdown.h b/NBaseUiKit/inc/nbasecountdown.h
@@ -35,6 +35,11 @@ class NBASEUIKITSHARED_EXPORT NBaseCountDown : public NBaseMoveableWidget
      */
     void startCountDown();
 
+    /**
+     * @brief stopCountDown 结束倒计时
+     */
+    void stopCountDown();
+
     /**
      * @brief getWaveRadius 获取波纹半径
      * @return
@@ -66,6 +71,11 @@ class NBASEUIKITSHARED_EXPORT NBaseCountDown : public NBaseMoveableWidget
      */
     void signalWaveRadius(qreal paramWaveRadius);
 
+    /**
+     * @brief signalCountFinshed 倒计时结束信号
+     */
+    void signalCountFinshed();
+
 protected:
 
     /**

diff --git a/NBaseUiKit/src/nbasecountdown.cpp b/NBaseUiKit/src/nbasecountdown.cpp
@@ -35,6 +35,11 @@ void NBaseCountDown::startCountDown()
     timerId = startTimer(1000);
 }
 
+void NBaseCountDown::stopCountDown()
+{
+    close();
+}
+
 qreal NBaseCountDown::getWaveRadius() const
 {
     return waveRadius;
@@ -187,6 +192,7 @@ void NBaseCountDown::setCountDown(int value)
     tempGreen = coreColorEnd.green() - 140/changeStep;
     coreColorEnd.setGreen(tempGreen<0?0:tempGreen);
     if(countDown-- <= 0){
+        emit signalCountFinshed();
         close();
     }
 }