From 646dcb81a7c7ff495bf04e3949cda6eec989ad6c Mon Sep 17 00:00:00 2001 From: liujing Date: Wed, 13 Jan 2021 20:13:46 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=9B=AE=E7=9A=84=E5=9C=B0=E8=BF=9D?= =?UTF-8?q?=E7=AB=A0=E5=81=9C=E8=BD=A6,=E5=89=8D=E5=BE=80=E5=85=8D?= =?UTF-8?q?=E5=94=A4=E9=86=92=E8=AF=8D=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/module/v2x/adapter/holder/V2XFatigueDrivingVH.java | 1 + .../java/com/mogo/module/v2x/voice/V2XVoiceConstants.java | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XFatigueDrivingVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XFatigueDrivingVH.java index 594c294723..ff428181a6 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XFatigueDrivingVH.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XFatigueDrivingVH.java @@ -61,6 +61,7 @@ public class V2XFatigueDrivingVH extends V2XBaseViewHolder { mNaviCb) .registerUnWakeVoice(V2XVoiceConstants.COMMAND_V2X_TO_NAVI_UN_WAKEUP, mNaviCb); + } @Override diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/voice/V2XVoiceConstants.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/voice/V2XVoiceConstants.java index 42e1448fd5..ee433112c1 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/voice/V2XVoiceConstants.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/voice/V2XVoiceConstants.java @@ -131,7 +131,7 @@ public class V2XVoiceConstants { * 导航到POI信息点 */ public static final String COMMAND_V2X_TO_NAVI_UN_WAKEUP = "COMMAND_V2X_TO_NAVI_UN_WAKEUP"; - public static final String[] COMMAND_V2X_TO_NAVI_UN_WAKEUP_WORDS = {"导航前往"}; + public static final String[] COMMAND_V2X_TO_NAVI_UN_WAKEUP_WORDS = {"导航前往", "开始导航", "开启导航", "好的", "开始", "导航", "确定", "确认", "好的"}; /** * 应用内免唤醒 * 调起分享流程 @@ -265,7 +265,7 @@ public class V2XVoiceConstants { public static final String[] COMMAND_ZHIDAO_V2X_FEEDBACK_FENG_LU_YES_UN_WAKEUP_WORDS = {"封路了", "封了", "封路", "有封路", "确定"}; public static final String COMMAND_ZHIDAO_V2X_FEEDBACK_FENG_LU_NO_UN_WAKEUP = "COMMAND_ZHIDAO_V2X_FEEDBACK_FENG_LU_NO_UN_WAKEUP"; - public static final String[] COMMAND_ZHIDAO_V2X_FEEDBACK_FENG_LU_NO_UN_WAKEUP_WORDS = {"不封路","没注意", "没看到", "没有", "没封路","无封路", "取消", "关闭"}; + public static final String[] COMMAND_ZHIDAO_V2X_FEEDBACK_FENG_LU_NO_UN_WAKEUP_WORDS = {"不封路", "没注意", "没看到", "没有", "没封路", "无封路", "取消", "关闭"}; // 事故 @@ -281,7 +281,7 @@ public class V2XVoiceConstants { public static final String[] COMMAND_ZHIDAO_V2X_FEEDBACK_SHI_GONG_YES_UN_WAKEUP_WORDS = {"有", "在施工", "有施工", "确定"}; public static final String COMMAND_ZHIDAO_V2X_FEEDBACK_SHI_GONG_NO_UN_WAKEUP = "COMMAND_ZHIDAO_V2X_FEEDBACK_SHI_GONG_NO_UN_WAKEUP"; - public static final String[] COMMAND_ZHIDAO_V2X_FEEDBACK_SHI_GONG_NO_UN_WAKEUP_WORDS = {"没注意", "没看到", "没有施工","无施工", "很正常", "取消", "关闭"}; + public static final String[] COMMAND_ZHIDAO_V2X_FEEDBACK_SHI_GONG_NO_UN_WAKEUP_WORDS = {"没注意", "没看到", "没有施工", "无施工", "很正常", "取消", "关闭"}; //免唤醒词 public static final String V2X_CONFIRM_ACTION = "V2X_CONFIRM_ACTION"; From 763eef1327e7403481c22d1319b6f574ed2ae3e0 Mon Sep 17 00:00:00 2001 From: liujing Date: Wed, 13 Jan 2021 20:32:35 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=9B=AE=E7=9A=84=E5=9C=B0=E5=81=9C?= =?UTF-8?q?=E8=BD=A6=E5=9C=BA=E6=8E=A8=E8=8D=90,=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E5=94=A4=E9=86=92=E8=AF=8D=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/module/v2x/adapter/holder/V2XBaseViewHolder.java | 4 ++++ .../module/v2x/adapter/holder/V2XFatigueDrivingVH.java | 8 ++++++++ .../java/com/mogo/module/v2x/voice/V2XVoiceConstants.java | 7 +++++++ 3 files changed, 19 insertions(+) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XBaseViewHolder.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XBaseViewHolder.java index 0a9f9d22ab..7710a10d3b 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XBaseViewHolder.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XBaseViewHolder.java @@ -213,6 +213,10 @@ public abstract class V2XBaseViewHolder delayedCloseWindow(); } + public void triggerCancel(){ + delayedCloseWindow(); + } + /** * 显示自定义 Toast diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XFatigueDrivingVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XFatigueDrivingVH.java index ff428181a6..dcda2b1e84 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XFatigueDrivingVH.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XFatigueDrivingVH.java @@ -14,6 +14,7 @@ import com.mogo.module.common.entity.V2XEventShowEntity; import com.mogo.module.common.entity.V2XPushMessageEntity; import com.mogo.module.service.Utils; import com.mogo.module.v2x.R; +import com.mogo.module.v2x.V2XServiceManager; import com.mogo.module.v2x.scenario.view.IV2XWindow; import com.mogo.module.v2x.utils.LocationUtils; import com.mogo.module.v2x.utils.SpanUtils; @@ -38,6 +39,7 @@ public class V2XFatigueDrivingVH extends V2XBaseViewHolder { // 语音控制导航 private V2XVoiceCallbackListener mNaviCb = (command, intent) -> triggerStartNavi(mNoveltyInfo); + private V2XVoiceCallbackListener mNaviCancel = (command, intent) -> triggerCancel(); public V2XFatigueDrivingVH(ViewGroup viewGroup, IV2XWindow v2XWindow) { super(LayoutInflater.from(viewGroup.getContext()) @@ -62,6 +64,9 @@ public class V2XFatigueDrivingVH extends V2XBaseViewHolder { .registerUnWakeVoice(V2XVoiceConstants.COMMAND_V2X_TO_NAVI_UN_WAKEUP, mNaviCb); + V2XVoiceManager.INSTANCE + .registerUnWakeVoice(V2XVoiceConstants.COMMAND_V2X_CANCEL_NAVI_UN_WAKEUP,mNaviCancel); + } @Override @@ -71,6 +76,9 @@ public class V2XFatigueDrivingVH extends V2XBaseViewHolder { V2XVoiceManager.INSTANCE .unRegisterWakeCmd(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_NAVI) .unRegisterUnWakeVoice(V2XVoiceConstants.COMMAND_V2X_TO_NAVI_UN_WAKEUP); + V2XVoiceManager.INSTANCE + .unRegisterWakeCmd(V2XVoiceConstants.COMMAND_V2X_CANCEL_NAVI_UN_WAKEUP) + .unRegisterUnWakeVoice(V2XVoiceConstants.COMMAND_V2X_CANCEL_NAVI_UN_WAKEUP); } }); } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/voice/V2XVoiceConstants.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/voice/V2XVoiceConstants.java index ee433112c1..9780924e10 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/voice/V2XVoiceConstants.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/voice/V2XVoiceConstants.java @@ -132,6 +132,12 @@ public class V2XVoiceConstants { */ public static final String COMMAND_V2X_TO_NAVI_UN_WAKEUP = "COMMAND_V2X_TO_NAVI_UN_WAKEUP"; public static final String[] COMMAND_V2X_TO_NAVI_UN_WAKEUP_WORDS = {"导航前往", "开始导航", "开启导航", "好的", "开始", "导航", "确定", "确认", "好的"}; + /** + * 应用内免唤醒 + * 取消导航 + */ + public static final String COMMAND_V2X_CANCEL_NAVI_UN_WAKEUP = "COMMAND_V2X_CANCEL_NAVI_UN_WAKEUP"; + public static final String[] COMMAND_V2X_CANCEL_NAVI_UN_WAKEUP_WORDS = {"取消","关闭","不要","不导航"}; /** * 应用内免唤醒 * 调起分享流程 @@ -295,6 +301,7 @@ public class V2XVoiceConstants { // 免唤醒 默认 sVoiceCmds.put(COMMAND_V2X_TO_CHAT_MORE_UN_WAKEUP, COMMAND_V2X_TO_CHAT_MORE_UN_WAKEUP_WORDS); sVoiceCmds.put(COMMAND_V2X_TO_NAVI_UN_WAKEUP, COMMAND_V2X_TO_NAVI_UN_WAKEUP_WORDS); + sVoiceCmds.put(COMMAND_V2X_CANCEL_NAVI_UN_WAKEUP, COMMAND_V2X_CANCEL_NAVI_UN_WAKEUP_WORDS); sVoiceCmds.put(COMMAND_V2X_TO_CONFIRM_UN_WAKEUP, COMMAND_V2X_TO_CONFIRM_UN_WAKEUP_WORDS); sVoiceCmds.put(COMMAND_V2X_TO_CANCEL_UN_WAKEUP, COMMAND_V2X_TO_CANCEL_UN_WAKEUP_WORDS); From 87b4ccfc6b806d2f98db7405a021923be68101a5 Mon Sep 17 00:00:00 2001 From: liujing Date: Wed, 13 Jan 2021 21:01:24 +0800 Subject: [PATCH 3/3] no message --- .../main/java/com/mogo/module/v2x/voice/V2XVoiceConstants.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/voice/V2XVoiceConstants.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/voice/V2XVoiceConstants.java index 9780924e10..b42cec802a 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/voice/V2XVoiceConstants.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/voice/V2XVoiceConstants.java @@ -131,7 +131,7 @@ public class V2XVoiceConstants { * 导航到POI信息点 */ public static final String COMMAND_V2X_TO_NAVI_UN_WAKEUP = "COMMAND_V2X_TO_NAVI_UN_WAKEUP"; - public static final String[] COMMAND_V2X_TO_NAVI_UN_WAKEUP_WORDS = {"导航前往", "开始导航", "开启导航", "好的", "开始", "导航", "确定", "确认", "好的"}; + public static final String[] COMMAND_V2X_TO_NAVI_UN_WAKEUP_WORDS = {"导航前往", "开始导航", "开启导航", "好", "开始", "导航", "确定", "确认", "好的"}; /** * 应用内免唤醒 * 取消导航