Merge remote-tracking branch 'origin/dev' into dev

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",
             // 公司服务 - 埋点

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 );

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<IView, Presenter<IView>> {
     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){

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<IView, Presenter<IView>> {
         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){

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<IView, Presenter<IView>> {
     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) {

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<IView, Presenter<IView>> {
         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){

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<IView, Presenter<IView>> {
         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){

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()
 }