From fb6ef502a46a076d4a16e6a2a5643e48aed53e7f Mon Sep 17 00:00:00 2001 From: chenfufeng Date: Wed, 14 Aug 2024 19:12:38 +0800 Subject: [PATCH] =?UTF-8?q?[6.7.0][Opt]=E4=BC=98=E5=8C=96=E6=8E=92?= =?UTF-8?q?=E9=98=9F=E6=92=AD=E6=94=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/mogo/tts/pad/PadTTS.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tts/tts-pad/src/main/java/com/mogo/tts/pad/PadTTS.java b/tts/tts-pad/src/main/java/com/mogo/tts/pad/PadTTS.java index 82f69d2809..eaeea17eb0 100644 --- a/tts/tts-pad/src/main/java/com/mogo/tts/pad/PadTTS.java +++ b/tts/tts-pad/src/main/java/com/mogo/tts/pad/PadTTS.java @@ -398,7 +398,10 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack { @Override public void speakTTSVoiceWithLevel(String tts, int level) { - speakTTSVoiceWithLevel(tts, level, null); + List ttsEntityList = new ArrayList<>(); + ttsEntityList.add(new LangTtsEntity(tts, LanguageType.CHINESE)); + MultiLangTtsEntity ttsEntity = new MultiLangTtsEntity(ttsEntityList); + speakMultiLangTTSWithLevel(ttsEntity, level); } private void speakMultiLangTTSWithLevel(MultiLangTtsEntity ttsEntity,int ttsLevel) { @@ -876,11 +879,7 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack { if (!linkedList.isEmpty()) { Pair ttsPair = linkedList.removeFirst(); CallerLogger.i(TAG, "排队播放的下一条文本为：" + ttsPair.first + ",级别为：" + ttsPair.second); - curTtsLevel = ttsPair.second; - LangTtsEntity entity = ttsPair.first.ttsNext(); - if (entity != null) { - speakTTSVoice(entity.getTtsContent()); - } + speakMultiLangTTSWithLevel(ttsPair.first, ttsPair.second); } else { CallerLogger.i(TAG, "队列为空"); }