fix: modify the 'Text to Speech' reading text

modify the 'Text to Speech' reading text

Log: modify the 'Text to Speech' reading text
Task: https://pms.uniontech.com/task-view-378245.html

Author: add-uos

src/editor/dtextedit.cpp

@@ -299,7 +299,6 @@ void TextEdit::initRightClickedMenu()
     m_openInFileManagerAction = new QAction(tr("Display in file manager"), this);
     m_toggleCommentAction = new QAction(tr("Add Comment"), this);
     m_voiceReadingAction = new QAction(tr("Text to Speech"), this);
-    m_stopReadingAction = new QAction(tr("Stop reading"), this);
     m_dictationAction = new QAction(tr("Speech to Text"), this);
     m_translateAction = new QAction(tr("Translate"), this);
     m_columnEditAction = new QAction(tr("Column Mode"), this);
@@ -375,7 +374,6 @@ void TextEdit::initRightClickedMenu()
     connect(m_addComment, &QAction::triggered, this, &TextEdit::slotAddComment);
     connect(m_cancelComment, &QAction::triggered, this, &TextEdit::slotCancelComment);
     connect(m_voiceReadingAction, &QAction::triggered, this, &TextEdit::slotVoiceReadingAction);
-    connect(m_stopReadingAction, &QAction::triggered, this, &TextEdit::slotStopReadingAction);
     connect(m_dictationAction, &QAction::triggered, this, &TextEdit::slotdictationAction);
     connect(m_translateAction, &QAction::triggered, this, &TextEdit::slot_translate);
     connect(m_columnEditAction, &QAction::triggered, this, &TextEdit::slotColumnEditAction);
@@ -537,23 +535,9 @@ void TextEdit::popRightMenu(QPoint pos)
         (DSysInfo::uosEditionType() == DSysInfo::UosEdition::UosHome) ||
         (DSysInfo::uosEditionType() == DSysInfo::UosEdition::UosEducation)) {*/
 
-    bool stopReadingState = false;
-    QDBusMessage stopReadingMsg = QDBusMessage::createMethodCall("com.iflytek.aiassistant",
-                                                                 "/aiassistant/tts",
-                                                                 "com.iflytek.aiassistant.tts",
-                                                                 "isTTSInWorking");
+    m_rightMenu->addAction(m_voiceReadingAction);
+    m_voiceReadingAction->setEnabled(true);
 
-    QDBusReply<bool> stopReadingStateRet = QDBusConnection::sessionBus().asyncCall(stopReadingMsg, 100);
-    if (stopReadingStateRet.isValid()) {
-        stopReadingState = stopReadingStateRet.value();
-    }
-    if (!stopReadingState) {
-        m_rightMenu->addAction(m_voiceReadingAction);
-        m_voiceReadingAction->setEnabled(false);
-    } else {
-        m_rightMenu->removeAction(m_voiceReadingAction);
-        m_rightMenu->addAction(m_stopReadingAction);
-    }
     bool voiceReadingState = false;
     QDBusMessage voiceReadingMsg = QDBusMessage::createMethodCall("com.iflytek.aiassistant",
                                                                   "/aiassistant/tts",
@@ -2847,37 +2831,16 @@ void TextEdit::slotVoiceReadingAction(bool checked)
 #endif
         return;
     }
+
+    // 先结束之前的播放
+    QProcess process;
+    process.start("dbus-send", QStringList() << "--print-reply" << "--dest=com.iflytek.aiassistant" << "/aiassistant/tts" << "com.iflytek.aiassistant.tts.stopTTSDirectly");
+    process.waitForFinished(1000); // 最多等待1秒
 
     QProcess::startDetached("dbus-send  --print-reply --dest=com.iflytek.aiassistant /aiassistant/deepinmain com.iflytek.aiassistant.mainWindow.TextToSpeech");
     emit signal_readingPath();
 }
 
-bool TextEdit::slotStopReadingAction(bool checked)
-{
-    Q_UNUSED(checked);
-    bool voiceReadingState = false;
-    QDBusMessage voiceReadingMsg = QDBusMessage::createMethodCall("com.iflytek.aiassistant",
-                                                                  "/aiassistant/tts",
-                                                                  "com.iflytek.aiassistant.tts",
-                                                                  "getTTSEnable");
-
-    QDBusReply<bool> voiceReadingStateRet = QDBusConnection::sessionBus().asyncCall(voiceReadingMsg, 100);
-    //没有收到返回就加载配置文件数据
-    if (voiceReadingStateRet.isValid()) {
-        voiceReadingState = voiceReadingStateRet.value();
-    }
-    if (!voiceReadingState) {
-#ifdef DTKWIDGET_CLASS_DSizeMode
-        Utils::sendFloatMessageFixedFont(this, QIcon(":/images/warning.svg"), tr("Please install UOS AI from the app store first."));
-#else
-        DMessageManager::instance()->sendMessage(this, QIcon(":/images/warning.svg"), tr("Please install UOS AI from the app store first."));
-#endif
-        return false;
-    }
-
-    return QProcess::startDetached("dbus-send  --print-reply --dest=com.iflytek.aiassistant /aiassistant/tts com.iflytek.aiassistant.tts.stopTTSDirectly");
-}
-
 void TextEdit::slotdictationAction(bool checked)
 {
     Q_UNUSED(checked);
@@ -8209,7 +8172,6 @@ void TextEdit::onAudioPortEnabledChanged(quint32 cardId, const QString &portName
 
         // 如果所有输出设备都被禁用，显示输出设备提示
         if (!hasOutputDevice) {
-            slotStopReadingAction();
 #ifdef DTKWIDGET_CLASS_DSizeMode
             Utils::sendFloatMessageFixedFont(this, QIcon(":/images/warning.svg"), tr("No audio output device was detected. Please ensure your speakers or headphones are properly connected and try again."));
 #else

src/editor/dtextedit.h

@@ -527,7 +527,6 @@ public slots:
     void slotAddComment(bool checked = false);
     void slotCancelComment(bool checked = false);
     void slotVoiceReadingAction(bool checked = false);
-    bool slotStopReadingAction(bool checked = false);
     void slotdictationAction(bool checked = false);
 
     // 音频设备检测方法
@@ -677,7 +676,6 @@ private slots:
     QAction *m_openInFileManagerAction;
     QAction *m_toggleCommentAction;
     QAction *m_voiceReadingAction;
-    QAction *m_stopReadingAction;
     QAction *m_dictationAction;
     QAction *m_translateAction;
     QAction *m_columnEditAction;

tests/src/editor/ut_textedit.cpp

@@ -5701,23 +5701,6 @@ TEST_F(test_textedit, slotVoiceReadingAction)
     pWindow->deleteLater();
 }
 
-//slotStopReadingAction
-TEST_F(test_textedit, slotStopReadingAction)
-{
-    Window *pWindow = new Window();
-    pWindow->addBlankTab(QString());
-    pWindow->currentWrapper()->textEditor()->insertTextEx(pWindow->currentWrapper()->textEditor()->textCursor(),
-                                                          QString("Holle world.\nHolle world."));
-    QTextCursor textCursor = pWindow->currentWrapper()->textEditor()->textCursor();
-    textCursor.movePosition(QTextCursor::StartOfBlock, QTextCursor::KeepAnchor);
-    pWindow->currentWrapper()->textEditor()->setTextCursor(textCursor);
-    pWindow->currentWrapper()->textEditor()->slotStopReadingAction(true);
-    bool bRet = pWindow->currentWrapper()->textEditor()->textCursor().hasSelection();
-    ASSERT_TRUE(bRet == true);
-
-    pWindow->deleteLater();
-}
-
 //slotdictationAction
 TEST_F(test_textedit, slotdictationAction)
 {