From 8f6c55afd08888c94a31c5d9404b556928bc26d4 Mon Sep 17 00:00:00 2001
From: zhaohe <h_zhaohe@163.com>
Date: Fri, 17 Mar 2023 15:25:17 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=AD=E9=9F=B3=E6=B5=81=E7=A8=8B=E6=9C=80?=
 =?UTF-8?q?=E7=AE=80=E7=89=88=E5=88=9D=E6=AD=A5=E7=A8=B3=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main.cpp                                       | 2 +-
 src/service/main_control_service.cpp               | 4 +++-
 src/service/voiceprocess/audio_recoder_service.cpp | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index ca5e616..a548b6a 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -179,7 +179,7 @@ int Main::main(int argc, char *argv[]) {
 
   // 播放器-SmartSoundBoxPlayer
   BUILD_AND_REG_SERRVICE(SmartSoundBoxPlayer);
-  GET_SERVICE(SmartSoundBoxPlayer)->initialize(50, 50);
+  GET_SERVICE(SmartSoundBoxPlayer)->initialize(100, 30);
   /**
    * @brief 其他服务
    */
diff --git a/src/service/main_control_service.cpp b/src/service/main_control_service.cpp
index 9226486..754cf57 100644
--- a/src/service/main_control_service.cpp
+++ b/src/service/main_control_service.cpp
@@ -104,8 +104,9 @@ void MainControlService::initializeVoiceProcess() {
 void MainControlService::triggerProcessConversationSession() {
   m_smartSoundboxPlayer->playConversationTTS(m_conversationSession->getAsrTTSLocalURL(), nullptr);
   json nlpResult = m_conversationSession->getNlpResult();
-  if (nlpResult["data"]["intent"]["shouldEndSession"]) {
+  if (nlpResult["data"]["intent"]["shouldEndSession"] == "true") {
     logger->info("endSession");
+    if (m_endsessionTimer->isRunning()) m_endsessionTimer->stop();
     endSession();
     return;
   }
@@ -179,6 +180,7 @@ void MainControlService::constructSession() {
 
   m_smartSoundboxPlayer->triggerWakeup();
   if (m_conversationSession) {
+    if (m_endsessionTimer->isRunning()) m_endsessionTimer->stop();
     endSession();
   }
 
diff --git a/src/service/voiceprocess/audio_recoder_service.cpp b/src/service/voiceprocess/audio_recoder_service.cpp
index 2ef125a..c3a8aac 100644
--- a/src/service/voiceprocess/audio_recoder_service.cpp
+++ b/src/service/voiceprocess/audio_recoder_service.cpp
@@ -4,7 +4,7 @@ using namespace std;
 using namespace iflytop;
 using namespace core;
 
-#define TEST 
+// #define TEST 
 
 AudioRecoderService::AudioRecoderService() {}
 void AudioRecoderService::initialize(const char *pcmName, unsigned int channels, unsigned int sample_rate,
@@ -44,7 +44,7 @@ void AudioRecoderService::startRecord() {
       audioclip.reset(new AudioClip(buf, 8000, 5, 16000, AudioFormat::S16_LE));
       logger->info("report audioclip {}", 8000);
       onRecordData(audioclip);
-      thisThread.sleepForMs(60);
+      thisThread.sleepForMs(70);
     }
     logger->info("testAudio thread exit");
   }));