diff --git a/gradle.properties b/gradle.properties index 1ba44964a9..96971cae96 100644 --- a/gradle.properties +++ b/gradle.properties @@ -66,23 +66,23 @@ SERVICE_BIZ_VERSION=1.2.4 LOGLIB_VERSION=1.5.11 ######## MogoAiCloudSDK Version ######## # 网络请求LOGLIB_VERSION -MOGO_NETWORK_VERSION=1.4.5.6 +MOGO_NETWORK_VERSION=1.4.5.7 # 鉴权 -MOGO_PASSPORT_VERSION=1.4.5.6 +MOGO_PASSPORT_VERSION=1.4.5.7 # 常链接 -MOGO_SOCKET_VERSION=1.4.5.6 +MOGO_SOCKET_VERSION=1.4.5.7 # 数据采集 -MOGO_REALTIME_VERSION=1.4.5.6 +MOGO_REALTIME_VERSION=1.4.5.7 # 探路,道路事件发布,获取 -MOGO_TANLU_VERSION=1.4.5.6 +MOGO_TANLU_VERSION=1.4.5.7 # 直播推流 -MOGO_LIVE_VERSION=1.4.5.6 +MOGO_LIVE_VERSION=1.4.5.7 # 直播拉流 -MOGO_TRAFFICLIVE_VERSION=1.4.5.6 +MOGO_TRAFFICLIVE_VERSION=1.4.5.7 # 定位服务 -MOGO_LOCATION_VERSION=1.4.5.6 +MOGO_LOCATION_VERSION=1.4.5.7 # 远程通讯模块 -MOGO_TELEMATIC_VERSION=1.4.5.6 +MOGO_TELEMATIC_VERSION=1.4.5.7 ######## MogoAiCloudSDK Version ######## # 自研地图 MAP_SDK_VERSION=2.10.0.9 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 382f00303a..707876c9b1 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 @@ -29,6 +29,8 @@ import com.mogo.eagle.core.utilcode.util.ThreadUtils; import com.mogo.eagle.core.utilcode.util.ToastUtils; import com.mogo.tts.base.IMogoTTS; import com.mogo.tts.base.IMogoTTSCallback; +import com.mogo.tts.base.LangTtsEntity; +import com.mogo.tts.base.LanguageType; import com.mogo.tts.base.MultiLangTtsEntity; import com.mogo.tts.base.PreemptType; import com.zhidao.auto.platform.voice.VoiceClient; @@ -443,9 +445,11 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList @MainThread public void speakTTSVoiceWithLevel(String text, int ttsLevel, IMogoTTSCallback callBack) { if (mHasAuth && mEngine != null) { - mSpeakVoiceMap.put(text, callBack); + if (callBack != null) { + mSpeakVoiceMap.put(text, callBack); + } + speakTTSVoiceWithLevel(text, ttsLevel); } - speakTTSVoiceWithLevel(text, ttsLevel); } // 降序插入Tts(目前Level0、1可排队) @@ -508,7 +512,15 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList @Override public void speakMultiLangTTSWithLevel(MultiLangTtsEntity ttsEntity, int level, IMogoTTSCallback callback) { - + if (mHasAuth && mEngine != null) { + LangTtsEntity entity; + if ((entity = ttsEntity.ttsNext()) != null && entity.getLanguage() == LanguageType.CHINESE) { + if (callback != null) { + mSpeakVoiceMap.put(entity.getTtsContent(), callback); + } + speakTTSVoiceWithLevel(entity.getTtsContent(), level); + } + } } /**