From 67918d5293909da5db285ca211980db92ccf701f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Wed, 15 Sep 2021 20:30:20 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=88=86=E4=BD=93=E6=9C=BA?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E7=BB=98=E5=88=B6=E8=AF=86=E5=88=AB=E5=85=83?= =?UTF-8?q?=E7=B4=A0=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 董宏宇 --- app/productFlavors/f80x.gradle | 2 -- app/productFlavors/f8Amap.gradle | 2 -- app/productFlavors/f8xx.gradle | 2 -- app/productFlavors/fPadLenovo.gradle | 2 -- app/productFlavors/fPadLenovoOchBus.gradle | 2 -- app/productFlavors/fPadLenovoOchTaxi.gradle | 2 -- app/productFlavors/fochbus.gradle | 2 -- app/productFlavors/fochtaxi.gradle | 2 -- .../java/com/mogo/launcher/MogoApplication.java | 1 - .../java/com/mogo/commons/debug/DebugConfig.java | 2 +- .../service/impl/adas/MogoADASController.java | 15 ++------------- 11 files changed, 3 insertions(+), 31 deletions(-) diff --git a/app/productFlavors/f80x.gradle b/app/productFlavors/f80x.gradle index 5326e8ad1c..6dd3c61464 100644 --- a/app/productFlavors/f80x.gradle +++ b/app/productFlavors/f80x.gradle @@ -27,8 +27,6 @@ project.android.productFlavors { buildConfigField 'boolean', 'IS_SUPPORT_LAUNCHER_CARD_REFRESH_STRATEGY', 'false' // 是否基于地图 buildConfigField 'boolean', 'IS_MAP_BASED', 'true' - // 是否加载引导模块 - buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'true' // 分享时是否隐藏 adas buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'false' // 是否需要实时上报坐标 diff --git a/app/productFlavors/f8Amap.gradle b/app/productFlavors/f8Amap.gradle index 5fa9369966..6cfbd1bf6f 100644 --- a/app/productFlavors/f8Amap.gradle +++ b/app/productFlavors/f8Amap.gradle @@ -27,8 +27,6 @@ project.android.productFlavors { buildConfigField 'boolean', 'IS_SUPPORT_LAUNCHER_CARD_REFRESH_STRATEGY', 'false' // 是否基于地图 buildConfigField 'boolean', 'IS_MAP_BASED', 'true' - // 是否加载引导模块 - buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'true' // 分享时是否隐藏 adas buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'false' // 是否需要实时上报坐标 diff --git a/app/productFlavors/f8xx.gradle b/app/productFlavors/f8xx.gradle index 8d82518154..e71c06dfb3 100644 --- a/app/productFlavors/f8xx.gradle +++ b/app/productFlavors/f8xx.gradle @@ -27,8 +27,6 @@ project.android.productFlavors { buildConfigField 'boolean', 'IS_SUPPORT_LAUNCHER_CARD_REFRESH_STRATEGY', 'false' // 是否基于地图 buildConfigField 'boolean', 'IS_MAP_BASED', 'true' - // 是否加载引导模块 - buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'true' // 分享时是否隐藏 adas buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'false' // 是否需要实时上报坐标 diff --git a/app/productFlavors/fPadLenovo.gradle b/app/productFlavors/fPadLenovo.gradle index 50d339215b..f531a5517e 100644 --- a/app/productFlavors/fPadLenovo.gradle +++ b/app/productFlavors/fPadLenovo.gradle @@ -27,8 +27,6 @@ project.android.productFlavors { buildConfigField 'boolean', 'IS_SUPPORT_LAUNCHER_CARD_REFRESH_STRATEGY', 'false' // 是否基于地图 buildConfigField 'boolean', 'IS_MAP_BASED', 'true' - // 是否加载引导模块 - buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'false' // 分享时是否隐藏 adas buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'false' // 是否需要实时上报坐标 diff --git a/app/productFlavors/fPadLenovoOchBus.gradle b/app/productFlavors/fPadLenovoOchBus.gradle index c73590c8a2..be8d5f0201 100644 --- a/app/productFlavors/fPadLenovoOchBus.gradle +++ b/app/productFlavors/fPadLenovoOchBus.gradle @@ -27,8 +27,6 @@ project.android.productFlavors { buildConfigField 'boolean', 'IS_SUPPORT_LAUNCHER_CARD_REFRESH_STRATEGY', 'false' // 是否基于地图 buildConfigField 'boolean', 'IS_MAP_BASED', 'true' - // 是否加载引导模块 - buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'false' // 分享时是否隐藏 adas buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'false' // 是否需要实时上报坐标 diff --git a/app/productFlavors/fPadLenovoOchTaxi.gradle b/app/productFlavors/fPadLenovoOchTaxi.gradle index 3af432bc3a..1592d81786 100644 --- a/app/productFlavors/fPadLenovoOchTaxi.gradle +++ b/app/productFlavors/fPadLenovoOchTaxi.gradle @@ -28,8 +28,6 @@ project.android.productFlavors { buildConfigField 'boolean', 'IS_SUPPORT_LAUNCHER_CARD_REFRESH_STRATEGY', 'false' // 是否基于地图 buildConfigField 'boolean', 'IS_MAP_BASED', 'true' - // 是否加载引导模块 - buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'false' // 分享时是否隐藏 adas buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'false' // 是否需要实时上报坐标 diff --git a/app/productFlavors/fochbus.gradle b/app/productFlavors/fochbus.gradle index 823bd9cef5..2b390f2ee2 100644 --- a/app/productFlavors/fochbus.gradle +++ b/app/productFlavors/fochbus.gradle @@ -27,8 +27,6 @@ project.android.productFlavors { buildConfigField 'boolean', 'IS_SUPPORT_LAUNCHER_CARD_REFRESH_STRATEGY', 'false' // 是否基于地图 buildConfigField 'boolean', 'IS_MAP_BASED', 'true' - // 是否加载引导模块 - buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'false' // 分享时是否隐藏 adas buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'false' // 是否需要实时上报坐标 diff --git a/app/productFlavors/fochtaxi.gradle b/app/productFlavors/fochtaxi.gradle index 5c29f621c8..58ae81fef3 100644 --- a/app/productFlavors/fochtaxi.gradle +++ b/app/productFlavors/fochtaxi.gradle @@ -27,8 +27,6 @@ project.android.productFlavors { buildConfigField 'boolean', 'IS_SUPPORT_LAUNCHER_CARD_REFRESH_STRATEGY', 'false' // 是否基于地图 buildConfigField 'boolean', 'IS_MAP_BASED', 'true' - // 是否加载引导模块 - buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'false' // 分享时是否隐藏 adas buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'false' // 是否需要实时上报坐标 diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index 4ac815843e..d329ae6946 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -102,7 +102,6 @@ public class MogoApplication extends AbsMogoApplication { 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); - DebugConfig.setNeedLoadGuideModule(BuildConfig.IS_NEED_LOAD_GUIDE_MODULE); DebugConfig.setNeedHideAdasWhenShare(BuildConfig.IS_NEED_HIDE_ADAS_WHEN_SHARE); DebugConfig.setNeedUploadCoordinatesInTime(BuildConfig.IS_NEED_UPLOAD_COORDINATES_IN_TIME); DebugConfig.setUseAdasRtkLocationInfo(BuildConfig.IS_USE_ADAS_RTK_LOCATION_INFO); 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 6946320dbb..88b5c7df2e 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 @@ -362,7 +362,7 @@ public class DebugConfig { DebugConfig.isMapBased = isMapBased; } - private static boolean isNeedLoadGuideModule = true; + private static boolean isNeedLoadGuideModule = false; public static void setNeedLoadGuideModule(boolean isNeedLoadGuideModule) { DebugConfig.isNeedLoadGuideModule = isNeedLoadGuideModule; diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java index 689f7d9c5d..7b8168d837 100644 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java @@ -13,7 +13,6 @@ import com.alibaba.android.arouter.launcher.ARouter; import com.mogo.cloud.passport.MoGoAiCloudClientConfig; import com.mogo.commons.AbsMogoApplication; import com.mogo.commons.debug.DebugConfig; -import com.mogo.commons.network.SubscribeImpl; import com.mogo.map.MogoLatLng; import com.mogo.map.uicontroller.EnumMapUI; import com.mogo.module.adas.AdasProvider; @@ -228,17 +227,7 @@ public class MogoADASController implements IMogoADASController { @Override public void showADAS() { - - if (DebugConfig.isNeedLoadGuideModule()) { - if (!SharedPrefsMgr.getInstance(AbsMogoApplication.getApp()).getBoolean(DebugConfig.getSpGuide(), false)) { - return; - } - } - // TODO 以前这里是考虑ADAS独立应用，现在集成ADAS-SDK到程序内了，这个判断不需要了 - // if (SingletonsHolder.get(IMogoStatusManager.class).isVrMode()) { - // return; - // } - Logger.d(TAG, Log.getStackTraceString(new Throwable())); + Logger.d(TAG, "showADAS()"); init(AbsMogoApplication.getApp()); adasProvider.addAdasStatusListener(new IAdasStatusListener() { @Override @@ -699,7 +688,7 @@ public class MogoADASController implements IMogoADASController { } @Override - public void setAdasCarDataCallback( IMogoAdasCarDataCallback carDataCallback ) { + public void setAdasCarDataCallback(IMogoAdasCarDataCallback carDataCallback) { mMogoAdasCarDataCallback = carDataCallback; }