From cf29a14cef19de62f93b2ee6ed9145da5e2c0a62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Tue, 28 Apr 2020 17:37:43 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0V2X=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/misc.xml | 2 +- gradle.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index 2dc54c489f..707ee6e613 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index ae2100e839..e46f188f34 100644 --- a/gradle.properties +++ b/gradle.properties @@ -66,7 +66,7 @@ MOGO_MODULE_GUIDESHOW_PROVIDER_VERSION=1.0.2-SNAPSHOT # 在线车辆F MOGO_MODULE_ONLINECAR_VERSION=1.0.3.1 # v2x -MOGO_MODULE_V2X_VERSION=1.0.3.7-SNAPSHOT +MOGO_MODULE_V2X_VERSION=1.0.4.2 # 媒体卡片 MOGO_MODULE_MEDIA_VERSION=1.0.4.3 # 推送 From 6b30d4bd5c2b9afe89d06c51125b859246def2cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Tue, 28 Apr 2020 17:53:36 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0V2X=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index e46f188f34..2f80330fe9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -66,7 +66,7 @@ MOGO_MODULE_GUIDESHOW_PROVIDER_VERSION=1.0.2-SNAPSHOT # 在线车辆F MOGO_MODULE_ONLINECAR_VERSION=1.0.3.1 # v2x -MOGO_MODULE_V2X_VERSION=1.0.4.2 +MOGO_MODULE_V2X_VERSION=1.0.4.3 # 媒体卡片 MOGO_MODULE_MEDIA_VERSION=1.0.4.3 # 推送 From 2c40d239f6cebb0417a2ac55cef4afd023f31367 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Tue, 28 Apr 2020 17:58:49 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0V2X=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 2f80330fe9..3cd8df1081 100644 --- a/gradle.properties +++ b/gradle.properties @@ -66,7 +66,7 @@ MOGO_MODULE_GUIDESHOW_PROVIDER_VERSION=1.0.2-SNAPSHOT # 在线车辆F MOGO_MODULE_ONLINECAR_VERSION=1.0.3.1 # v2x -MOGO_MODULE_V2X_VERSION=1.0.4.3 +MOGO_MODULE_V2X_VERSION=1.0.4.4 # 媒体卡片 MOGO_MODULE_MEDIA_VERSION=1.0.4.3 # 推送 From 88adcfed2373fd57a79e4acdbc1d6cdbbdb34993 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Tue, 28 Apr 2020 19:41:17 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0V2X=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 3cd8df1081..2f0c4b25e0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -66,7 +66,7 @@ MOGO_MODULE_GUIDESHOW_PROVIDER_VERSION=1.0.2-SNAPSHOT # 在线车辆F MOGO_MODULE_ONLINECAR_VERSION=1.0.3.1 # v2x -MOGO_MODULE_V2X_VERSION=1.0.4.4 +MOGO_MODULE_V2X_VERSION=1.0.4.5 # 媒体卡片 MOGO_MODULE_MEDIA_VERSION=1.0.4.3 # 推送 From ebc1be70bbf4100f23d0edb246edc2f832f520f4 Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Wed, 29 Apr 2020 10:17:02 +0800 Subject: [PATCH 5/5] opt --- .../main/java/com/mogo/commons/voice/AIAssist.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) 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 5f441eb835..558f6fe857 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 @@ -6,6 +6,7 @@ import android.content.Intent; import android.content.pm.ApplicationInfo; import android.text.TextUtils; +import com.mogo.commons.AbsMogoApplication; import com.mogo.utils.logger.Logger; import com.zhidao.auto.platform.voice.VoiceClient; import com.zhidao.voicesdk.MogoVoiceManager; @@ -81,7 +82,9 @@ public class AIAssist implements VoiceClient.VoiceCmdCallBack, OnTtsListener { } private void initFlushStatus( Context context ) { - mHasFlush = isVoiceServiceReady( context ); + if ( !mHasFlush ) { + mHasFlush = isVoiceServiceReady( context ); + } } /** @@ -194,6 +197,7 @@ public class AIAssist implements VoiceClient.VoiceCmdCallBack, OnTtsListener { */ public void speakTTSVoice( String text, IMogoVoiceCmdCallBack callBack ) { try { + initFlushStatus( AbsMogoApplication.getApp() ); if ( mHasFlush ) { mSpeakVoiceMap.put( text, callBack ); mVoiceClient.speakDefault( text ); @@ -209,6 +213,7 @@ public class AIAssist implements VoiceClient.VoiceCmdCallBack, OnTtsListener { */ public void speakTTSVoice( String text ) { try { + initFlushStatus( AbsMogoApplication.getApp() ); if ( mHasFlush ) { mVoiceClient.speakDefault( text ); } @@ -224,6 +229,7 @@ public class AIAssist implements VoiceClient.VoiceCmdCallBack, OnTtsListener { */ public void speakTTSVoice( String text, VoicePreemptType type, IMogoVoiceCmdCallBack callBack ) { try { + initFlushStatus( AbsMogoApplication.getApp() ); if ( mHasFlush ) { mSpeakVoiceMap.put( text, callBack ); mVoiceClient.speakTypeText( text, type.getPreemptType() ); @@ -238,6 +244,7 @@ public class AIAssist implements VoiceClient.VoiceCmdCallBack, OnTtsListener { * @param tts 播报内容 */ public void speakQAndACmd( String tts, IMogoVoiceCmdCallBack callBack ) { + initFlushStatus( AbsMogoApplication.getApp() ); if ( mHasFlush ) { mQAndAMap.put( tts, callBack ); mVoiceClient.speakTtsAndRegistCmd( tts ); @@ -252,6 +259,7 @@ public class AIAssist implements VoiceClient.VoiceCmdCallBack, OnTtsListener { * @param cancelCmds 取消命令唤醒词 */ public void speakQAndACmd( String tts, String[] okCmds, String[] cancelCmds, IMogoVoiceCmdCallBack callBack ) { + initFlushStatus( AbsMogoApplication.getApp() ); if ( mHasFlush ) { mQAndAMap.put( tts, callBack ); mVoiceClient.speakTtsAndRegistCmd( tts, okCmds, cancelCmds ); @@ -271,6 +279,7 @@ public class AIAssist implements VoiceClient.VoiceCmdCallBack, OnTtsListener { } mCmdMap.get( cmd ).add( callBack ); + initFlushStatus( AbsMogoApplication.getApp() ); if ( mHasFlush ) { mVoiceClient.registerCustomWakeupCmd( cmd, cmdWords ); mCacheUnWakeupCommands.remove( cmd ); @@ -286,6 +295,7 @@ public class AIAssist implements VoiceClient.VoiceCmdCallBack, OnTtsListener { * @param cmdWords */ public void registerUnWakeupCommand( String cmd, String[] cmdWords ) { + initFlushStatus( AbsMogoApplication.getApp() ); if ( mHasFlush ) { mVoiceClient.registerCustomWakeupCmd( cmd, cmdWords ); mCacheUnWakeupCommands.remove( cmd );