更新

2020-08-14 20:27:22 +08:00
parent 2fed1bbb57
commit 3304a410c9
12 changed files with 1036 additions and 845 deletions
@@ -9,10 +9,8 @@
 #include <DApplication>
 #include <QDialog>
 #include <DInputDialog>
+#include "countdown.h"
 using namespace std;
-QTimer *timer = new QTimer();
-int a;
-bool timerswitch;
 Widget::Widget(DBlurEffectWidget *parent) :
    DBlurEffectWidget(parent),
    m_menu(new QMenu),
@@ -27,14 +25,13 @@ Widget::Widget(DBlurEffectWidget *parent) :
    ui(new Ui::Widget)
 {
    ui->setupUi(this);
+    ui->gridLayout->setContentsMargins(0, 0, 0, 0);
    ui->titlebar->setFixedHeight(50);//初始化标题栏
    ui->titlebar->setBackgroundTransparent(true);//设置标题栏透明
    ui->titlebar->setIcon(QIcon::fromTheme(":/icon/icon/top.yzzi.tomato.svg"));
    ui->titlebar->setTitle("");
    setMaskAlpha(190);
    ui->titlebar->setMenu(m_menu);
-    mem=ms = 1500+1;//设置初始时间
-
    m_menu->addMenu(menu_times);//设置菜单
    menu_times->setTitle(tr("时间"));
    menu_times->addAction(m_5);
@@ -44,7 +41,6 @@ Widget::Widget(DBlurEffectWidget *parent) :
    menu_times->addAction(m_45);
    menu_times->addAction(m_set);

-
    timesGroup = new QActionGroup(this);//设置按钮互斥
    timesGroup->addAction(m_5);
    timesGroup->addAction(m_15);
@@ -62,52 +58,61 @@ Widget::Widget(DBlurEffectWidget *parent) :
    m_25->setChecked(true);
    //in->setParent(this);
    //设置按钮响应
-    connect(m_5,&QAction::triggered,[=](){mem=ms = 300+1;timer->start(1000);refresh();});
-    connect(m_15,&QAction::triggered,[=](){mem=ms = 900+1;timer->start(1000);refresh();});
-    connect(m_25,&QAction::triggered,[=](){mem=ms = 1500+1;timer->start(1000);refresh();});
-    connect(m_35,&QAction::triggered,[=](){mem=ms = 2100+1;timer->start(1000);refresh();});
-    connect(m_45,&QAction::triggered,[=](){mem=ms = 2700+1;timer->start(1000);refresh();});
-    connect(m_set,&QAction::triggered,[=](){input();});
+    connect(m_5,&QAction::triggered,[=](){count->mem=count->ms = 300;refresh();});
+    connect(m_15,&QAction::triggered,[=](){count->mem=count->ms = 900;refresh();});
+    connect(m_25,&QAction::triggered,[=](){count->mem=count->ms = 1500;refresh();});
+    connect(m_35,&QAction::triggered,[=](){count->mem=count->ms = 2100;refresh();});
+    connect(m_45,&QAction::triggered,[=](){count->mem=count->ms = 2700;refresh();});
+    connect(m_set,&QAction::triggered,[=](){input();refresh();});

+    //实例化对象
+    count=new countDown(this);
+    toptime=new topTime(this);

    switchbutton = new DSwitchButton (this);
    ui->horizontalLayout_2->addWidget(switchbutton);
    switchbutton->setChecked(false);
-    timerswitch=false;
    setWindowFlags(windowFlags()&~Qt::WindowMaximizeButtonHint);// 禁止最大化按钮
    setFixedSize(this->width(),this->height());// 禁止拖动窗口大小
    connect(switchbutton, SIGNAL(checkedChanged(bool)), this, SLOT(onSBtnSwitchButtonCheckedChanged(bool)));
-    //时间更新
+
+    //结束时音频播放（待修改！）
+     player = new QMediaPlayer(this);
+     player->setVolume(100);
+     player->setMedia(QUrl("qrc:/audio/ding.wav"));
+
+    //设置界面刷新和对象响应
+    connect(count,&countDown::refreshed,this,&Widget::refreshCount);
+    connect(toptime,&topTime::refreshed,this,&Widget::refreshTime);
+    connect(count,&countDown::ended,player,&QMediaPlayer::play);
+
+    //时间控制
    timer->start(1000); //每隔1000ms发送timeout的信号
-    connect(timer, SIGNAL(timeout()), this,SLOT(refresh()));
-    refresh();
-
-
-    //音频播放
-    player = new QMediaPlayer;
-    player->setVolume(100);
-    player->setMedia(QUrl("qrc:/audio/ding.wav"));
+    refreshCount();
+    refreshTime();
 }
-void Widget::refresh()
+
+void Widget::refresh()//刷新count的开始结束动作
 {
-    ostringstream timeshow;
-    if(timerswitch==true)
+    if(btSwitch)
    {
-        if(ms==0) ms=mem;
-        ms-=1;
-        QDateTime tomato_time = QDateTime::fromTime_t(ms);
-        QString textout=tomato_time.toString("mm:ss");
-        ui->time->setText(textout);
-        if(ms==0)
-        {
-            player->play();
-            timer->stop();
-        }
-    }else {
-        QDateTime current_time = QDateTime::currentDateTime();
-        QString str=current_time.toString("hh:mm");
-        ui->time->setText(str);
+        if(!count->ms) count->reset();
+        count->start();
    }
+    else
+    {
+        count->stop();
+    }
+}
+void Widget::refreshTime()//用toptime的信息刷新时间显示
+{
+    ui->titlebar->setTitle(toptime->str);
+}
+void Widget::refreshCount()//用count的信息刷新倒计时显示
+{
+    QDateTime tomato_time = QDateTime::fromTime_t(count->ms);
+    QString textout=tomato_time.toString("mm:ss");
+    ui->time->setText(textout);
 }
 DTitlebar* Widget::getTitlebar()
 {
@@ -151,22 +156,37 @@ void Widget::input()
    timer->start(1000);
    refresh();
 }
+void Widget::input()//输入时间
+{
+    bool isOK;
+    int i = DInputDialog::getInt(this, "输入时间",
+                                        "请输入时间（分钟，小于60）",
+                                        count->mem/60,0,100,1,&isOK);
+    if(isOK)
+    {
+        count->ms=count->mem=60*i;
+    }
+    switch (count->mem) {
+        case 300+1:
+            m_5->setChecked(true);
+            break;
+        case 900+1:
+            m_15->setChecked(true);
+            break;
+        case 1500+1:
+            m_25->setChecked(true);
+            break;
+        case 2100+1:
+            m_35->setChecked(true);
+            break;
+        case 2700+1:
+            m_45->setChecked(true);
+            break;
+    }
+}
 void Widget::onSBtnSwitchButtonCheckedChanged(bool ck)
 {
-
-    if(ck==true)
-    {
-        timerswitch=true;
-        timer->start(1000);
-        /*Widget::player->play();*/
-    }
-    else
-    {
-        timerswitch=false;
-        timer->start(1000);
-        /*Widget::player->stop();*/
-    }
    player->stop();
+    btSwitch=ck;
    refresh();
-
 }