From 45e6382a796984f1ead4b6d49145f8ca34050b56 Mon Sep 17 00:00:00 2001 From: liujing Date: Mon, 7 Jun 2021 19:42:24 +0800 Subject: [PATCH] =?UTF-8?q?2D=E5=BC=B9=E6=A1=86=E9=A2=84=E8=AD=A6-?= =?UTF-8?q?=E8=BF=9B=E5=85=A53D-=E5=B1=95=E7=A4=BA2DUI=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9:=E8=BF=9B=E5=85=A53D=E6=A8=A1=E5=BC=8Fremove?= =?UTF-8?q?=E6=8E=892D=E6=A8=A1=E5=BC=8F=E4=B8=8B=E5=BC=B9=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/mogo-module-extensions/build.gradle | 3 +++ .../extensions/entrance/EntranceFragment.java | 15 +++------------ .../v2x/scenario/impl/AbsV2XScenario.java | 11 +++++------ .../module/v2x/scenario/scene/V2XBasWindow.java | 17 ++++++++++++++++- .../service/v2x/IV2XWindowManagerListener.java | 2 +- .../com/mogo/service/impl/v2x/V2XManager.java | 2 +- 6 files changed, 29 insertions(+), 21 deletions(-) diff --git a/modules/mogo-module-extensions/build.gradle b/modules/mogo-module-extensions/build.gradle index e59c5e48d5..8ee49f5936 100644 --- a/modules/mogo-module-extensions/build.gradle +++ b/modules/mogo-module-extensions/build.gradle @@ -59,6 +59,8 @@ dependencies { api rootProject.ext.dependencies.mogoserviceapi implementation rootProject.ext.dependencies.modulecommon implementation rootProject.ext.dependencies.moduleshare + implementation rootProject.ext.dependencies.moduleservice + // implementation rootProject.ext.dependencies.moduleventpanel // implementation rootProject.ext.dependencies.mogomoduleauth } else { @@ -69,6 +71,7 @@ dependencies { api project(':services:mogo-service-api') implementation project(':modules:mogo-module-common') implementation project(':modules:mogo-module-share') + implementation project(':modules:mogo-module-service') // implementation project(':modules:mogo-module-event-panel') // implementation project(':modules:mogo-module-authorize') } diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java index c7663c4a29..1f19e955e8 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java @@ -100,6 +100,7 @@ import java.util.Random; import static com.mogo.module.common.utils.SPConst.getSPGuideRecord; import static com.mogo.module.common.utils.SPConst.getSpGuide; import static com.mogo.module.extensions.ExtensionsModuleConst.TYPE_ENTRANCE; +import static com.mogo.module.service.receiver.MogoReceiver.ACTION_V2X_REMOVE_TIP_WINDOW; import static com.mogo.module.share.constant.ShareConstants.KEY_CLICK_SHARE_BUTTON; import static com.mogo.module.share.constant.ShareConstants.KEY_CLICK_SHARE_TIME; import static com.mogo.module.share.constant.ShareConstants.KEY_SERVER_SHOW_DAY_COUNT; @@ -110,6 +111,7 @@ import static com.mogo.module.share.constant.ShareConstants.KEY_SHARE_OUTER_GUID import static com.mogo.module.share.constant.ShareConstants.ONE_DAY_TIME; import static com.mogo.module.share.constant.ShareConstants.SEVEN_DAY_TIME; import static com.mogo.module.share.constant.ShareConstants.VOICE_ALERT_COUNT; + /** * @author congtaowang * @since 2020-01-07 @@ -285,7 +287,6 @@ public class EntranceFragment extends MvpFragment implements IV2XScenario, IV2XWindowManagerListener { +public abstract class AbsV2XScenario implements IV2XScenario { protected String TAG = "AbsV2XScenario"; private IV2XWindow mV2XWindow; private IV2XButton mV2XButton; @@ -56,7 +59,7 @@ public abstract class AbsV2XScenario implements IV2XScenario, IV2XWindowManag @Override public void speakTTSVoice(@Nullable String msg, IMogoVoiceCmdCallBack callBack) { if (!TextUtils.isEmpty(msg)) { - Logger.d(V2XConst.MODULE_NAME, "调用TTS播放语音：" + msg); + Logger.d(TAG, "调用TTS播放语音：" + msg); AIAssist.getInstance(V2XUtils.getApp()).speakTTSVoice(msg, VoicePreemptType.PREEMPT_TYPE_IMMEADIATELY, callBack); } } @@ -101,8 +104,4 @@ public abstract class AbsV2XScenario implements IV2XScenario, IV2XWindowManag return mV2XMessageEntity.equals(v2XMessageEntity); } - @Override - public void removeAllTipWindow() { - close(); - } } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/V2XBasWindow.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/V2XBasWindow.java index 97929a0d71..b79a0d9480 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/V2XBasWindow.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/V2XBasWindow.java @@ -2,15 +2,20 @@ package com.mogo.module.v2x.scenario.scene; import android.content.Context; import android.util.AttributeSet; +import android.util.Log; import android.widget.RelativeLayout; +import com.mogo.module.common.MogoApisHandler; +import com.mogo.module.service.receiver.MogoReceiver; +import com.mogo.module.v2x.V2XServiceManager; +import com.mogo.service.v2x.IV2XWindowManagerListener; import com.mogo.utils.logger.Logger; /** * @author donghongyu * @date 12/11/20 10:35 AM */ -public class V2XBasWindow extends RelativeLayout { +public class V2XBasWindow extends RelativeLayout implements IV2XWindowManagerListener { private final String TAG = "V2XBasWindow"; public V2XBasWindow(Context context) { @@ -28,6 +33,7 @@ public class V2XBasWindow extends RelativeLayout { @Override protected void onAttachedToWindow() { super.onAttachedToWindow(); + MogoApisHandler.getInstance().getApis().getV2XListenerManager().registerIntentListener(MogoReceiver.ACTION_V2X_FRONT_WARNING, this); Logger.w(TAG, "onAttachedToWindow……"); } @@ -44,4 +50,13 @@ public class V2XBasWindow extends RelativeLayout { protected void release() { Logger.w(TAG, "release……"); } + + @Override + public void removeTipWindowByListener() { + Log.d(TAG, "removeAllTipWindow"); + V2XServiceManager + .getMogoTopViewManager() + .removeView(this); + + } } diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/v2x/IV2XWindowManagerListener.java b/services/mogo-service-api/src/main/java/com/mogo/service/v2x/IV2XWindowManagerListener.java index b6b0abecd7..5c9e520da9 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/v2x/IV2XWindowManagerListener.java +++ b/services/mogo-service-api/src/main/java/com/mogo/service/v2x/IV2XWindowManagerListener.java @@ -7,5 +7,5 @@ package com.mogo.service.v2x; */ public interface IV2XWindowManagerListener { //移除v2x的所有道路事件及预警弹框 - void removeAllTipWindow(); + void removeTipWindowByListener(); } diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/v2x/V2XManager.java b/services/mogo-service/src/main/java/com/mogo/service/impl/v2x/V2XManager.java index 1e722f0f30..fd8c0e2352 100644 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/v2x/V2XManager.java +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/v2x/V2XManager.java @@ -61,7 +61,7 @@ public class V2XManager implements IV2XProvider { if (listeners != null && !listeners.isEmpty()) { for (IV2XWindowManagerListener listener : listeners) { if (listener != null) { - listener.removeAllTipWindow(); + listener.removeTipWindowByListener(); } } }