bug50948bug50885

[产生原因] 缺少刷新 [解决方案] 刷新查询结果，与配置。 [解决版本] ukui-sidebar > 3.1.0-1-0008 [其他影响] 无
ukui · Apr 27, 2021 · 2dc7e73 · 2dc7e73
1 parent 20aa177
commit 2dc7e73
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 4 deletions.
diff --git a/src/plugins/ukui-clock/clock.cpp b/src/plugins/ukui-clock/clock.cpp
@@ -2033,7 +2033,7 @@ void Clock::countdownNoticeDialogShow()
     countdownNoticeDialog->timer->start();
     countdownNoticeDialog->timer_xumhuan->start();
     countdownNoticeDialog->show();
-    countdownNoticeDialog->music->play();
+    countdownNoticeDialog->refreshMusic();
 }
 
 /*

diff --git a/src/plugins/ukui-clock/noticeAlarm.cpp b/src/plugins/ukui-clock/noticeAlarm.cpp
@@ -74,6 +74,7 @@ Natice_alarm::Natice_alarm(int close_time, int num, QWidget *parent ) :
     timer->start();
 
     timer_xumhuan = new QTimer();
+    //每秒执行一次
     connect(timer_xumhuan, SIGNAL(timeout()), this, SLOT(ring()));
     timer_xumhuan->setInterval(1000);
 
@@ -165,6 +166,46 @@ void Natice_alarm::natice_init()
     music->setVolume(  model_setup->index(0, 6).data().toInt() );
     music->play();
 }
+//重新加载最新音乐
+void Natice_alarm::refreshMusic()
+{
+    QSqlTableModel *model = new QSqlTableModel(this);
+    model->setTable("clock");
+    model->setEditStrategy(QSqlTableModel::OnManualSubmit);
+    model->select();
+    model_setup->select();
+    playlist->clear();
+    if(num_flag >= 0)
+
+        {
+            if(model->index(num_flag, 2).data().toString().compare(tr("glass"))==0){
+                playlist->addMedia(QUrl::fromLocalFile("/usr/share/ukui-clock/glass.ogg"));
+            } else if (model->index(num_flag, 2).data().toString().compare(tr("bark"))==0) {
+                playlist->addMedia(QUrl::fromLocalFile("/usr/share/ukui-clock/bark.ogg"));
+            } else if (model->index(num_flag, 2).data().toString().compare(tr("sonar"))==0) {
+                playlist->addMedia(QUrl::fromLocalFile("/usr/share/ukui-clock/sonar.ogg"));
+            } else if (model->index(num_flag, 2).data().toString().compare(tr("drip"))==0) {
+                playlist->addMedia(QUrl::fromLocalFile("/usr/share/ukui-clock/drip.ogg"));
+            }
+        } else {
+            if (model_setup->index(0, 19).data().toString().compare(tr("glass"))==0) {
+                playlist->addMedia(QUrl::fromLocalFile("/usr/share/ukui-clock/glass.ogg"));
+            } else if(model_setup->index(0, 19).data().toString().compare(tr("bark"))==0) {
+                playlist->addMedia(QUrl::fromLocalFile("/usr/share/ukui-clock/bark.ogg"));
+            } else if(model_setup->index(0, 19).data().toString().compare(tr("sonar"))==0) {
+                playlist->addMedia(QUrl::fromLocalFile("/usr/share/ukui-clock/sonar.ogg"));
+            } else {
+                playlist->addMedia(QUrl::fromLocalFile("/usr/share/ukui-clock/drip.ogg"));
+            }
+        }
+
+        playlist->setPlaybackMode(QMediaPlaylist::Loop);//设置播放模式(顺序播放，单曲循环，随机播放等)
+                                                        // Set playback mode (sequential playback, single loop, random playback, etc.)
+        music->setPlaylist(playlist);  //设置播放列表
+                                       // Set up playlist
+        music->setVolume(  model_setup->index(0, 6).data().toInt() );
+        music->play();
+}
 
 //窗口关闭
 //window closing
@@ -208,6 +249,8 @@ void Natice_alarm::paintEvent(QPaintEvent *event)
 void Natice_alarm::show_again()
 {
     this->hide();
+    //刷新数据
+    model_setup->select();
     int remind = model_setup->index(0, 4).data().toInt();
     if (remind == 0) {
         ring_num = 120;
@@ -226,15 +269,16 @@ void Natice_alarm::show_again()
     music->stop();
 }
 //响铃
-//Ring a bell
+//Ring a bell 每一秒减一
 void Natice_alarm::ring()
 {
     ring_num--;
     if (ring_num == 0) {
         natice_init();
         this->show();
         timer->start();
-        music->play();
+        refreshMusic();
+//        music->play();
     }
 }
 

diff --git a/src/plugins/ukui-clock/noticeAlarm.h b/src/plugins/ukui-clock/noticeAlarm.h
@@ -54,6 +54,8 @@ class Natice_alarm : public QWidget
      QMediaPlayer  *music;
      int timer_value;
 
+     void refreshMusic();
+
 protected:
      //绘制背景
      // Draw background
@@ -80,6 +82,7 @@ private slots:
     QSqlTableModel *model_setup;
     QPoint dragPosition;                                            //拖动坐标
     bool mousePressed;                                              //鼠标是否按下
+
 };
 
 #endif // NATICE_ALARM_H
diff --git a/src/plugins/ukui-clock/setupPage.cpp b/src/plugins/ukui-clock/setupPage.cpp
@@ -532,6 +532,7 @@ void setuppage::Reminder_off_listClickslot()
 {
     model_setup->select();
     int num=Reminder_off->listWidget->currentRow();
+    //配置稍后提醒时间间隔
     model_setup->setData(model_setup->index(0, 4), num);
 
     switch (num) {
@@ -554,8 +555,8 @@ void setuppage::Reminder_off_listClickslot()
         break;
     }
     duration_sel->textLabel->setText(model_setup->index(0, 17).data().toString());
-    Reminder_off->hide();
     model_setup->submitAll();
+    Reminder_off->hide();
 }
 //默认铃声设置回调
 // Default ringtone setting callback