diff --git a/config.gradle b/config.gradle index ce651c5fef..f5467e9b17 100644 --- a/config.gradle +++ b/config.gradle @@ -58,7 +58,7 @@ targetSdkVersion : 22, // fresco fresco : 'com.facebook.fresco:fresco:1.1.0', // 公司服务 - 语音 - aiassist : "com.zhidaoauto.common:service:1.0.4.10", + aiassist : "com.zhidaoauto.common:service:1.0.8.4", // 语音替换方案 暂时只用TTS 解决焦点问题 aiassistReplace : "com.zhidao.mogoVoicesdk:voice:1.0.5", // 公司服务 - 埋点 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 e752812148..084d12db46 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 @@ -479,6 +479,14 @@ public class AIAssist implements VoiceClient.VoiceCmdCallBack, OnTtsListener { } } + /** + * 打断上一条正在播报的语音内容,仅在Speech上生效,TXZ为空实现 + * 语音SDK生效版本从1.0.8.4版本起 + */ + public void breakOffSpeak(){ + mVoiceClient.breakOffSpeak(); + } + public void clearTTSCallback( String text ) { try { mSpeakVoiceMap.remove( text ); diff --git a/gradle.properties b/gradle.properties index 3ba961db6d..4b0613d6ae 100644 --- a/gradle.properties +++ b/gradle.properties @@ -101,7 +101,7 @@ CRASHREPORT_NOOP_VERSION=2.0.0 ######## 外部依赖引用 # 车聊聊 -CARCHATTING_VERSION=1.7.4 +CARCHATTING_VERSION=1.8.2 # 车聊聊接口 CARCHATTINGPROVIDER_VERSION=1.4.1 # loglib diff --git a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageFiveFragment.kt b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageFiveFragment.kt index 3be1e1ba10..341bbda15d 100644 --- a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageFiveFragment.kt +++ b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageFiveFragment.kt @@ -7,6 +7,7 @@ import com.mogo.commons.mvp.Presenter import com.mogo.commons.voice.IMogoVoiceCmdCallBack import com.mogo.module.guide.R import com.mogo.module.guide.fragment.GuideFragment +import com.mogo.module.guide.util.breakOffSpeak import com.mogo.module.guide.util.speak import kotlinx.android.synthetic.main.module_guide_item_stage_five.* import kotlinx.android.synthetic.main.module_guide_item_stage_four.* @@ -36,6 +37,7 @@ class GuideStageFiveFragment : MvpFragment> { override fun onResume() { super.onResume() containerFragment?.invisibleRight() + breakOffSpeak(context!!) speak(context!!, context!!.resources.getString(R.string.module_guide_voice_page_five), object : IMogoVoiceCmdCallBack { override fun onSpeakEnd(speakText: String?) { if(!isVisible){ diff --git a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageFourFragment.kt b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageFourFragment.kt index d207097fc7..434bb09496 100644 --- a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageFourFragment.kt +++ b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageFourFragment.kt @@ -7,6 +7,7 @@ import com.mogo.commons.mvp.Presenter import com.mogo.commons.voice.IMogoVoiceCmdCallBack import com.mogo.module.guide.R import com.mogo.module.guide.fragment.GuideFragment +import com.mogo.module.guide.util.breakOffSpeak import com.mogo.module.guide.util.speak import kotlinx.android.synthetic.main.module_guide_item_stage_four.* import kotlinx.android.synthetic.main.module_guide_item_stage_three.* @@ -37,6 +38,7 @@ class GuideStageFourFragment : MvpFragment> { super.onResume() containerFragment?.visibleLeft() containerFragment?.visibleRight() + breakOffSpeak(context!!) speak(context!!, context!!.resources.getString(R.string.module_guide_voice_page_four), object : IMogoVoiceCmdCallBack { override fun onSpeakEnd(speakText: String?) { if(!isVisible){ diff --git a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageOneFragment.kt b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageOneFragment.kt index eb7ba93654..b609a9b0b0 100644 --- a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageOneFragment.kt +++ b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageOneFragment.kt @@ -7,6 +7,7 @@ import com.mogo.commons.mvp.Presenter import com.mogo.commons.voice.IMogoVoiceCmdCallBack import com.mogo.module.guide.R import com.mogo.module.guide.fragment.GuideFragment +import com.mogo.module.guide.util.breakOffSpeak import com.mogo.module.guide.util.speak import kotlinx.android.synthetic.main.module_guide_item_stage_one.* @@ -37,6 +38,7 @@ class GuideStageOneFragment : MvpFragment> { override fun onResume() { super.onResume() containerFragment?.invisibleLeft() + breakOffSpeak(context!!) speak(context!!, context!!.resources.getString(R.string.module_guide_voice_page_one), object : IMogoVoiceCmdCallBack { override fun onSpeakEnd(speakText: String?) { if (!isVisible) { diff --git a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageThreeFragment.kt b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageThreeFragment.kt index 701250634e..1d8e35d73a 100644 --- a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageThreeFragment.kt +++ b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageThreeFragment.kt @@ -7,6 +7,7 @@ import com.mogo.commons.mvp.Presenter import com.mogo.commons.voice.IMogoVoiceCmdCallBack import com.mogo.module.guide.R import com.mogo.module.guide.fragment.GuideFragment +import com.mogo.module.guide.util.breakOffSpeak import com.mogo.module.guide.util.speak import kotlinx.android.synthetic.main.module_guide_item_stage_three.* import kotlinx.android.synthetic.main.module_guide_item_stage_two.* @@ -37,6 +38,7 @@ class GuideStageThreeFragment : MvpFragment> { super.onResume() containerFragment?.visibleLeft() containerFragment?.visibleRight() + breakOffSpeak(context!!) speak(context!!, context!!.resources.getString(R.string.module_guide_voice_page_three), object : IMogoVoiceCmdCallBack { override fun onSpeakEnd(speakText: String?) { if(!isVisible){ diff --git a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageTwoFragment.kt b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageTwoFragment.kt index ec4c348998..1986051ca3 100644 --- a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageTwoFragment.kt +++ b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageTwoFragment.kt @@ -7,6 +7,7 @@ import com.mogo.commons.mvp.Presenter import com.mogo.commons.voice.IMogoVoiceCmdCallBack import com.mogo.module.guide.R import com.mogo.module.guide.fragment.GuideFragment +import com.mogo.module.guide.util.breakOffSpeak import com.mogo.module.guide.util.speak import kotlinx.android.synthetic.main.module_guide_item_stage_one.* import kotlinx.android.synthetic.main.module_guide_item_stage_two.* @@ -37,6 +38,7 @@ class GuideStageTwoFragment : MvpFragment> { super.onResume() containerFragment?.visibleLeft() containerFragment?.visibleRight() + breakOffSpeak(context!!) speak(context!!, context!!.resources.getString(R.string.module_guide_voice_page_two), object : IMogoVoiceCmdCallBack { override fun onSpeakEnd(speakText: String?) { if(!isVisible){ diff --git a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/util/VoiceUtil.kt b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/util/VoiceUtil.kt index c0184db527..b4d728f82e 100644 --- a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/util/VoiceUtil.kt +++ b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/util/VoiceUtil.kt @@ -7,4 +7,8 @@ import com.mogo.commons.voice.VoicePreemptType fun speak(context: Context, text: String, callBack: IMogoVoiceCmdCallBack?) { AIAssist.getInstance(context).speakTTSVoice(text, VoicePreemptType.PREEMPT_TYPE_IMMEADIATELY, callBack) +} + +fun breakOffSpeak(context: Context){ + AIAssist.getInstance(context).breakOffSpeak() } \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-callchat-res/mipmap-ldpi/module_callchatting_user_close_light.png b/skin/mogo-skin-light/src/main/module-callchat-res/mipmap-ldpi/module_callchatting_user_close_light.png new file mode 100644 index 0000000000..6de4846972 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-callchat-res/mipmap-ldpi/module_callchatting_user_close_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-callchat-res/mipmap-mdpi/module_callchatting_user_close_light.png b/skin/mogo-skin-light/src/main/module-callchat-res/mipmap-mdpi/module_callchatting_user_close_light.png new file mode 100644 index 0000000000..6de4846972 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-callchat-res/mipmap-mdpi/module_callchatting_user_close_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-callchat-res/mipmap-xhdpi/module_callchatting_user_close_light.png b/skin/mogo-skin-light/src/main/module-callchat-res/mipmap-xhdpi/module_callchatting_user_close_light.png new file mode 100644 index 0000000000..cc00f7d153 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-callchat-res/mipmap-xhdpi/module_callchatting_user_close_light.png differ