From 21e11b4d41a4b1963001c04086107987c40ef479 Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Wed, 6 Jan 2021 19:48:55 +0800 Subject: [PATCH 1/2] =?UTF-8?q?bug=20fix:=20vip=E9=80=9A=E8=A1=8C=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E9=BB=91=E5=A4=9C=E7=99=BD=E5=A4=A9=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/gradle.xml | 1 + .../src/main/java/com/mogo/module/v2x/V2XObuManager.java | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 5974cf305a..9d8d20d50d 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -84,6 +84,7 @@ diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XObuManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XObuManager.java index 14074c55c8..901c5f05fc 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XObuManager.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XObuManager.java @@ -13,6 +13,7 @@ import androidx.localbroadcastmanager.content.LocalBroadcastManager; import com.mogo.commons.debug.DebugConfig; import com.mogo.map.location.MogoLocation; +import com.mogo.module.common.MogoApisHandler; import com.mogo.module.common.entity.V2XMessageEntity; import com.mogo.module.common.entity.V2XObuEventEntity; import com.mogo.module.common.entity.V2XPushMessageEntity; @@ -178,6 +179,10 @@ public class V2XObuManager implements IObuCallback, Handler.Callback { @Override public void onEventInfoCallback(MogoObuEventInfo info) { Logger.d("V2X_OBU_EVENT", "carEventInfo==" + info); + if (MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode()) { + Logger.d("V2X_OBU_EVENT","vr模式下不展示obu事件"); + return; + } Long last = intervalMap.get(info.getTypeCode()); if (last == null) { last = 0L; From e7c6c2d016929d49fea60bec5c77892279303b79 Mon Sep 17 00:00:00 2001 From: liujing Date: Thu, 7 Jan 2021 16:09:33 +0800 Subject: [PATCH 2/2] =?UTF-8?q?VR=E6=A8=A1=E5=BC=8F=E4=B8=8B=E5=94=A4?= =?UTF-8?q?=E9=86=92=E8=AF=8D:=E5=8F=91=E8=B5=B7=E6=95=85=E9=9A=9C?= =?UTF-8?q?=E6=B1=82=E5=8A=A9=20=E4=B8=8D=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/module/share/ShareControl.java | 18 +++++++++++------- .../module/share/constant/ShareConstants.java | 2 +- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java index 25ff93e4f4..e006a9cc53 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java @@ -16,6 +16,7 @@ import com.mogo.module.authorize.authprovider.invoke.AuthorizeConstant; import com.mogo.module.authorize.authprovider.invoke.AuthorizeInvokerConstant; import com.mogo.module.authorize.authprovider.module.IMogoAcquireAuthorizeListener; import com.mogo.module.authorize.authprovider.module.IMogoAuthorizeModuleManager; +import com.mogo.module.common.MogoApisHandler; import com.mogo.module.common.dialog.BaseFloatDialog; import com.mogo.module.common.utils.CloudPoiManager; import com.mogo.module.share.bean.FixableButton; @@ -192,13 +193,13 @@ public class ShareControl implements IMogoShareManager, Handler.Callback { // if (!DebugConfig.isLauncher()) { ServiceApisManager.serviceApis.getStatusManagerApi().registerStatusChangedListener(TAG, StatusDescriptor.MAIN_PAGE_RESUME, new IMogoStatusChangedListener() { - @Override - public void onStatusChanged(StatusDescriptor descriptor, boolean isTrue) { - if (!isTrue) { - dismissShareDialog(); - } - } - }); + @Override + public void onStatusChanged(StatusDescriptor descriptor, boolean isTrue) { + if (!isTrue) { + dismissShareDialog(); + } + } + }); // } // if (!DebugConfig.isLauncher()) { @@ -299,6 +300,9 @@ public class ShareControl implements IMogoShareManager, Handler.Callback { } break; case VOICE_CMD_PUB_TROUBLE_HELP: + if (MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode()) { + return; + } if (needAuth()) { goAuth(STEP_AFTER_AUTH_TYPE_SEEK_HELP, TYPE_DENSE_FOG, false); } else { diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/constant/ShareConstants.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/constant/ShareConstants.java index 9f00b1a153..e9abfd429b 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/constant/ShareConstants.java +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/constant/ShareConstants.java @@ -23,7 +23,7 @@ public class ShareConstants { // 此处只记录了事故、实时路况、道路积水、道路结冰、浓雾,至于拥堵、交通检查和封路是在extention模块里面管理 public static final String VOICE_CMD_PUB_TROUBLE_HELP = "com.zhidao.auxiliaryDriving" + - ".pubTroubleHelp"; + ".pubTroubleHelp";/*唤醒词 发起故障求助*/ public static final String VOICE_CMD_GO_TO_SHARE = "com.zhidao.share"; public static final String TAG = "/tanlu/ui";