From 2561a5d38bad1687e7cb8855203a88d9ebbe4e00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Mon, 1 Nov 2021 17:32:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8=E7=9A=84?= =?UTF-8?q?=20gradle=E9=85=8D=E7=BD=AE=20=E5=AF=B9Hmi=E5=A2=9E=E5=8A=A0res?= =?UTF-8?q?=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 董宏宇 --- app/functions/skin.gradle | 49 ------- app/productFlavors/f80x.gradle | 11 -- app/productFlavors/f8Amap.gradle | 11 -- app/productFlavors/f8xx.gradle | 11 -- app/productFlavors/fPadLenovo.gradle | 11 -- app/productFlavors/fPadLenovoOchBus.gradle | 11 -- app/productFlavors/fPadLenovoOchTaxi.gradle | 13 -- app/productFlavors/fochbus.gradle | 11 -- app/productFlavors/fochtaxi.gradle | 11 -- .../com/mogo/launcher/MogoApplication.java | 8 +- .../mogo-core-function-hmi/build.gradle | 2 + .../core/function/hmi/ui/MoGoHmiFragment.kt | 1 + .../com/mogo/commons/debug/DebugConfig.java | 135 ------------------ .../common/drawer/RoadConditionDrawer.java | 6 +- .../com/mogo/module/common/utils/SPConst.java | 4 +- .../extensions/entrance/EntranceFragment.java | 12 +- .../com/mogo/module/main/MainActivity.java | 4 +- .../service/intent/MockIntentHandler.java | 9 +- .../service/marker/MapMarkerManager.java | 2 +- 19 files changed, 11 insertions(+), 311 deletions(-) delete mode 100644 app/functions/skin.gradle diff --git a/app/functions/skin.gradle b/app/functions/skin.gradle deleted file mode 100644 index 85e7a38480..0000000000 --- a/app/functions/skin.gradle +++ /dev/null @@ -1,49 +0,0 @@ -project.dependencies { - if (Boolean.valueOf(RELEASE)) { - - f8xxImplementation rootProject.ext.dependencies.skinsupportimpl - f80xImplementation rootProject.ext.dependencies.skinsupportimpl - f8AmapImplementation rootProject.ext.dependencies.skinsupportimpl - - fochtaxiImplementation rootProject.ext.dependencies.skinsupportimpl - fochbusImplementation rootProject.ext.dependencies.skinsupportimpl - - fPadLenovoImplementation rootProject.ext.dependencies.skinsupportimpl - fPadLenovoOchTaxiImplementation rootProject.ext.dependencies.skinsupportimpl - fPadLenovoOchBusImplementation rootProject.ext.dependencies.skinsupportimpl - - f8xxImplementation rootProject.ext.dependencies.skinsupportlight - f80xImplementation rootProject.ext.dependencies.skinsupportlight - f8AmapImplementation rootProject.ext.dependencies.skinsupportlight - - fochtaxiImplementation rootProject.ext.dependencies.skinsupportlight - fochbusImplementation rootProject.ext.dependencies.skinsupportlight - - fPadLenovoImplementation rootProject.ext.dependencies.skinsupportlight - fPadLenovoOchTaxiImplementation rootProject.ext.dependencies.skinsupportlight - fPadLenovoOchBusImplementation rootProject.ext.dependencies.skinsupportlight - } else { - f8xxImplementation project(':skin:mogo-skin-support-impl') - f80xImplementation project(':skin:mogo-skin-support-impl') - f8AmapImplementation project(':skin:mogo-skin-support-impl') - - fochtaxiImplementation project(':skin:mogo-skin-support-impl') - fochbusImplementation project(':skin:mogo-skin-support-impl') - - fPadLenovoImplementation project(':skin:mogo-skin-support-impl') - fPadLenovoOchTaxiImplementation project(':skin:mogo-skin-support-impl') - fPadLenovoOchBusImplementation project(':skin:mogo-skin-support-impl') - - f8xxImplementation project(':skin:mogo-skin-light') - f80xImplementation project(':skin:mogo-skin-light') - f8AmapImplementation project(':skin:mogo-skin-light') - - fochtaxiImplementation project(':skin:mogo-skin-light') - fochbusImplementation project(':skin:mogo-skin-light') - - fPadLenovoImplementation project(':skin:mogo-skin-light') - fPadLenovoOchTaxiImplementation project(':skin:mogo-skin-light') - fPadLenovoOchBusImplementation project(':skin:mogo-skin-light') - - } -} \ No newline at end of file diff --git a/app/productFlavors/f80x.gradle b/app/productFlavors/f80x.gradle index 6dd3c61464..2339f69ab2 100644 --- a/app/productFlavors/f80x.gradle +++ b/app/productFlavors/f80x.gradle @@ -15,26 +15,15 @@ project.android.productFlavors { buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'false' // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 buildConfigField 'int', 'CAR_MACHINE_TYPE', '0' - buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'true' manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue, CHANNEL_VALUE: "f80x"] // 是否使用高德sdk自定义导航 buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'false' - // 是否支持换肤 - buildConfigField 'boolean', 'IS_SKIN_SUPPORTED', 'true' - // 是否支持查询导航目的地车友 - 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' // 分享时是否隐藏 adas buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'false' // 是否需要实时上报坐标 buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true' - // 是否需要使用工控机的rtk定位 - buildConfigField 'boolean', 'IS_USE_ADAS_RTK_LOCATION_INFO', 'true' - // 是否需要悬浮窗权限申请 - buildConfigField 'boolean', 'IS_NEED_REQUEST_FLOAT_PERMISSION', 'true' // GPS数据提供源： 0-Android系统，1-工控机，2-OBU buildConfigField 'int', 'GPS_PROVIDER', "1" } diff --git a/app/productFlavors/f8Amap.gradle b/app/productFlavors/f8Amap.gradle index 6cfbd1bf6f..16ace86c59 100644 --- a/app/productFlavors/f8Amap.gradle +++ b/app/productFlavors/f8Amap.gradle @@ -15,26 +15,15 @@ project.android.productFlavors { buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'false' // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 buildConfigField 'int', 'CAR_MACHINE_TYPE', '0' - buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'true' manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue, CHANNEL_VALUE: "f8Amap"] // 是否使用高德sdk自定义导航 buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'false' - // 是否支持换肤 - buildConfigField 'boolean', 'IS_SKIN_SUPPORTED', 'true' - // 是否支持查询导航目的地车友 - 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' // 分享时是否隐藏 adas buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'false' // 是否需要实时上报坐标 buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true' - // 是否需要使用工控机的rtk定位 - buildConfigField 'boolean', 'IS_USE_ADAS_RTK_LOCATION_INFO', 'false' - // 是否需要悬浮窗权限申请 - buildConfigField 'boolean', 'IS_NEED_REQUEST_FLOAT_PERMISSION', 'true' // GPS数据提供源： 0-Android系统，1-工控机，2-OBU buildConfigField 'int', 'GPS_PROVIDER', "1" } diff --git a/app/productFlavors/f8xx.gradle b/app/productFlavors/f8xx.gradle index e71c06dfb3..40c29c4e44 100644 --- a/app/productFlavors/f8xx.gradle +++ b/app/productFlavors/f8xx.gradle @@ -15,26 +15,15 @@ project.android.productFlavors { buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'false' // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 buildConfigField 'int', 'CAR_MACHINE_TYPE', '0' - buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'true' manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue, CHANNEL_VALUE: "f8xx"] // 是否使用高德sdk自定义导航 buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'false' - // 是否支持换肤 - buildConfigField 'boolean', 'IS_SKIN_SUPPORTED', 'true' - // 是否支持查询导航目的地车友 - 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' // 分享时是否隐藏 adas buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'false' // 是否需要实时上报坐标 buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true' - // 是否需要使用工控机的rtk定位 - buildConfigField 'boolean', 'IS_USE_ADAS_RTK_LOCATION_INFO', 'true' - // 是否需要悬浮窗权限申请 - buildConfigField 'boolean', 'IS_NEED_REQUEST_FLOAT_PERMISSION', 'true' // GPS数据提供源： 0-Android系统，1-工控机，2-OBU buildConfigField 'int', 'GPS_PROVIDER', "1" } diff --git a/app/productFlavors/fPadLenovo.gradle b/app/productFlavors/fPadLenovo.gradle index f531a5517e..8b37f917db 100644 --- a/app/productFlavors/fPadLenovo.gradle +++ b/app/productFlavors/fPadLenovo.gradle @@ -15,26 +15,15 @@ project.android.productFlavors { buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'false' // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' - buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'true' manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue, CHANNEL_VALUE: "fPadLenovo"] // 是否使用高德sdk自定义导航 buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'false' - // 是否支持换肤 - buildConfigField 'boolean', 'IS_SKIN_SUPPORTED', 'true' - // 是否支持查询导航目的地车友 - 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' // 分享时是否隐藏 adas buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'false' // 是否需要实时上报坐标 buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true' - // 是否需要使用工控机的rtk定位 - buildConfigField 'boolean', 'IS_USE_ADAS_RTK_LOCATION_INFO', 'true' - // 是否需要悬浮窗权限申请 - buildConfigField 'boolean', 'IS_NEED_REQUEST_FLOAT_PERMISSION', 'true' // GPS数据提供源： 0-Android系统，1-工控机，2-OBU buildConfigField 'int', 'GPS_PROVIDER', "1" // 默认进入的地图模式 diff --git a/app/productFlavors/fPadLenovoOchBus.gradle b/app/productFlavors/fPadLenovoOchBus.gradle index be8d5f0201..f91d1c529b 100644 --- a/app/productFlavors/fPadLenovoOchBus.gradle +++ b/app/productFlavors/fPadLenovoOchBus.gradle @@ -15,26 +15,15 @@ project.android.productFlavors { buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'false' // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' - buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'true' manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue, CHANNEL_VALUE: "fPadLenovoOchBus"] // 是否使用高德sdk自定义导航 buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'false' - // 是否支持换肤 - buildConfigField 'boolean', 'IS_SKIN_SUPPORTED', 'true' - // 是否支持查询导航目的地车友 - 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' // 分享时是否隐藏 adas buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'false' // 是否需要实时上报坐标 buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true' - // 是否需要使用工控机的rtk定位 - buildConfigField 'boolean', 'IS_USE_ADAS_RTK_LOCATION_INFO', 'true' - // 是否需要悬浮窗权限申请 - buildConfigField 'boolean', 'IS_NEED_REQUEST_FLOAT_PERMISSION', 'true' // GPS数据提供源： 0-Android系统，1-工控机，2-OBU buildConfigField 'int', 'GPS_PROVIDER', "1" } diff --git a/app/productFlavors/fPadLenovoOchTaxi.gradle b/app/productFlavors/fPadLenovoOchTaxi.gradle index 1592d81786..97c8a45d43 100644 --- a/app/productFlavors/fPadLenovoOchTaxi.gradle +++ b/app/productFlavors/fPadLenovoOchTaxi.gradle @@ -16,28 +16,15 @@ project.android.productFlavors { buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'false' // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' - buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'true' manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue, CHANNEL_VALUE: "fPadLenovoOchTaxi"] // 是否使用高德sdk自定义导航 buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'false' - // 是否支持换肤 - buildConfigField 'boolean', 'IS_SKIN_SUPPORTED', 'true' - // 是否支持查询导航目的地车友 - 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' // 分享时是否隐藏 adas buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'false' // 是否需要实时上报坐标 buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true' - // 是否需要使用工控机的rtk定位 - buildConfigField 'boolean', 'IS_USE_ADAS_RTK_LOCATION_INFO', 'true' - // 是否需要悬浮窗权限申请 - buildConfigField 'boolean', 'IS_NEED_REQUEST_FLOAT_PERMISSION', 'true' - // 是否需要悬浮窗权限申请 - buildConfigField 'boolean', 'IS_NEED_REQUEST_FLOAT_PERMISSION', 'true' // GPS数据提供源： 0-Android系统，1-工控机，2-OBU buildConfigField 'int', 'GPS_PROVIDER', "1" } diff --git a/app/productFlavors/fochbus.gradle b/app/productFlavors/fochbus.gradle index 2b390f2ee2..640e070d92 100644 --- a/app/productFlavors/fochbus.gradle +++ b/app/productFlavors/fochbus.gradle @@ -15,26 +15,15 @@ project.android.productFlavors { buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'false' // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 buildConfigField 'int', 'CAR_MACHINE_TYPE', '0' - buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'true' manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue, CHANNEL_VALUE: "fochbus"] // 是否使用高德sdk自定义导航 buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'false' - // 是否支持换肤 - buildConfigField 'boolean', 'IS_SKIN_SUPPORTED', 'true' - // 是否支持查询导航目的地车友 - 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' // 分享时是否隐藏 adas buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'false' // 是否需要实时上报坐标 buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true' - // 是否需要使用工控机的rtk定位 - buildConfigField 'boolean', 'IS_USE_ADAS_RTK_LOCATION_INFO', 'true' - // 是否需要悬浮窗权限申请 - buildConfigField 'boolean', 'IS_NEED_REQUEST_FLOAT_PERMISSION', 'true' // GPS数据提供源： 0-Android系统，1-工控机，2-OBU buildConfigField 'int', 'GPS_PROVIDER', "1" } diff --git a/app/productFlavors/fochtaxi.gradle b/app/productFlavors/fochtaxi.gradle index 58ae81fef3..72f6faef0a 100644 --- a/app/productFlavors/fochtaxi.gradle +++ b/app/productFlavors/fochtaxi.gradle @@ -15,26 +15,15 @@ project.android.productFlavors { buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'false' // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 buildConfigField 'int', 'CAR_MACHINE_TYPE', '0' - buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'true' manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue, CHANNEL_VALUE: "fochtaxi"] // 是否使用高德sdk自定义导航 buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'false' - // 是否支持换肤 - buildConfigField 'boolean', 'IS_SKIN_SUPPORTED', 'true' - // 是否支持查询导航目的地车友 - 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' // 分享时是否隐藏 adas buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'false' // 是否需要实时上报坐标 buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true' - // 是否需要使用工控机的rtk定位 - buildConfigField 'boolean', 'IS_USE_ADAS_RTK_LOCATION_INFO', 'true' - // 是否需要悬浮窗权限申请 - buildConfigField 'boolean', 'IS_NEED_REQUEST_FLOAT_PERMISSION', 'true' // GPS数据提供源： 0-Android系统，1-工控机，2-OBU buildConfigField 'int', 'GPS_PROVIDER', "1" } diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index 22a4caf1d5..6054712ee9 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -88,22 +88,16 @@ public class MogoApplication extends AbsMogoApplication { DebugConfig.setLauncher(BuildConfig.IS_LAUNCHER); DebugConfig.setActiveAIAssistFlag(BuildConfig.AI_ASSIST_ACTIVE_STAUTS); DebugConfig.setUseMockObuData(false); - ObuConfig.useObuLocation = false; DebugConfig.setCarMachineType(BuildConfig.CAR_MACHINE_TYPE); DebugConfig.setProductFlavor(BuildConfig.FLAVOR_product); DebugConfig.setSocketAppId(BuildConfig.SOCKET_APP_ID); - DebugConfig.setRoadEventAnimated(BuildConfig.ROAD_EVENT_ANIMATED); - DebugConfig.setSkinSupported(BuildConfig.IS_SKIN_SUPPORTED); - 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); 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); - DebugConfig.setNeedRequestFloatPermission(BuildConfig.IS_NEED_REQUEST_FLOAT_PERMISSION); DebugConfig.setObuType(SharedPrefsMgr.getInstance(this).getInt("OBU_TYPE", DebugConfig.OBU_TYPE_CIDI)); + ObuConfig.useObuLocation = false; // 使用与渠道配置一样的gps提供者提供的数据,app/productFlavors/fPadLenovo.gradle GPS_PROVIDER 0-Android系统，1-工控机，2-OBU FunctionBuildConfig.gpsProvider = BuildConfig.GPS_PROVIDER; // 配置BuglyAppID diff --git a/core/function-impl/mogo-core-function-hmi/build.gradle b/core/function-impl/mogo-core-function-hmi/build.gradle index 19d9a3c571..5f71ecce56 100644 --- a/core/function-impl/mogo-core-function-hmi/build.gradle +++ b/core/function-impl/mogo-core-function-hmi/build.gradle @@ -56,6 +56,7 @@ dependencies { implementation rootProject.ext.dependencies.androidxrecyclerview implementation rootProject.ext.dependencies.modulecommon + implementation rootProject.ext.dependencies.mogo_core_res implementation rootProject.ext.dependencies.mogo_core_data implementation rootProject.ext.dependencies.mogo_core_utils implementation rootProject.ext.dependencies.mogo_core_network @@ -64,6 +65,7 @@ dependencies { implementation project(':modules:mogo-module-common') implementation project(':services:mogo-service-api') + implementation project(':core:mogo-core-res') implementation project(':core:mogo-core-data') implementation project(':core:mogo-core-utils') implementation project(':core:mogo-core-function-api') diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt index ca42c8ac2b..249a07380e 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt @@ -19,6 +19,7 @@ import com.mogo.eagle.core.function.hmi.notification.enums.SidePattern import com.mogo.eagle.core.function.hmi.ui.notice.NoticeBannerView import com.mogo.eagle.core.function.hmi.ui.notice.NoticeFloatView import com.mogo.eagle.core.function.hmi.ui.widget.V2XNotificationView +import com.mogo.eagle.core.widget.media.video.SimpleVideoPlayer import com.mogo.module.common.enums.EventTypeEnum import com.mogo.utils.logger.Logger import kotlinx.android.synthetic.main.fragment_hmi.* 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 88b5c7df2e..a12050ef61 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 @@ -50,25 +50,8 @@ public class DebugConfig { */ public static final int NET_MODE_RELEASE = 3; - private static int sNetMode = NET_MODE_RELEASE; - /** - * 不使用语音助手 - */ - public static final int AI_TYPE_NOOP = 0; - - /** - * 语音使用同行者 - */ - public static final int AI_TYPE_TXZ = 1; - /** - * 语音使用思必驰 - */ - public static final int AI_TYPE_SPEECH = 2; - - private static final int sAIType = AI_TYPE_TXZ; - /** * 自研车机 */ @@ -189,16 +172,6 @@ public class DebugConfig { DebugConfig.sRequestOnlineCarData = sRequestOnlineCarData; } - public static boolean sUseCustomMap = true; - - public static boolean isUseCustomMap() { - return sUseCustomMap; - } - - public static void setUseCustomMap(boolean sUseCustomMap) { - DebugConfig.sUseCustomMap = sUseCustomMap; - } - /** * 是否支持临时激活小智 */ @@ -247,59 +220,6 @@ public class DebugConfig { return sSocketAppId; } - /** - * 道路事件动画 - */ - private static boolean sRoadEventAnimated = false; - - public static boolean isRoadEventAnimated() { - return sRoadEventAnimated; - } - - public static void setRoadEventAnimated(boolean sRoadEventAnimated) { - DebugConfig.sRoadEventAnimated = sRoadEventAnimated; - } - - - private static boolean sLoadGuideModule = false; - - public static void setLoadGuideModule(boolean sLoadGuideModule) { - DebugConfig.sLoadGuideModule = sLoadGuideModule; - } - - public static boolean isLoadGuideModule() { - return sLoadGuideModule; - } - - public static String SP_GUIDE = "SP_GUIDE_2020_09_09"; - - public static String getSpGuide() { - return SP_GUIDE; - } - - private static boolean isSkinSupported = false; - - public static void setSkinSupported(boolean isSkinSupported) { - DebugConfig.isSkinSupported = isSkinSupported; - } - - public static boolean isSkinSupported() { - return isSkinSupported; - } - - /** - * 是否支持支持查询导航目的地车友信息 - */ - private static boolean isSupportedSearchDestinationOnlineCarList = false; - - public static void setSupportedSearchDestinationOnlineCarList(boolean isSupportedSearchDestinationOnlineCarList) { - DebugConfig.isSupportedSearchDestinationOnlineCarList = isSupportedSearchDestinationOnlineCarList; - } - - public static boolean isSupportedSearchDestinationOnlineCarList() { - return isSupportedSearchDestinationOnlineCarList; - } - /** * 是否支持目的地导航推送策略 */ @@ -362,15 +282,6 @@ public class DebugConfig { DebugConfig.isMapBased = isMapBased; } - private static boolean isNeedLoadGuideModule = false; - - public static void setNeedLoadGuideModule(boolean isNeedLoadGuideModule) { - DebugConfig.isNeedLoadGuideModule = isNeedLoadGuideModule; - } - - public static boolean isNeedLoadGuideModule() { - return isNeedLoadGuideModule; - } private static boolean isNeedHideAdasWhenShare = false; @@ -395,56 +306,10 @@ public class DebugConfig { DebugConfig.sIsNeedUploadCoordinatesInTime = sIsNeedUploadCoordinatesInTime; } - /** - * 是否使用工控机定位数据作为自车上报数据 - */ - private static boolean sIsNeedRequestFloatPermission = true; - - public static boolean isNeedRequestFloatPermission() { - return sIsNeedRequestFloatPermission; - } - - public static void setNeedRequestFloatPermission(boolean sIsNeedRequestFloatPermission) { - DebugConfig.sIsNeedRequestFloatPermission = sIsNeedRequestFloatPermission; - } - - /** - * 是否需要请求权限 - */ - private static boolean sIsUseAdasRtkLocationInfo = false; - - public static boolean isUseAdasRtkLocationInfo() { - return sIsUseAdasRtkLocationInfo; - } - - public static void setUseAdasRtkLocationInfo(boolean sIsUseAdasRtkLocationInfo) { - DebugConfig.sIsUseAdasRtkLocationInfo = sIsUseAdasRtkLocationInfo; - } - - public static boolean sIsNotSmooth = false; - - public static boolean isNotSmooth() { - return sIsNotSmooth; - } - - public static void setNotSmooth(boolean sIsNotSmooth) { - DebugConfig.sIsNotSmooth = sIsNotSmooth; - } - public static boolean isOCHModule() { return sProductFlavor != null && sProductFlavor.startsWith("foch"); } - public static int sSelfCarSpeedYOffset = 20; - - public static void setSelfCarSpeedYOffset(int sSelfCarSpeedYOffset) { - DebugConfig.sSelfCarSpeedYOffset = sSelfCarSpeedYOffset; - } - - public static int getSelfCarSpeedYOffset() { - return sSelfCarSpeedYOffset; - } - // 环境状态 public static final int sLocation = 0; public static final int sAdasRecognized = 1; diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/RoadConditionDrawer.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/RoadConditionDrawer.java index 2bfb249fbe..85d356b710 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/RoadConditionDrawer.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/RoadConditionDrawer.java @@ -90,11 +90,7 @@ class RoadConditionDrawer { // mogoMarker.setInfoWindowAdapter( new RoadConditionInfoWindow3DAdapter( markerShowEntity, AbsMogoApplication.getApp(), mogoMarker.getMogoMarkerOptions() ) ); // mogoMarker.showInfoWindow(); } else { - if ( DebugConfig.isRoadEventAnimated() ) { - post2AddAndStartAnimation( markerShowEntity, i * 100L, listener ); - } else { - mogoMarker = MarkerDrawer.getInstance().drawMapMarkerImpl( markerShowEntity, false, MarkerDrawer.MARKER_Z_INDEX_HIGH, listener ); - } + post2AddAndStartAnimation( markerShowEntity, i * 100L, listener ); } } catch ( Exception e ) { e.printStackTrace(); diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/SPConst.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/SPConst.java index f20e587a51..36ed5551d0 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/SPConst.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/SPConst.java @@ -1,13 +1,11 @@ package com.mogo.module.common.utils; -import com.mogo.commons.debug.DebugConfig; - /** * 多模块之间SP状态公共类 */ public class SPConst { - private static String SP_GUIDE = DebugConfig.SP_GUIDE; + private static String SP_GUIDE = "SP_GUIDE_2020_09_09"; //用于多模块之间引导状态判断 public static String getSpGuide() { 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 e0bb75d2e2..b358c88c7c 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 @@ -1,7 +1,6 @@ package com.mogo.module.extensions.entrance; 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; @@ -473,15 +472,8 @@ public class EntranceFragment extends MvpFragment { try { @@ -595,9 +591,6 @@ public class MockIntentHandler implements IntentHandler { .rotate((float) 358.526123); IMogoMarker marker3 = MogoApisHandler.getInstance().getApis().getMapServiceApi().getMarkerManager(context).addMarker(DataTypes.TYPE_MARKER_ADAS, options3); break; - case 50:// - DebugConfig.setSelfCarSpeedYOffset(intent.getIntExtra("yOffset", 20)); - break; case 51:// 模拟路口车辆移动 // mLocationMockHandler.sendEmptyMessageDelayed(100, 0L); // mLocationMockHandler.sendEmptyMessageDelayed(101, 1000L); diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java index 876522bd4c..e0c03b81f9 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java @@ -325,7 +325,7 @@ public class MapMarkerManager implements IMogoMarkerClickListener, } if (!MarkerServiceHandler.getApis().getStatusManagerApi().isVrMode()) { MarkerServiceHandler.getMogoStatusManager().setUserInteractionStatus(TAG, true, false); - MarkerServiceHandler.getMapUIController().moveToCenter(mogoMarker.getPosition(), DebugConfig.isRoadEventAnimated()); + MarkerServiceHandler.getMapUIController().moveToCenter(mogoMarker.getPosition(), true); } }