From 8377c26cb2734749d615d155b7fcc8740dfe6d62 Mon Sep 17 00:00:00 2001 From: liujing Date: Mon, 23 Nov 2020 20:35:53 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=AF=AD=E9=9F=B3=E6=89=93=E5=BC=80?= =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E9=9D=A2=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../v2x/fragment/V2XEventPanelFragment.kt | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt index 6898259774..b2c539f83a 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt @@ -257,23 +257,11 @@ class V2XEventPanelFragment : MvpFragment mV2XScenarioHistoryFragment.ttsForVoiceCheckout() - 1 -> mV2XSurroundingFragment.ttsForVoiceCheckout() - else -> mV2XShareEventsFragment.ttsForVoiceCheckout() - } - } catch (e: java.lang.Exception) { - - } - - } else { - showPanel() - selectWithItem(item) - } + showPanel() + selectWithItem(item) } + private fun initDetail() { mDetailRecyclerView!!.addItemDecoration(SpacesItemDecoration(resources.getDimension(R.dimen.share_item_padding).toInt())) mSurroundingDetailAdapter = V2XSurroundingDetailAdapter(activity, markerExploreWays) From f7efe8c0f94af3680796e4c4f457b7e6954c3723 Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Tue, 24 Nov 2020 09:48:08 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8D=A1=E7=89=87?= =?UTF-8?q?=E7=AD=96=E7=95=A5=E6=92=AD=E6=8A=A5=E5=9F=8B=E7=82=B9=E3=80=81?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=B0=8F=E6=99=BA=E5=BD=A2=E8=B1=A1=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/module/apps/AppNavigatorFragment.java | 6 +++--- .../service/launchercard/LauncherCardRefreshType.java | 2 +- .../service/launchercard/LauncherCardRefresher.java | 8 ++++++++ 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppNavigatorFragment.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppNavigatorFragment.java index dea7792240..70f9dc5dd4 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppNavigatorFragment.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppNavigatorFragment.java @@ -75,9 +75,9 @@ public class AppNavigatorFragment extends MvpFragment< AppNavigatorView, AppNavi mAnim = new AnimWrapper( mAIAssist ); boolean naviStatus = AppServiceHandler.getApis().getMapServiceApi().getNavi( getContext() ).isNaviing(); - if ( naviStatus ) { - setCurrentXiaoZhiEmoji( AnimRes.EmojiType.Navigation ); - } +// if ( naviStatus ) { +// setCurrentXiaoZhiEmoji( AnimRes.EmojiType.Navigation ); +// } mAIAssist.setOnClickListener( new OnAiAssistClickListener() ); mAIAssistContainer.setOnClickListener( view -> { diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefreshType.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefreshType.java index 27d5712049..40174d9ab3 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefreshType.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefreshType.java @@ -6,7 +6,7 @@ public enum LauncherCardRefreshType { Weather( "News", "weather", "天气" ), News( "NearRoads", "news", "新闻" ), NearRoads( "ExplorerWay", "nearRoads", "近路" ), - // TrafficRestriction( "NearRoads", "trafficRestriction" ), + TrafficRestriction( "NearRoads", "trafficRestriction", "限行" ), ExplorerWay( "OnlineCar", "friendAndPois", "道路事件" ), OnlineCar( "Weather", "friendAndPois", "车友" ); diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefresher.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefresher.java index 8613b384c7..d1a58c38c1 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefresher.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefresher.java @@ -33,6 +33,7 @@ import com.mogo.utils.storage.SharedPrefsMgr; import java.util.ArrayList; import java.util.Arrays; import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -455,6 +456,9 @@ class LauncherCardRefresher { if ( trafficRestriction == null || TextUtils.isEmpty( trafficRestriction.tts ) ) { continue; } + final Map< String, Object > properties = new HashMap<>(); + properties.put( "type", LauncherCardRefreshType.TrafficRestriction.name() ); + MogoApisHandler.getInstance().getApis().getAnalyticsApi().track( "v2x_play", properties ); speakTTS( trafficRestriction.tts, false ); return; } @@ -618,6 +622,10 @@ class LauncherCardRefresher { */ private void writeNextLoadType( LauncherCardRefreshType type ) { SharedPrefsMgr.getInstance( mContext ).putString( KEY_LAST_LOAD_TTS_TYPE, type.getNext() ); + + final Map< String, Object > properties = new HashMap<>(); + properties.put( "type", type.name() ); + MogoApisHandler.getInstance().getApis().getAnalyticsApi().track( "v2x_play", properties ); Logger.d( TAG, "本次播报：%s，下次播报：%s", type.name(), LauncherCardRefreshType.valueOf( type.getNext() ).name() ); SharedPrefsMgr.getInstance( mContext ).putLong( KEY_LAST_LOAD_TTS_DATE, System.currentTimeMillis() ); } From 56bb283d86a3d6a1c3657c69199b43cc62a48449 Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Tue, 24 Nov 2020 10:08:35 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=91=A8=E8=BE=B9?= =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E6=89=93=E5=BC=80=E6=8C=87=E4=BB=A4=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E3=80=81=E5=8E=BB=E9=99=A4=E5=B0=8F=E6=99=BA=E5=BD=A2?= =?UTF-8?q?=E8=B1=A1=E9=80=BB=E8=BE=912?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/apps/AppNavigatorFragment.java | 12 +++---- .../com/mogo/module/main/MainActivity.java | 6 ++-- .../service/unwake/GlobalUnwakeManager.java | 31 ++++++++++++------- 3 files changed, 28 insertions(+), 21 deletions(-) diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppNavigatorFragment.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppNavigatorFragment.java index 70f9dc5dd4..5b70818cc9 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppNavigatorFragment.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppNavigatorFragment.java @@ -109,12 +109,12 @@ public class AppNavigatorFragment extends MvpFragment< AppNavigatorView, AppNavi @Override public void setCurrentXiaoZhiEmoji( AnimRes.EmojiType type ) { - boolean started = mAnim.isStarted(); - mAnim.stop(); - mAnim.setCurrentAnim( type ); - if ( started ) { - mAnim.start(); - } +// boolean started = mAnim.isStarted(); +// mAnim.stop(); +// mAnim.setCurrentAnim( type ); +// if ( started ) { +// mAnim.start(); +// } } @Override diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java index 95c4d02378..cbfca98eda 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java @@ -293,6 +293,9 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme mMogoStatusManager.setMainPageResumeStatus( TAG, false ); mMogoStatusManager.setMainPageLaunchedStatus( TAG, false ); mServiceApis.getAuthManagerApi().dismiss(); + if ( shouldCloseADASPanelWhenPause() ) { + mServiceApis.getAdasControllerApi().closeADAS(); + } if ( mServiceApis.getLauncherApi() != null ) { mServiceApis.getLauncherApi().setFloatButtonVisible( true ); } @@ -309,9 +312,6 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme protected void onStop() { super.onStop(); mMogoStatusManager.setMainPageIsBackgroundStatus( TAG, true ); - if ( shouldCloseADASPanelWhenPause() ) { - mServiceApis.getAdasControllerApi().closeADAS(); - } } @Override diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/unwake/GlobalUnwakeManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/unwake/GlobalUnwakeManager.java index 00c3f832c4..691fbe525f 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/unwake/GlobalUnwakeManager.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/unwake/GlobalUnwakeManager.java @@ -75,30 +75,37 @@ public class GlobalUnwakeManager implements IProvider, IMogoIntentListener, IMog break; case VOICE_QUERY_HISTORY_INDEX: Log.d("语音指令","VOICE_QUERY_HISTORY_INDEX"); - Intent startForHis = new Intent( Intent.ACTION_VIEW ); - startForHis.addFlags( Intent.FLAG_ACTIVITY_NEW_TASK ); - startForHis.setData( Uri.parse( "mogo://launcher/main/switch2?type=showHistoryPanel" ) ); - context.startActivity( startForHis ); + showPanelByStatus("showHistoryPanel", 0); break; case VOICE_QUERY_SURROUNDING_INDEX: Log.d("语音指令","VOICE_QUERY_SURROUNDING_INDEX"); - Intent startForSurrounding = new Intent( Intent.ACTION_VIEW ); - startForSurrounding.addFlags( Intent.FLAG_ACTIVITY_NEW_TASK ); - startForSurrounding.setData( Uri.parse( "mogo://launcher/main/switch2?type=showSurroundingPanel" ) ); - context.startActivity( startForSurrounding ); + showPanelByStatus("showSurroundingPanel", 1); break; case VOICE_QUERY_HEART_INDEX: Log.d("语音指令","VOICE_QUERY_HEART_INDEX"); - Intent start = new Intent( Intent.ACTION_VIEW ); - start.addFlags( Intent.FLAG_ACTIVITY_NEW_TASK ); - start.setData( Uri.parse( "mogo://launcher/main/switch2?type=showSharePanel" ) ); - context.startActivity( start ); + showPanelByStatus("showSharePanel", 2); break; default: break; } } + /** + * 根据主页状态调用不同打开方式 + * @param target 面板类型 + * @param type 面板位置索引 + */ + private void showPanelByStatus(String target, int type){ + if ( MogoApisHandler.getInstance().getApis().getStatusManagerApi().isMainPageOnResume() ) { + MogoApisHandler.getInstance().getApis().getEventPanelManager().showPanelWithSelectedItem(type); + } else { + Intent start = new Intent( Intent.ACTION_VIEW ); + start.addFlags( Intent.FLAG_ACTIVITY_NEW_TASK ); + start.setData( Uri.parse( "mogo://launcher/main/switch2?type="+target ) ); + context.startActivity( start ); + } + } + @Override public void onCmdSelected(String cmd) { Logger.d(TAG, "收到免唤醒词指令: " + cmd); From 54a04f2bae96a344f141631f3fb32c798d368dba Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Tue, 24 Nov 2020 10:22:47 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20MAIN=5FPAGE=5FCREATED?= =?UTF-8?q?=20=E7=8A=B6=E6=80=81=E5=80=BC=E5=8F=8A=E5=85=B6=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/mogo/module/main/MainActivity.java | 2 -- .../src/main/java/com/mogo/module/service/MogoServices.java | 4 ++++ .../v2x/scenario/scene/animation/V2XAnimationScenario.java | 2 +- .../v2x/scenario/scene/fatigue/V2XFatigueDrivingScenario.java | 2 +- .../v2x/scenario/scene/livecar/V2XPushLiveCarScenario.java | 2 +- .../v2x/scenario/scene/park/V2XIllegalParkScenario.java | 4 ++-- .../module/v2x/scenario/scene/push/V2XPushEventScenario.java | 2 +- .../module/v2x/scenario/scene/road/V2XRoadEventScenario.java | 4 ++-- .../module/v2x/scenario/scene/seek/V2XSeekHelpScenario.java | 2 +- .../module/v2x/scenario/scene/ugc/V2XEventUgcScenario.java | 2 +- 10 files changed, 14 insertions(+), 12 deletions(-) diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java index cbfca98eda..713108df6c 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java @@ -277,7 +277,6 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme protected void onResume() { super.onResume(); mMogoStatusManager.setMainPageResumeStatus( TAG, true ); - mMogoStatusManager.setMainPageLaunchedStatus( TAG, true ); mMogoStatusManager.setMainPageIsBackgroundStatus( TAG, false ); if ( mCoverUpLayout.getVisibility() != View.VISIBLE ) { mServiceApis.getAdasControllerApi().showADAS(); @@ -291,7 +290,6 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme protected void onPause() { super.onPause(); mMogoStatusManager.setMainPageResumeStatus( TAG, false ); - mMogoStatusManager.setMainPageLaunchedStatus( TAG, false ); mServiceApis.getAuthManagerApi().dismiss(); if ( shouldCloseADASPanelWhenPause() ) { mServiceApis.getAdasControllerApi().closeADAS(); diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java index a41cde3874..55c95def40 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java @@ -755,6 +755,10 @@ public class MogoServices implements IMogoMapListener, return; } + if (!mStatusManager.isMainPageOnResume()) { + return; + } + if (mStatusManager.isV2XShow()) { return; } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/animation/V2XAnimationScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/animation/V2XAnimationScenario.java index 0318dd5296..c307a293ce 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/animation/V2XAnimationScenario.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/animation/V2XAnimationScenario.java @@ -41,7 +41,7 @@ public class V2XAnimationScenario extends AbsV2XScenario { @Override public void init(@Nullable V2XMessageEntity v2XMessageEntity) { if (!isSameScenario(v2XMessageEntity) - && V2XServiceManager.getMoGoStatusManager().isMainPageLaunched()) { + && V2XServiceManager.getMoGoStatusManager().isMainPageOnResume()) { boolean isV2XAnimationShow = V2XServiceManager.getMoGoV2XStatusManager().isV2XAnimationShow(); if (isV2XAnimationShow) { close(); diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/fatigue/V2XFatigueDrivingScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/fatigue/V2XFatigueDrivingScenario.java index 9a3ad242f3..f8154af9af 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/fatigue/V2XFatigueDrivingScenario.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/fatigue/V2XFatigueDrivingScenario.java @@ -59,7 +59,7 @@ public class V2XFatigueDrivingScenario extends AbsV2XScenario @Override public void init(@Nullable V2XMessageEntity v2XMessageEntity) { if (!isSameScenario(v2XMessageEntity) - && V2XServiceManager.getMoGoStatusManager().isMainPageLaunched()) { + && V2XServiceManager.getMoGoStatusManager().isMainPageOnResume()) { boolean isWindowShow = V2XServiceManager.getMoGoV2XStatusManager().isLeftLiveVideoShow(); if (isWindowShow) { close(); diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/park/V2XIllegalParkScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/park/V2XIllegalParkScenario.java index 2132f366c0..13417215ee 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/park/V2XIllegalParkScenario.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/park/V2XIllegalParkScenario.java @@ -51,7 +51,7 @@ public class V2XIllegalParkScenario extends AbsV2XScenario i Logger.w(MODULE_NAME, "处理推送场景：" + GsonUtil.jsonFromObject(v2XMessageEntity)); if (!isSameScenario(v2XMessageEntity) - && V2XServiceManager.getMoGoStatusManager().isMainPageLaunched()) { + && V2XServiceManager.getMoGoStatusManager().isMainPageOnResume()) { setV2XMessageEntity(v2XMessageEntity); show(); } else { diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventScenario.java index eb1620f712..cddb478e41 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventScenario.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventScenario.java @@ -96,7 +96,7 @@ public class V2XRoadEventScenario extends AbsV2XScenario imp saveLocalStory(V2XMessageEntity.V2XTypeEnum.ALERT_ROAD_WARNING, getV2XMessageEntity().getContent().getNoveltyInfo()); - if (V2XServiceManager.getMoGoStatusManager().isMainPageLaunched()) { + if (V2XServiceManager.getMoGoStatusManager().isMainPageOnResume()) { showWindow(); } @@ -197,7 +197,7 @@ public class V2XRoadEventScenario extends AbsV2XScenario imp @Override public void onViewAdded(View view) { Logger.d(MODULE_NAME, "展示 Window 动画结束"); - if (V2XServiceManager.getMoGoStatusManager().isMainPageLaunched()) { + if (V2XServiceManager.getMoGoStatusManager().isMainPageOnResume()) { if (getV2XMessageEntity() != null && getV2XMessageEntity().isNeedAddLine() == true) { drawPOI(); } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/seek/V2XSeekHelpScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/seek/V2XSeekHelpScenario.java index 10da5513fe..dfbca41438 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/seek/V2XSeekHelpScenario.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/seek/V2XSeekHelpScenario.java @@ -81,7 +81,7 @@ public class V2XSeekHelpScenario extends AbsV2XScenario> i saveLocalStory(V2XMessageEntity.V2XTypeEnum.ALERT_SEEK_WARNING, mV2XPushMessageEntity); - if (V2XServiceManager.getMoGoStatusManager().isMainPageLaunched()) { + if (V2XServiceManager.getMoGoStatusManager().isMainPageOnResume()) { if (getV2XMessageEntity() != null && !V2XServiceManager.getMoGoV2XStatusManager().isOtherSeekHelpWindowShow()) { show(); diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/ugc/V2XEventUgcScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/ugc/V2XEventUgcScenario.java index 96bd61f965..4e9ef2e810 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/ugc/V2XEventUgcScenario.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/ugc/V2XEventUgcScenario.java @@ -51,7 +51,7 @@ public class V2XEventUgcScenario extends AbsV2XScenario impl setV2XMessageEntity(v2XMessageEntity); if (v2XMessageEntity != null) { if (v2XMessageEntity.isShowState() - && V2XServiceManager.getMoGoStatusManager().isMainPageLaunched()) { + && V2XServiceManager.getMoGoStatusManager().isMainPageOnResume()) { show(); } } From 62e5660f4eb57673f0e92387726f6f96a0e60cf6 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 24 Nov 2020 10:37:12 +0800 Subject: [PATCH 5/5] =?UTF-8?q?1+16=20=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/mogo/launcher/MogoApplication.java | 6 ++++-- .../src/main/java/com/mogo/module/guide/GuideBizManager.kt | 7 +------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index b355c40d13..7cf051ce91 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -62,7 +62,9 @@ public class MogoApplication extends AbsMogoApplication { crashSystem.setDebug( BuildConfig.DEBUG ); Logger.init( BuildConfig.DEBUG ? LogLevel.VERBOSE : LogLevel.VERBOSE ); - MogoModulePaths.addModule( new MogoModule( PATH_GUIDE_FRAGMENT, PATH_GUIDE_MODULE_NAME ) ); + if( DebugConfig.isMapBased() ){ + MogoModulePaths.addModule( new MogoModule( PATH_GUIDE_FRAGMENT, PATH_GUIDE_MODULE_NAME ) ); + } MogoModulePaths.addModule( new MogoModule( MogoServicePaths.PATH_AGREEMENT, AuthorizeConstant.PATH_AGREEMENT_MODULE_NAME ) ); if ( DebugConfig.isLauncher() ) { @@ -72,7 +74,7 @@ public class MogoApplication extends AbsMogoApplication { MogoModulePaths.addModule( new MogoModule( ServiceConst.PATH_TTS_CONFIG, ServiceConst.PATH_TTS_CONFIG ) ); MogoModulePaths.addBaseModule( new MogoModule( MogoServicePaths.PATH_WIDGETS, MogoServicePaths.PATH_WIDGETS ) ); - if ( DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_BYD ) { + if ( DebugConfig.isMapBased() ) { MogoModulePaths.addModule( new MogoModule( CallChatConstant.PROVIDER, CallChatConstant.MODULE_NAME ) ); } diff --git a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/GuideBizManager.kt b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/GuideBizManager.kt index e92db55b72..6e6f4ac846 100644 --- a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/GuideBizManager.kt +++ b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/GuideBizManager.kt @@ -4,9 +4,6 @@ import com.alibaba.android.arouter.launcher.ARouter import com.mogo.module.authorize.authprovider.invoke.AuthorizeConstant import com.mogo.module.authorize.authprovider.invoke.AuthorizeInvokerConstant.Companion.AUTHORIZE_TYPE_LAUNCHER_MAIN import com.mogo.module.authorize.authprovider.module.IMogoAuthorizeModuleManager -import com.mogo.module.common.utils.CarSeries -import com.mogo.module.common.utils.CarSeries.CAR_SERIES_C80X -import com.mogo.module.common.utils.CarSeries.CAR_SERIES_F80X import com.mogo.module.guide.GuideConstant.Companion.PATH_GUIDE_MODULE_NAME import com.mogo.module.guide.fragment.GuideFragment import com.mogo.module.guide.util.SharedPreferenceUtil.hasGuide @@ -50,9 +47,7 @@ object GuideBizManager { Logger.d("GuideBizManager", "removeGuideFragmentToStack") setGuideFinish() setGuideRecord() - serviceApi?.let { - it.fragmentManagerApi.pop() - } + serviceApi?.fragmentManagerApi?.pop() serviceApi?.adasControllerApi?.showADAS() }