diff --git a/app/build.gradle b/app/build.gradle index 0040aef083..2acfc15306 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -46,8 +46,8 @@ android { zipAlignEnabled false shrinkResources false signingConfig signingConfigs.release - manifestPlaceholders =[ - MAP_SDK_VERSION : properties.getProperty("MAP_SDK_VERSION") + manifestPlaceholders = [ + MAP_SDK_VERSION: properties.getProperty("MAP_SDK_VERSION") ] } release { @@ -56,8 +56,8 @@ android { shrinkResources false signingConfig signingConfigs.release proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - manifestPlaceholders =[ - MAP_SDK_VERSION : properties.getProperty("MAP_SDK_VERSION") + manifestPlaceholders = [ + MAP_SDK_VERSION: properties.getProperty("MAP_SDK_VERSION") ] } } @@ -140,6 +140,8 @@ android { 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' } // f系列-网约车-小巴车 fochbus { @@ -152,7 +154,7 @@ android { // 车机类型,主要用于区分自研车机还是别人家的车机,自研车机类型为0 buildConfigField 'int', 'CAR_MACHINE_TYPE', '0' buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'true' - manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue,CHANNEL_VALUE: "fochbus"] + manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue, CHANNEL_VALUE: "fochbus"] // 是否使用高德sdk自定义导航 buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'false' // 是否支持换肤 @@ -171,6 +173,8 @@ android { 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' } // f系列-分体机全系列,未细分 f8xx { @@ -183,7 +187,7 @@ android { // 车机类型,主要用于区分自研车机还是别人家的车机,自研车机类型为0 buildConfigField 'int', 'CAR_MACHINE_TYPE', '0' buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'true' - manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue,CHANNEL_VALUE: "f8xx"] + manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue, CHANNEL_VALUE: "f8xx"] // 是否使用高德sdk自定义导航 buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'false' // 是否支持换肤 @@ -202,6 +206,8 @@ android { 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' } // f系列-分体机 f80x { @@ -233,6 +239,8 @@ android { 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' } // 衡阳-联想Pad fPadLenovo { @@ -245,7 +253,7 @@ android { // 车机类型,主要用于区分自研车机还是别人家的车机,自研车机类型为0 buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'true' - manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue,CHANNEL_VALUE: "fPadLenovo"] + manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue, CHANNEL_VALUE: "fPadLenovo"] // 是否使用高德sdk自定义导航 buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'false' // 是否支持换肤 @@ -264,6 +272,8 @@ android { 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' } // 衡阳-联想Pad-网约车-出租车 fPadLenovoOchTaxi { @@ -295,6 +305,10 @@ android { 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' } // 衡阳-联想Pad-网约车-小巴车 fPadLenovoOchBus { @@ -307,7 +321,7 @@ android { // 车机类型,主要用于区分自研车机还是别人家的车机,自研车机类型为0 buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'true' - manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue,CHANNEL_VALUE: "fPadLenovoOchBus"] + manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue, CHANNEL_VALUE: "fPadLenovoOchBus"] // 是否使用高德sdk自定义导航 buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'false' // 是否支持换肤 @@ -326,6 +340,8 @@ android { 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' } // f系列-分体机 phone { @@ -355,6 +371,8 @@ android { 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' } // f系列-分体机-高德 f8Amap { @@ -386,6 +404,8 @@ android { 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' } // 比亚迪 bydauto { @@ -398,7 +418,7 @@ android { // 车机类型,主要用于区分自研车机还是别人家的车机,其他车机,比亚迪定为1 buildConfigField 'int', 'CAR_MACHINE_TYPE', '1' buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'true' - manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.bydautoIndependentApiValue,CHANNEL_VALUE: "bydauto"] + manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.bydautoIndependentApiValue, CHANNEL_VALUE: "bydauto"] // 是否使用高德sdk自定义导航 buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'true' // 是否支持换肤 @@ -417,6 +437,8 @@ android { buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'false' // 是否需要使用工控机的rtk定位 buildConfigField 'boolean', 'IS_USE_ADAS_RTK_LOCATION_INFO', 'false' + // 是否需要悬浮窗权限申请 + buildConfigField 'boolean', 'IS_NEED_REQUEST_FLOAT_PERMISSION', 'true' } qa { dimension "env" diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index 9ce346e737..f0d4e55412 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -107,6 +107,7 @@ public class MogoApplication extends AbsMogoApplication { 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)); } 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 950990eed4..651cc54f93 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 @@ -399,6 +399,19 @@ public class DebugConfig { /** * 是否使用工控机定位数据作为自车上报数据 */ + 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() {