From 961e8953e8690e6bad7e33a6ca011f988bc8f343 Mon Sep 17 00:00:00 2001 From: chenfufeng Date: Thu, 5 Dec 2024 16:17:50 +0800 Subject: [PATCH] =?UTF-8?q?[6.8.2][Opt]=E6=96=B0=E5=A2=9E=E8=AF=AD?= =?UTF-8?q?=E9=9F=B3=E5=90=88=E6=88=90=E7=9A=84P2=E7=BA=A7=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/mogo/commons/voice/AIAssist.java | 13 +++++++------ .../main/java/com/mogo/tts/iflytek/IFlyTekTts.kt | 5 +++++ .../src/main/java/com/mogo/tts/pad/PadTTS.java | 7 ++++++- 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/voice/AIAssist.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/voice/AIAssist.java index f5d52c7bfd..e0df6f7ff4 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/voice/AIAssist.java +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/voice/AIAssist.java @@ -24,10 +24,11 @@ public class AIAssist { private static volatile AIAssist sInstance; - public static final int LEVEL0 = 3;//P0 - public static final int LEVEL1 = 2;//P1 - public static final int LEVEL2 = 1;//P2 - public static final int LEVEL3 = 0;//P3 + public static final int LEVEL0 = 4;//P0 + public static final int LEVEL1 = 3;//P1 + public static final int NEW_LEVEL_2 = 2;// P2 + public static final int LEVEL2 = 1;//P3 + public static final int LEVEL3 = 0;//P4 private IMogoTTS mTTS; private IGlobalTtsCallback mTTSCallback; @@ -144,7 +145,7 @@ public class AIAssist { } /** - * 等级由低到高为0、1、2、3，分别对应p3、p2、p1、p0 + * 等级由低到高为0、1、2、3、4，分别对应p4、p3、p2、p1、p0(已更新) * * @param text * @param level @@ -159,7 +160,7 @@ public class AIAssist { * 支持多语言的Tts * * @param ttsEntity: 多语言Entity - * @param level: 等级由低到高为0、1、2、3，分别对应p3、p2、p1、p0 + * @param level: 等级由低到高为0、1、2、3、4，分别对应p4、p3、p2、p1、p0(已更新) * @param callback */ public void speakMultiLangTTSWithLevel(MultiLangTtsEntity ttsEntity, int level, IMogoTTSCallback callback) { diff --git a/tts/tts-iflytek/src/main/java/com/mogo/tts/iflytek/IFlyTekTts.kt b/tts/tts-iflytek/src/main/java/com/mogo/tts/iflytek/IFlyTekTts.kt index b56aa18d54..4405d45928 100644 --- a/tts/tts-iflytek/src/main/java/com/mogo/tts/iflytek/IFlyTekTts.kt +++ b/tts/tts-iflytek/src/main/java/com/mogo/tts/iflytek/IFlyTekTts.kt @@ -234,6 +234,9 @@ class IFlyTekTts : IMogoTTS, InitListener { d(TAG, "插入消息：$ttsEntity,level为：$ttsLevel") insertTts(ttsEntity, ttsLevel) return + } else if (ttsLevel == 2) { + d(TAG, "已有p2级别在播报，新内容直接丢弃!") + return } else { // 打断并合成新的 stopTts() @@ -252,6 +255,8 @@ class IFlyTekTts : IMogoTTS, InitListener { d(TAG, "===================") d(TAG, "插入消息：$ttsEntity,level为：$ttsLevel") insertTts(ttsEntity, ttsLevel) + } else if (ttsLevel == 2) { + d(TAG, "已有高级别在播报，新内容直接丢弃!") } return } 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 eaeea17eb0..57bf744cfd 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 @@ -413,7 +413,10 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack { CallerLogger.d(TAG, "插入消息：" + ttsEntity + ",level为：" + ttsLevel); insertTts(ttsEntity, ttsLevel); return; - } else { + } else if (ttsLevel == 2) { + CallerLogger.d(TAG, "已有p2级别在播报，新内容直接丢弃!"); + return; + } else { // 打断并合成新的 stopTts(); CallerLogger.d(TAG, "非Level1同级别打断!"); @@ -431,6 +434,8 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack { CallerLogger.d(TAG, "==================="); CallerLogger.d(TAG, "插入消息：" + ttsEntity + ",level为：" + ttsLevel); insertTts(ttsEntity, ttsLevel); + } else if (ttsLevel == 2) { + CallerLogger.d(TAG, "已有高级别在播报，新内容直接丢弃!"); } return; }