From a6cd11b06706021df5c9e0896dd8cf853dbd23a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Wed, 11 Nov 2020 11:25:14 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E5=85=B3=E9=97=AD=E4=BA=86=E5=B7=A1?= =?UTF-8?q?=E8=88=AA=E8=AF=AD=E9=9F=B3=E6=92=AD=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/mogo/map/impl/amap/navi/AimlessClient.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/AimlessClient.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/AimlessClient.java index 98716e31ee..2f26f68685 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/AimlessClient.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/AimlessClient.java @@ -57,7 +57,7 @@ public class AimlessClient implements IMogoAimless { mAMapNavi = AMapNavi.getInstance(mContext); mAMapNavi.setEmulatorNaviSpeed(120); mAMapNavi.setUseInnerVoice(true, true); -// mAMapNavi.stopSpeak(); + mAMapNavi.stopSpeak(); mAimlessModeListener = new AimlessModeListenerAdapter() { }; mAMapNavi.addAimlessModeListener(mAimlessModeListener); From 307858f9aabec801727abd521b737080fc9367c0 Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Wed, 11 Nov 2020 16:57:20 +0800 Subject: [PATCH 02/10] =?UTF-8?q?1.=20=E8=A7=A3=E5=86=B3=E9=83=A8=E5=88=86?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E8=80=A6=E5=90=88=E9=97=AE=E9=A2=98=202.=20?= =?UTF-8?q?=E9=87=8D=E6=96=B0=E8=A7=84=E5=88=92=E6=A8=A1=E5=9D=97=E4=BE=9D?= =?UTF-8?q?=E8=B5=96=E5=85=B3=E7=B3=BB=203.=20=E8=A7=A3=E5=86=B3=E4=B8=BB?= =?UTF-8?q?=E9=A1=B5=E5=B7=A6=E4=BE=A7=E9=81=AE=E7=BD=A9=E9=A2=9C=E8=89=B2?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 6 +- app/functions/perform.gradle | 6 + .../com/mogo/commons/AbsMogoApplication.java | 17 +- .../com/mogo/commons/debug/DebugConfig.java | 13 ++ .../main/launcher/MainLauncherActivity.java | 4 +- .../mogo/module/common/MogoModulePaths.java | 5 + .../extensions/ExtensionsModuleConst.java | 8 +- .../entrance/EntrancePresenter.java | 5 +- .../extensions/entrance/EntranceProvider.java | 4 +- .../extensions/utils/ExtensionsConfig.java | 20 -- .../drawable/module_ext_frame_anim_voice.xml | 207 ------------------ modules/mogo-module-main/build.gradle | 6 - .../com/mogo/module/main/MainActivity.java | 1 - .../module/main/cards/MogoModulesManager.java | 5 +- .../module_main_dw_left_frame_bkg_light.xml | 2 +- 15 files changed, 44 insertions(+), 265 deletions(-) delete mode 100644 modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/ExtensionsConfig.java delete mode 100644 modules/mogo-module-extensions/src/main/res/drawable/module_ext_frame_anim_voice.xml diff --git a/app/build.gradle b/app/build.gradle index 19b4d87013..2cfe6a5847 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -339,13 +339,14 @@ dependencies { implementation rootProject.ext.dependencies.modulemedia implementation rootProject.ext.dependencies.moduleservice implementation rootProject.ext.dependencies.modulesplash + implementation rootProject.ext.dependencies.mogoservice implementation rootProject.ext.dependencies.moduleV2x implementation rootProject.ext.dependencies.moduleshare - implementation rootProject.ext.dependencies.tanluupload implementation rootProject.ext.dependencies.mogomonitor implementation rootProject.ext.dependencies.mogomoduleback implementation rootProject.ext.dependencies.guideshow + implementation rootProject.ext.dependencies.moduleextensions } else { implementation project(':foudations:mogo-commons') implementation project(':modules:mogo-module-common') @@ -354,13 +355,14 @@ dependencies { implementation project(':modules:mogo-module-media') implementation project(':modules:mogo-module-service') implementation project(':modules:mogo-module-splash') + implementation project(':modules:mogo-module-service') implementation project(':modules:mogo-module-v2x') implementation project(':modules:mogo-module-share') - implementation project(':libraries:tanlulib') implementation project(':modules:mogo-module-monitor') implementation project(':modules:mogo-module-back') implementation project(':modules:mogo-module-guide') + implementation project(':modules:mogo-module-extensions') } apply from: "./functions/perform.gradle" diff --git a/app/functions/perform.gradle b/app/functions/perform.gradle index a708b71fe9..97017f2a5f 100644 --- a/app/functions/perform.gradle +++ b/app/functions/perform.gradle @@ -4,8 +4,14 @@ project.dependencies { if (Boolean.valueOf(RELEASE)) { launcherImplementation rootProject.ext.dependencies.modulemainlauncher independentImplementation rootProject.ext.dependencies.modulemainindependent + + // 仅launcher需要引入该模块 + launcherImplementation rootProject.ext.dependencies.moduleapps } else { launcherImplementation project(':main-extensions:mogo-module-main-launcher') independentImplementation project(':main-extensions:mogo-module-main-independent') + + // 仅launcher需要引入该模块 + launcherImplementation project(':modules:mogo-module-apps') } } \ No newline at end of file diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java index fa21e41563..257e880764 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java @@ -143,16 +143,13 @@ public class AbsMogoApplication extends Application { NetConfig.instance().setSignaturePrefix( Constants.SIGN_PREFIX ) .setPublicParams( ParamsUtil.getStaticParams() ) .setHostnameVerifier( new AllAllowedHostnameVerifier() ) - .addNetworkInterceptor( new Interceptor() { - @Override - public Response intercept( Chain chain ) throws IOException { - Request original = chain.request(); - Request request = original.newBuilder() - .header( "token", SpStorage.getTicket() ) - .method( original.method(), original.body() ) - .build(); - return chain.proceed( request ); - } + .addNetworkInterceptor( chain -> { + Request original = chain.request(); + Request request = original.newBuilder() + .header( "token", SpStorage.getTicket() ) + .method( original.method(), original.body() ) + .build(); + return chain.proceed( request ); } ) .setLoggable( DebugConfig.isDebug() ); } diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java index 22e8be6829..a65367ae5a 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java @@ -282,4 +282,17 @@ public class DebugConfig { public static boolean isIsSupportLauncherCardRefreshStrategy() { return isSupportLauncherCardRefreshStrategy; } + + /** + * 是否需要刷新个人信息 + */ + private static boolean needRequestUserInfo = false; + + public static void setNeedRequestUserInfo( boolean needRequestUserInfo ) { + DebugConfig.needRequestUserInfo = needRequestUserInfo; + } + + public static boolean isNeedRequestUserInfo() { + return needRequestUserInfo; + } } diff --git a/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java b/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java index 872b5f804f..5241b250a2 100644 --- a/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java +++ b/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java @@ -8,8 +8,8 @@ import android.view.View; import androidx.annotation.Nullable; +import com.mogo.commons.debug.DebugConfig; import com.mogo.map.uicontroller.EnumMapUI; -import com.mogo.module.extensions.utils.ExtensionsConfig; import com.mogo.module.main.MainActivity; import com.mogo.module.main.cards.MogoModulesManager; import com.mogo.service.intent.IMogoIntentListener; @@ -26,7 +26,7 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis @Override protected void onCreate( @Nullable Bundle savedInstanceState ) { super.onCreate( savedInstanceState ); - ExtensionsConfig.setNeedRequestUserInfo( true ); + DebugConfig.setNeedRequestUserInfo( true ); } @Override diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/MogoModulePaths.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/MogoModulePaths.java index bf8dcba003..9faa90e816 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/MogoModulePaths.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/MogoModulePaths.java @@ -31,6 +31,11 @@ public class MogoModulePaths { @Keep public static final String PATH_MODULE_APPS = "/appslist/ui"; + /** + * 快捷操作入口：定位、 + */ + public static final String PATH_ENTRANCE = "/extension/entrance"; + /** * 添加卡片模块 * diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/ExtensionsModuleConst.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/ExtensionsModuleConst.java index 9a563f521d..2ee73f87a3 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/ExtensionsModuleConst.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/ExtensionsModuleConst.java @@ -7,13 +7,7 @@ package com.mogo.module.extensions; * 描述 */ public class ExtensionsModuleConst { - - /** - * 快捷操作入口：定位、 - */ - public static final String PATH_ENTRANCE = "/extension/entrance"; - - + public static final String TYPE = "extension"; public static final String TYPE_ENTRANCE = "entrance"; diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java index 6f1b8824f4..efb20d7e2b 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java @@ -7,6 +7,7 @@ import androidx.annotation.NonNull; import androidx.lifecycle.LifecycleOwner; import com.alibaba.android.arouter.launcher.ARouter; +import com.mogo.commons.debug.DebugConfig; import com.mogo.commons.mvp.Presenter; import com.mogo.commons.network.Utils; import com.mogo.module.common.MogoApisHandler; @@ -18,12 +19,10 @@ import com.mogo.module.extensions.net.UserInfoNetApiServices; import com.mogo.module.extensions.userinfo.UserInfo; import com.mogo.module.extensions.userinfo.UserInfoConstant; import com.mogo.module.extensions.userinfo.UserInfoResponse; -import com.mogo.module.extensions.utils.ExtensionsConfig; import com.mogo.module.extensions.weather.Phenomena; import com.mogo.module.extensions.weather.WeatherCallback; import com.mogo.module.extensions.weather.WeatherInfo; import com.mogo.module.extensions.weather.WeatherModel; -import com.mogo.service.IMogoServiceApis; import com.mogo.service.MogoServicePaths; import com.mogo.service.network.IMogoNetwork; import com.mogo.service.statusmanager.IMogoMsgCenter; @@ -103,7 +102,7 @@ public class EntrancePresenter extends Presenter implements Weathe if (userInfo != null) { mView.renderUserInfo(userInfo); } - if(ExtensionsConfig.needRequestUserInfo()){ + if( DebugConfig.isNeedRequestUserInfo()){ // 相当于每次onResume都会请求一下个人信息，目的是能够相对及时的同步手机端的个人信息修改 requestUserInfo(); } diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceProvider.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceProvider.java index b3bbc3bed7..ef10d199d4 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceProvider.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceProvider.java @@ -12,7 +12,7 @@ import com.mogo.map.listener.IMogoMapListener; import com.mogo.map.location.IMogoLocationListener; import com.mogo.map.marker.IMogoMarkerClickListener; import com.mogo.map.navi.IMogoNaviListener; -import com.mogo.module.extensions.ExtensionsModuleConst; +import com.mogo.module.common.MogoModulePaths; import com.mogo.service.module.IMogoModuleLifecycle; import com.mogo.service.module.IMogoModuleProvider; import com.mogo.service.module.ModuleType; @@ -23,7 +23,7 @@ import com.mogo.service.module.ModuleType; *

* 描述 */ -@Route( path = ExtensionsModuleConst.PATH_ENTRANCE ) +@Route( path = MogoModulePaths.PATH_ENTRANCE ) public class EntranceProvider implements IMogoModuleProvider { EntranceFragment mFragment; diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/ExtensionsConfig.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/ExtensionsConfig.java deleted file mode 100644 index 5a30481123..0000000000 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/ExtensionsConfig.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.mogo.module.extensions.utils; - -/** - * 个性化config - * - * @author tongchenfei - */ -public class ExtensionsConfig { - public static final String NEED_REQUEST_USER_INFO = "NEED_REQUEST_USER_INFO"; - - private static boolean needRequestUserInfo = false; - - public static boolean needRequestUserInfo() { - return needRequestUserInfo; - } - - public static void setNeedRequestUserInfo(boolean needRequestUserInfo) { - ExtensionsConfig.needRequestUserInfo = needRequestUserInfo; - } -} diff --git a/modules/mogo-module-extensions/src/main/res/drawable/module_ext_frame_anim_voice.xml b/modules/mogo-module-extensions/src/main/res/drawable/module_ext_frame_anim_voice.xml deleted file mode 100644 index f4844fcff0..0000000000 --- a/modules/mogo-module-extensions/src/main/res/drawable/module_ext_frame_anim_voice.xml +++ /dev/null @@ -1,207 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/modules/mogo-module-main/build.gradle b/modules/mogo-module-main/build.gradle index cec34c9537..f5ebe77146 100644 --- a/modules/mogo-module-main/build.gradle +++ b/modules/mogo-module-main/build.gradle @@ -48,21 +48,15 @@ dependencies { api rootProject.ext.dependencies.modulecommon api rootProject.ext.dependencies.modulemap api rootProject.ext.dependencies.mogoserviceapi - api rootProject.ext.dependencies.mogoservice api rootProject.ext.dependencies.moduleservice - api rootProject.ext.dependencies.moduleapps - api rootProject.ext.dependencies.moduleextensions compileOnly rootProject.ext.dependencies.skinsupport } else { api project(":foudations:mogo-utils") api project(":foudations:mogo-commons") api project(':modules:mogo-module-common') api project(':modules:mogo-module-map') - api project(':modules:mogo-module-service') api project(':services:mogo-service-api') api project(':services:mogo-service') - api project(':modules:mogo-module-apps') - api project(':modules:mogo-module-extensions') compileOnly project(':skin:mogo-skin-support') } } 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 b4629ddcc8..c251ad3729 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 @@ -223,7 +223,6 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme } protected void loadContainerModules() { -// MogoModulesManager.getInstance().loadExtensionsModule( R.id.module_main_id_header_fragment_container ); MogoModulesManager.getInstance().loadEntrancesModule( R.id.module_main_id_entrance_fragment_container ); MogoModulesManager.getInstance().loadEventPanelModule( R.id.module_main_id_event_panel_fragment_container ); MogoModulesManager.getInstance().loadLeftPanelModule( R.id.module_main_id_left_panel_fragment_container ); diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java index 7d548c7b94..7b24eaced0 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java @@ -6,12 +6,9 @@ import android.content.Context; import androidx.fragment.app.Fragment; import com.alibaba.android.arouter.launcher.ARouter; -import com.alibaba.idst.nls.internal.utils.L; import com.mogo.module.common.MogoModule; import com.mogo.module.common.MogoModulePaths; -import com.mogo.module.extensions.ExtensionsModuleConst; import com.mogo.module.main.MainActivity; -import com.mogo.service.IMogoServiceApis; import com.mogo.service.MogoServicePaths; import com.mogo.service.module.IMogoModuleProvider; import com.mogo.utils.ResourcesHelper; @@ -123,7 +120,7 @@ public class MogoModulesManager implements MogoModulesHandler { @Override public void loadEntrancesModule( int containerId ) { IMogoModuleProvider provider = ( IMogoModuleProvider ) ARouter.getInstance() - .build( ExtensionsModuleConst.PATH_ENTRANCE ) + .build( MogoModulePaths.PATH_ENTRANCE ) .navigation( getContext() ); addFragment( provider, containerId ); } diff --git a/skin/mogo-skin-light/src/main/module-main-res/drawable/module_main_dw_left_frame_bkg_light.xml b/skin/mogo-skin-light/src/main/module-main-res/drawable/module_main_dw_left_frame_bkg_light.xml index 8127025226..2b0d61818b 100644 --- a/skin/mogo-skin-light/src/main/module-main-res/drawable/module_main_dw_left_frame_bkg_light.xml +++ b/skin/mogo-skin-light/src/main/module-main-res/drawable/module_main_dw_left_frame_bkg_light.xml @@ -2,7 +2,7 @@ - + \ No newline at end of file From d6e8e13338494c97275fbfcbfccfc104ebe84b1c Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Thu, 12 Nov 2020 15:22:27 +0800 Subject: [PATCH 03/10] =?UTF-8?q?1.=20=E5=8E=BB=E6=8E=89=E9=83=A8=E5=88=86?= =?UTF-8?q?=E6=97=A5=E5=BF=97=202.=20=E6=B7=BB=E5=8A=A0m2=E4=B8=8D?= =?UTF-8?q?=E4=BE=9D=E8=B5=96=E5=9C=B0=E5=9B=BE=E7=9A=84=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 23 ++++- .../com/mogo/launcher/MogoApplication.java | 2 +- .../com/mogo/commons/debug/DebugConfig.java | 13 +++ .../map/impl/amap/AMapNaviViewWrapper.java | 27 ------ .../mogo/map/impl/amap/AMapViewWrapper.java | 29 ------ .../java/com/mogo/map/MogoMarkerManager.java | 4 - modules/mogo-module-main/build.gradle | 2 - .../com/mogo/module/main/MainActivity.java | 91 +++++++++---------- .../res/layout/module_main_activity_main.xml | 3 +- .../com/mogo/module/service/MogoServices.java | 12 ++- .../service/impl/adas/MogoADASController.java | 1 - 11 files changed, 88 insertions(+), 119 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 2cfe6a5847..fc622ba4c0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -88,7 +88,6 @@ android { buildConfigField 'String', 'SOCKET_APP_ID', '\"com.mogo.launcher\"' // 是否支持目的地导航策略 buildConfigField 'boolean', 'IS_SUPPORT_SCHEDULE_CALCULATE_NOT_HOME_COMPANY_DISTANCE_FOR_PUSH', 'true' - } // launcher app launcher { @@ -118,6 +117,8 @@ android { buildConfigField 'boolean', 'IS_SUPPORTED_SEARCH_DESTINATION_ONLINE_CAR_LIST', 'true' // 是否支持桌面卡片刷新 buildConfigField 'boolean', 'IS_SUPPORT_LAUNCHER_CARD_REFRESH_STRATEGY', 'false' + // 是否基于地图 + buildConfigField 'boolean', 'IS_MAP_BASED', 'true' } // f系列-分体机 f80x { @@ -136,6 +137,8 @@ android { buildConfigField 'boolean', 'IS_SUPPORTED_SEARCH_DESTINATION_ONLINE_CAR_LIST', 'true' // 是否支持桌面卡片刷新 buildConfigField 'boolean', 'IS_SUPPORT_LAUNCHER_CARD_REFRESH_STRATEGY', 'false' + // 是否基于地图 + buildConfigField 'boolean', 'IS_MAP_BASED', 'true' } // e系列，采用Launcher方案 e8xx { @@ -154,6 +157,8 @@ android { buildConfigField 'boolean', 'IS_SUPPORTED_SEARCH_DESTINATION_ONLINE_CAR_LIST', 'true' // 是否支持桌面卡片刷新 buildConfigField 'boolean', 'IS_SUPPORT_LAUNCHER_CARD_REFRESH_STRATEGY', 'false' + // 是否基于地图 + buildConfigField 'boolean', 'IS_MAP_BASED', 'true' } // 同上 em4 { @@ -172,6 +177,8 @@ android { buildConfigField 'boolean', 'IS_SUPPORTED_SEARCH_DESTINATION_ONLINE_CAR_LIST', 'true' // 是否支持桌面卡片刷新 buildConfigField 'boolean', 'IS_SUPPORT_LAUNCHER_CARD_REFRESH_STRATEGY', 'false' + // 是否基于地图 + buildConfigField 'boolean', 'IS_MAP_BASED', 'true' } // e系列-2+32，对标D系列2+32，采用独立app的形式 em3 { @@ -190,6 +197,8 @@ android { buildConfigField 'boolean', 'IS_SUPPORTED_SEARCH_DESTINATION_ONLINE_CAR_LIST', 'true' // 是否支持桌面卡片刷新 buildConfigField 'boolean', 'IS_SUPPORT_LAUNCHER_CARD_REFRESH_STRATEGY', 'true' + // 是否基于地图 + buildConfigField 'boolean', 'IS_MAP_BASED', 'true' } // e系列-1+16，对标D系列1+16，采用独立app形式 em1 { @@ -208,6 +217,8 @@ android { buildConfigField 'boolean', 'IS_SUPPORTED_SEARCH_DESTINATION_ONLINE_CAR_LIST', 'true' // 是否支持桌面卡片刷新 buildConfigField 'boolean', 'IS_SUPPORT_LAUNCHER_CARD_REFRESH_STRATEGY', 'true' + // 是否基于地图 + buildConfigField 'boolean', 'IS_MAP_BASED', 'false' } // d系列 d8xx { @@ -226,6 +237,8 @@ android { buildConfigField 'boolean', 'IS_SUPPORTED_SEARCH_DESTINATION_ONLINE_CAR_LIST', 'true' // 是否支持桌面卡片刷新 buildConfigField 'boolean', 'IS_SUPPORT_LAUNCHER_CARD_REFRESH_STRATEGY', 'true' + // 是否基于地图 + buildConfigField 'boolean', 'IS_MAP_BASED', 'true' } // d系列 2 + 32 d80x { @@ -244,6 +257,8 @@ android { buildConfigField 'boolean', 'IS_SUPPORTED_SEARCH_DESTINATION_ONLINE_CAR_LIST', 'true' // 是否支持桌面卡片刷新 buildConfigField 'boolean', 'IS_SUPPORT_LAUNCHER_CARD_REFRESH_STRATEGY', 'true' + // 是否基于地图 + buildConfigField 'boolean', 'IS_MAP_BASED', 'true' } // d系列 1+16 版本 d82x { @@ -262,6 +277,8 @@ android { buildConfigField 'boolean', 'IS_SUPPORTED_SEARCH_DESTINATION_ONLINE_CAR_LIST', 'true' // 是否支持桌面卡片刷新 buildConfigField 'boolean', 'IS_SUPPORT_LAUNCHER_CARD_REFRESH_STRATEGY', 'true' + // 是否基于地图 + buildConfigField 'boolean', 'IS_MAP_BASED', 'true' } // 比亚迪 bydauto { @@ -280,6 +297,8 @@ android { buildConfigField 'boolean', 'IS_SUPPORTED_SEARCH_DESTINATION_ONLINE_CAR_LIST', 'false' // 是否支持桌面卡片刷新 buildConfigField 'boolean', 'IS_SUPPORT_LAUNCHER_CARD_REFRESH_STRATEGY', 'false' + // 是否基于地图 + buildConfigField 'boolean', 'IS_MAP_BASED', 'true' } qa { dimension "env" @@ -347,6 +366,7 @@ dependencies { implementation rootProject.ext.dependencies.mogomoduleback implementation rootProject.ext.dependencies.guideshow implementation rootProject.ext.dependencies.moduleextensions + implementation rootProject.ext.dependencies.modulemap } else { implementation project(':foudations:mogo-commons') implementation project(':modules:mogo-module-common') @@ -363,6 +383,7 @@ dependencies { implementation project(':modules:mogo-module-back') implementation project(':modules:mogo-module-guide') implementation project(':modules:mogo-module-extensions') + implementation project(':modules:mogo-module-map') } apply from: "./functions/perform.gradle" diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index dc3990cf79..1b82ce8c86 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -130,6 +130,7 @@ public class MogoApplication extends AbsMogoApplication { DebugConfig.setSupportedSearchDestinationOnlineCarList( BuildConfig.IS_SUPPORTED_SEARCH_DESTINATION_ONLINE_CAR_LIST ); DebugConfig.setScheduleCalculateNotHomeCompanyDistanceForPush( BuildConfig.IS_SUPPORT_SCHEDULE_CALCULATE_NOT_HOME_COMPANY_DISTANCE_FOR_PUSH ); DebugConfig.setSupportLauncherCardRefreshStrategy( BuildConfig.IS_SUPPORT_LAUNCHER_CARD_REFRESH_STRATEGY ); + DebugConfig.setMapBased( BuildConfig.IS_MAP_BASED ); } @Override @@ -142,7 +143,6 @@ public class MogoApplication extends AbsMogoApplication { super.init(); final IMogoServiceApis apis = MogoApisHandler.getInstance().getApis(); prepareBaseService( apis, 2_000L ); -// installSkinManager( this, apis ); } /** diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java index a65367ae5a..e5b431ce7b 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java @@ -295,4 +295,17 @@ public class DebugConfig { public static boolean isNeedRequestUserInfo() { return needRequestUserInfo; } + + /** + * 是否基于地图 + */ + private static boolean isMapBased = true; + + public static boolean isMapBased() { + return isMapBased; + } + + public static void setMapBased( boolean isMapBased ) { + DebugConfig.isMapBased = isMapBased; + } } diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java index 19a3d1ecf9..f2b1e6815d 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java @@ -439,9 +439,6 @@ public class AMapNaviViewWrapper implements IMogoMapView, @Override public MapControlResult changeZoom( float zoom ) { Logger.d( TAG, "changeZoom %s", zoom ); - if ( DebugConfig.isDebug() ) { - Logger.d( TAG, Log.getStackTraceString( new Throwable() ) ); - } getMap().changeZoom( zoom ); return MapControlResult.SUCCESS; } @@ -520,9 +517,6 @@ public class AMapNaviViewWrapper implements IMogoMapView, Logger.e( TAG, "latlng = null or is illegal" ); return; } - if ( DebugConfig.isDebug() ) { - Logger.d( TAG, Log.getStackTraceString( new Throwable() ) ); - } loseLockMode(); if ( animate ) { mMapView.getMap().animateCamera( CameraUpdateFactory.newLatLng( new LatLng( latLng.lat, latLng.lng ) ) ); @@ -537,9 +531,6 @@ public class AMapNaviViewWrapper implements IMogoMapView, if ( visible && NaviClient.getInstance( getContext() ).isNaviing() ) { return; } - if ( DebugConfig.isDebug() ) { - Logger.d( TAG, Log.getStackTraceString( new Throwable() ) ); - } if ( checkAMapView() ) { MyLocationStyle style = getMyLocationStyle(); if ( style == null ) { @@ -565,9 +556,6 @@ public class AMapNaviViewWrapper implements IMogoMapView, if ( NaviClient.getInstance( getContext() ).isNaviing() ) { return; } - if ( DebugConfig.isDebug() ) { - Logger.d( TAG, Log.getStackTraceString( new Throwable() ) ); - } if ( checkAMapView() ) { MyLocationStyle style = getMyLocationStyle(); if ( style == null ) { @@ -647,9 +635,6 @@ public class AMapNaviViewWrapper implements IMogoMapView, @Override public void recoverLockMode() { if ( checkAMapView() ) { - if ( DebugConfig.isDebug() ) { - Logger.d( TAG, Log.getStackTraceString( new Throwable() ) ); - } Logger.d( TAG, "锁车" ); mMapView.recoverLockMode(); changeMyLocationType2Follow(); @@ -659,9 +644,6 @@ public class AMapNaviViewWrapper implements IMogoMapView, @Override public void loseLockMode() { - if ( DebugConfig.isDebug() ) { - Logger.d( TAG, Log.getStackTraceString( new Throwable() ) ); - } Logger.d( TAG, "解锁锁车" ); mIsCarLocked = false; mockTouchEvent(); @@ -683,9 +665,6 @@ public class AMapNaviViewWrapper implements IMogoMapView, @Override public void setLockZoom( int var1 ) { if ( checkAMapView() ) { - if ( DebugConfig.isDebug() ) { - Logger.d( TAG, Log.getStackTraceString( new Throwable() ) ); - } Logger.d( TAG, "Zoom锁定锁车比例尺 %s", var1 ); // mMapView.setLockZoom( var1 ); } @@ -787,9 +766,6 @@ public class AMapNaviViewWrapper implements IMogoMapView, @Override public void setPointToCenter( double mapCenterX, double mapCenterY ) { if ( checkAMapView() ) { - if ( DebugConfig.isDebug() ) { - Logger.d( TAG, Log.getStackTraceString( new Throwable() ) ); - } Logger.d( TAG, "setPointToCenter(%s, %s)", mapCenterX, mapCenterY ); AMapNaviViewOptions options = mMapView.getViewOptions(); options.setPointToCenter( mapCenterX, mapCenterY ); @@ -866,9 +842,6 @@ public class AMapNaviViewWrapper implements IMogoMapView, return; } try { - if ( DebugConfig.isDebug() ) { - Logger.d( TAG, Log.getStackTraceString( new Throwable() ) ); - } LatLngBounds latLngBounds = MogoMapUtils.getLatLngBounds( carPosition, lonLats, lockCarPosition ); if ( !lockCarPosition ) { loseLockMode(); diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapViewWrapper.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapViewWrapper.java index c512ab3eda..f081517786 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapViewWrapper.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapViewWrapper.java @@ -204,7 +204,6 @@ public class AMapViewWrapper implements IMogoMapView, @Override public void onCreate( Bundle bundle ) { - Logger.d( TAG, Log.getStackTraceString( new Throwable() ) ); if ( mMapView != null ) { mMapView.onCreate( bundle ); Logger.d( TAG, "map onCreate" ); @@ -218,7 +217,6 @@ public class AMapViewWrapper implements IMogoMapView, public void onResume() { if ( mMapView != null ) { mMapView.onResume(); - Logger.d( TAG, Log.getStackTraceString( new Throwable() ) ); Logger.d( TAG, "map onResume" ); } } @@ -352,9 +350,6 @@ public class AMapViewWrapper implements IMogoMapView, @Override public MapControlResult changeZoom( float zoom ) { Logger.d( TAG, "changeZoom %s", zoom ); - if ( DebugConfig.isDebug() ) { - Logger.d( TAG, Log.getStackTraceString( new Throwable() ) ); - } getMap().changeZoom( zoom ); return MapControlResult.SUCCESS; } @@ -403,9 +398,6 @@ public class AMapViewWrapper implements IMogoMapView, Logger.e( TAG, "latlng = null or is illegal" ); return; } - if ( DebugConfig.isDebug() ) { - Logger.d( TAG, Log.getStackTraceString( new Throwable() ) ); - } loseLockMode(); if ( animate ) { mMapView.getMap().animateCamera( CameraUpdateFactory.newLatLng( new LatLng( latLng.lat, latLng.lng ) ) ); @@ -420,9 +412,6 @@ public class AMapViewWrapper implements IMogoMapView, if ( visible && NaviClient.getInstance( getContext() ).isNaviing() ) { return; } - if ( DebugConfig.isDebug() ) { - Logger.d( TAG, Log.getStackTraceString( new Throwable() ) ); - } if ( checkMapView() ) { MyLocationStyle style = getMyLocationStyle(); if ( style == null ) { @@ -442,9 +431,6 @@ public class AMapViewWrapper implements IMogoMapView, if ( NaviClient.getInstance( getContext() ).isNaviing() ) { return; } - if ( DebugConfig.isDebug() ) { - Logger.d( TAG, Log.getStackTraceString( new Throwable() ) ); - } if ( checkMapView() ) { MyLocationStyle style = getMyLocationStyle(); if ( style == null ) { @@ -487,9 +473,6 @@ public class AMapViewWrapper implements IMogoMapView, @Override public void recoverLockMode() { if ( checkMapView() ) { - if ( DebugConfig.isDebug() ) { - Logger.d( TAG, Log.getStackTraceString( new Throwable() ) ); - } Logger.d( TAG, "锁车" ); Location target = NaviClient.getInstance( getContext() ).getCarLocation2(); if ( target != null ) { @@ -528,9 +511,6 @@ public class AMapViewWrapper implements IMogoMapView, @Override public void loseLockMode() { - if ( DebugConfig.isDebug() ) { - Logger.d( TAG, Log.getStackTraceString( new Throwable() ) ); - } Logger.d( TAG, "解锁锁车" ); MyLocationStyle style = getMyLocationStyle(); style.myLocationType( MyLocationStyle.LOCATION_TYPE_FOLLOW_NO_CENTER ); @@ -554,9 +534,6 @@ public class AMapViewWrapper implements IMogoMapView, @Override public void setLockZoom( int var1 ) { if ( checkMapView() ) { - if ( DebugConfig.isDebug() ) { - Logger.d( TAG, Log.getStackTraceString( new Throwable() ) ); - } Logger.d( TAG, "Zoom锁定锁车比例尺 %s", var1 ); // mMapView.setLockZoom( var1 ); } @@ -656,9 +633,6 @@ public class AMapViewWrapper implements IMogoMapView, @Override public void setPointToCenter( double mapCenterX, double mapCenterY ) { if ( checkMapView() ) { - if ( DebugConfig.isDebug() ) { - Logger.d( TAG, Log.getStackTraceString( new Throwable() ) ); - } Logger.d( TAG, "setPointToCenter(%s, %s)", mapCenterX, mapCenterY ); mMapView.getMap().setPointToCenter( ( ( int ) ( mapCenterX * WindowUtils.getScreenWidth( getContext() ) ) ), ( ( int ) ( mapCenterY * WindowUtils.getScreenHeight( getContext() ) ) ) ); @@ -734,9 +708,6 @@ public class AMapViewWrapper implements IMogoMapView, return; } try { - if ( DebugConfig.isDebug() ) { - Logger.d( TAG, Log.getStackTraceString( new Throwable() ) ); - } LatLngBounds latLngBounds = MogoMapUtils.getLatLngBounds( carPosition, lonLats, lockCarPosition ); if ( !lockCarPosition ) { loseLockMode(); diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/MogoMarkerManager.java b/libraries/mogo-map/src/main/java/com/mogo/map/MogoMarkerManager.java index 33d7bfff49..2d5737acc8 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/MogoMarkerManager.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/MogoMarkerManager.java @@ -53,7 +53,6 @@ public class MogoMarkerManager implements IMogoMarkerManager { try { return MogoMap.getInstance().getMogoMap().addMarker( tag, options ); } catch ( Exception e ) { - Logger.e( TAG, Log.getStackTraceString( e ) ); return null; } } @@ -70,13 +69,11 @@ public class MogoMarkerManager implements IMogoMarkerManager { @Override public void removeMarkers( String tag ) { - Logger.d( TAG, Log.getStackTraceString( new Throwable() ) ); MogoMarkersHandler.getInstance().remove( tag ); } @Override public void removeMarkers() { - Logger.d( TAG, Log.getStackTraceString( new Throwable() ) ); MogoMarkersHandler.getInstance().removeAll(); } @@ -92,7 +89,6 @@ public class MogoMarkerManager implements IMogoMarkerManager { @Override public void removeMarkersExcept( String tag ) { - Logger.d( TAG, Log.getStackTraceString( new Throwable() ) ); MogoMarkersHandler.getInstance().deleteAllExcept( tag ); } diff --git a/modules/mogo-module-main/build.gradle b/modules/mogo-module-main/build.gradle index f5ebe77146..62b7e4e96a 100644 --- a/modules/mogo-module-main/build.gradle +++ b/modules/mogo-module-main/build.gradle @@ -46,7 +46,6 @@ dependencies { api rootProject.ext.dependencies.mogoutils api rootProject.ext.dependencies.mogocommons api rootProject.ext.dependencies.modulecommon - api rootProject.ext.dependencies.modulemap api rootProject.ext.dependencies.mogoserviceapi api rootProject.ext.dependencies.moduleservice compileOnly rootProject.ext.dependencies.skinsupport @@ -54,7 +53,6 @@ dependencies { api project(":foudations:mogo-utils") api project(":foudations:mogo-commons") api project(':modules:mogo-module-common') - api project(':modules:mogo-module-map') api project(':services:mogo-service-api') api project(':services:mogo-service') compileOnly project(':skin:mogo-skin-support') 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 c251ad3729..eae7c2e181 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 @@ -9,7 +9,6 @@ import android.widget.FrameLayout; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.alibaba.android.arouter.launcher.ARouter; import com.mogo.commons.context.ContextHolderUtil; import com.mogo.commons.debug.DebugConfig; import com.mogo.commons.mvp.MvpActivity; @@ -19,7 +18,6 @@ import com.mogo.map.location.MogoLocation; import com.mogo.map.marker.IMogoMarker; import com.mogo.map.marker.IMogoMarkerClickListener; import com.mogo.map.uicontroller.EnumMapUI; -import com.mogo.map.uicontroller.IMogoMapUIController; import com.mogo.module.common.MogoApisHandler; import com.mogo.module.common.map.MapCenterPointStrategy; import com.mogo.module.common.map.Scene; @@ -27,10 +25,8 @@ import com.mogo.module.main.cards.MogoModulesManager; import com.mogo.module.main.service.MogoMainService; import com.mogo.module.main.windowview.FloatingViewHandler; import com.mogo.service.IMogoServiceApis; -import com.mogo.service.MogoServicePaths; import com.mogo.service.adas.IMogoADASControlStatusChangedListener; import com.mogo.service.fragmentmanager.IMogoFragmentManager; -import com.mogo.service.map.IMogoMapService; import com.mogo.service.module.IMogoModuleProvider; import com.mogo.service.statusmanager.IMogoStatusManager; import com.mogo.skin.support.SkinMode; @@ -55,12 +51,9 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme protected static final String TAG = MainActivity.class.getSimpleName(); protected IMogoServiceApis mServiceApis; - protected IMogoMapService mMogoMapService; - protected IMogoMapUIController mMogoMapUIController; protected IMogoFragmentManager mMogoFragmentManager; protected IMogoStatusManager mMogoStatusManager; - // protected View mHeader; protected View mApps; protected View mEntrance; protected View mEventPanel; @@ -97,7 +90,6 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme getWindow().setBackgroundDrawable( null ); -// mHeader = findViewById( R.id.module_main_id_header_fragment_container ); mApps = findViewById( R.id.module_main_id_apps_fragment_container ); mEntrance = findViewById( R.id.module_main_id_entrance_fragment_container ); mEventPanel = findViewById( R.id.module_main_id_event_panel_fragment_container ); @@ -117,7 +109,6 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme // 隐藏布局 protected void hideLayout() { -// mHeader.setVisibility( View.GONE ); mEntrance.setVisibility( View.GONE ); mEventPanel.setVisibility( View.GONE ); mFloatingLayout.setVisibility( View.GONE ); @@ -125,7 +116,6 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme // 显示布局 protected void showLayout() { -// mHeader.setVisibility( View.VISIBLE ); mEntrance.setVisibility( View.VISIBLE ); mEventPanel.setVisibility( View.VISIBLE ); mFloatingLayout.setVisibility( View.VISIBLE ); @@ -134,7 +124,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme @Override protected void onCreate( @Nullable Bundle savedInstanceState ) { super.onCreate( savedInstanceState ); - ContextHolderUtil.holdContext(this); + ContextHolderUtil.holdContext( this ); mPresenter.postLoadModuleMsg(); } @@ -156,41 +146,32 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme MogoModulesManager.getInstance().init( this ); loadSplash(); - mMogoMapService = mServiceApis.getMapServiceApi(); - if ( mMogoMapService != null ) { - mMogoMapService.getHostListenerRegister().registerHostMapListener( EventDispatchCenter.getInstance() ); - mMogoMapService.getHostListenerRegister().registerHostNaviListener( EventDispatchCenter.getInstance() ); - mMogoMapService.getHostListenerRegister().registerHostAimlessModeListener( EventDispatchCenter.getInstance() ); - mMogoMapService.getHostListenerRegister().registerMarkerClickListener( this ); - } -// IMogoObuManager obuManager = mServiceApis.getObuManager(); -// if(obuManager!=null) { -// obuManager.registerObuDataChangedListener(EventDispatchCenter.getInstance()); -// } + + if ( DebugConfig.isMapBased() ) { + if ( mServiceApis.getMapServiceApi() != null ) { + mServiceApis.getMapServiceApi().getHostListenerRegister().registerHostMapListener( EventDispatchCenter.getInstance() ); + mServiceApis.getMapServiceApi().getHostListenerRegister().registerHostNaviListener( EventDispatchCenter.getInstance() ); + mServiceApis.getMapServiceApi().getHostListenerRegister().registerHostAimlessModeListener( EventDispatchCenter.getInstance() ); + mServiceApis.getMapServiceApi().getHostListenerRegister().registerMarkerClickListener( this ); + } + } if ( DebugConfig.isSkinSupported() ) { initAdasControlStatusListener(); } - EventDispatchCenter.getInstance().setMapLoadedCallback( () -> { - Logger.d( TAG, "map loaded." + Thread.currentThread().getName() ); - // 右移地图中心点 - mMogoMapUIController = mMogoMapService.getMapUIController(); - MapCenterPointStrategy.init(); - MapCenterPointStrategy.setMapCenterPointByScene( mMogoMapUIController, Scene.AIMLESS ); - - // 加载地图，触发地图加载完毕回调，在初始化其他卡片模块，保证卡片模块可以正确获取地图相关服务。 - loadContainerModules(); - MogoModulesManager.getInstance().loadModules(); - mPresenter.delayOperations(); - - // 启动一些基本的服务：定位等 - startBaseService(); - - Log.i( "timer", "cost " + ( System.currentTimeMillis() - start ) + "ms" ); - } ); - MogoModulesManager.getInstance().loadMapModule( R.id.module_main_id_map_fragment_container ); + if ( DebugConfig.isMapBased() ) { + EventDispatchCenter.getInstance().setMapLoadedCallback( () -> { + Logger.d( TAG, "map loaded." + Thread.currentThread().getName() ); + resetMapCenterPoint(); + loadOthersModules(); + Log.i( "timer", "cost " + ( System.currentTimeMillis() - start ) + "ms" ); + } ); + MogoModulesManager.getInstance().loadMapModule( R.id.module_main_id_map_fragment_container ); + } else { + loadOthersModules(); + } mMogoFragmentManager = mServiceApis.getFragmentManagerApi(); mMogoFragmentManager.init( this, R.id.module_main_id_search_fragment ); @@ -203,12 +184,25 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme } } ); - // 初始化MonitorModule -// IMogoMonitorProvider monitorProvider = (IMogoMonitorProvider) ARouter.getInstance().build(MogoServicePaths.PATH_MOGO_MONITOR).navigation(this); -// monitorProvider.resetActivityContext(this); mServiceApis.getMogoMonitorApi().resetActivityContext( this ); } + private void resetMapCenterPoint() { + // 右移地图中心点 + MapCenterPointStrategy.init(); + MapCenterPointStrategy.setMapCenterPointByScene( mServiceApis.getMapServiceApi().getMapUIController(), Scene.AIMLESS ); + } + + private void loadOthersModules() { + // 加载地图，触发地图加载完毕回调，在初始化其他卡片模块，保证卡片模块可以正确获取地图相关服务。 + loadContainerModules(); + MogoModulesManager.getInstance().loadModules(); + mPresenter.delayOperations(); + + // 启动一些基本的服务：定位等 + startBaseService(); + } + private void initAdasControlStatusListener() { mServiceApis.getRegisterCenterApi().registerADASControlStatusChangedListener( TAG, this ); AdasConfigApiController.getInstance().registerAdasSettingUiListener( EventDispatchCenter.getInstance() ); @@ -230,6 +224,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme @Override public void hideCoverUpLayout() { + Logger.d( TAG, "隐藏遮罩" ); mCoverUpLayout.setVisibility( View.GONE ); mServiceApis.getAdasControllerApi().showADAS(); } @@ -347,13 +342,11 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme @Override protected void onDestroy() { super.onDestroy(); - mMogoMapService.getHostListenerRegister().unregisterMarkerClickListener(); - mMogoMapService.getHostListenerRegister().unregisterHostAimlessModeListener(); - mMogoMapService.getHostListenerRegister().unregisterHostNaviListener(); - mMogoMapService.getHostListenerRegister().unregisterHostMapListener(); + mServiceApis.getMapServiceApi().getHostListenerRegister().unregisterMarkerClickListener(); + mServiceApis.getMapServiceApi().getHostListenerRegister().unregisterHostAimlessModeListener(); + mServiceApis.getMapServiceApi().getHostListenerRegister().unregisterHostNaviListener(); + mServiceApis.getMapServiceApi().getHostListenerRegister().unregisterHostMapListener(); mMogoStatusManager.setMainPageLaunchedStatus( TAG, false ); - mMogoMapService = null; - mMogoMapUIController = null; mMogoFragmentManager.unregisterMainFragmentStackTransactionListener(); mMogoFragmentManager = null; mServiceApis.getMapServiceApi().getMapViewInstanceHandler().destroy(); diff --git a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml index 89e4866069..aa69eb8330 100644 --- a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml +++ b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml @@ -79,8 +79,7 @@ android:layout_height="match_parent" android:scaleType="centerCrop" android:background="@drawable/main_bitmap_splash_bg" - android:visibility="visible" - /> + android:visibility="visible" /> Date: Thu, 12 Nov 2020 20:28:38 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E8=B0=83=E6=95=B4m1=E5=B8=83=E5=B1=80?= =?UTF-8?q?=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/misc.xml | 2 +- .../extensions/entrance/EntranceFragment.java | 24 ++ .../extensions/utils/TopViewAnimHelper.java | 12 + .../utils/TopViewNoLinkageAnimHelper.java | 9 +- .../res/layout/module_ext_layout_entrance.xml | 209 +++++++++--------- .../module_main_activity_main_no_map.xml | 90 ++++++++ 6 files changed, 241 insertions(+), 105 deletions(-) create mode 100644 modules/mogo-module-main/src/main/res/layout/module_main_activity_main_no_map.xml diff --git a/.idea/misc.xml b/.idea/misc.xml index e082ea7475..a2da5c6cd8 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -4,7 +4,7 @@ - + \ No newline at end of file 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 a70c9bfc85..51324f5adc 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 @@ -4,6 +4,7 @@ import android.content.Intent; import android.content.SharedPreferences; import android.graphics.Rect; import android.os.Bundle; +import android.os.Debug; import android.os.Handler; import android.text.TextUtils; import android.util.TypedValue; @@ -397,6 +398,14 @@ public class EntranceFragment extends MvpFragment - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + +