diff --git a/app/build.gradle b/app/build.gradle index a590264328..f2d477d65d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -76,6 +76,9 @@ android { f8xxLauncherOnlineRelease { manifest.srcFile 'src/f8xxLauncherOnlineRelease/AndroidManifest.xml' } + fPadLenovoLauncherOnlineRelease { + manifest.srcFile 'src/f8xxLauncherOnlineRelease/AndroidManifest.xml' + } } flavorDimensions "product", "basic", "env" @@ -219,6 +222,35 @@ android { // 是否需要使用工控机的rtk定位 buildConfigField 'boolean', 'IS_USE_ADAS_RTK_LOCATION_INFO', 'true' } + // 衡阳-联想Pad + fPadLenovo { + // 应用包名 + applicationId rootProject.ext.android.fLauncherApplicationId + dimension "product" + 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: "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' + // 是否加载引导模块 + buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'false' + // 分享时是否隐藏 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' + } // f系列-分体机 phone { // 应用包名 diff --git a/app/functions/abiFilters.gradle b/app/functions/abiFilters.gradle index 902b1c2463..8243a5905d 100644 --- a/app/functions/abiFilters.gradle +++ b/app/functions/abiFilters.gradle @@ -28,6 +28,15 @@ project.android.productFlavors { } } } + // 联想Pad + fPadLenovo { + externalNativeBuild { + ndk { + // 设置支持的SO库架构 + abiFilters "arm64-v8a" + } + } + } // f系列-分体机 f80x { externalNativeBuild { diff --git a/app/functions/aicloudservices.gradle b/app/functions/aicloudservices.gradle index 86edbe53e4..a50fc6fae7 100644 --- a/app/functions/aicloudservices.gradle +++ b/app/functions/aicloudservices.gradle @@ -12,6 +12,7 @@ project.dependencies { em4Implementation rootProject.ext.dependencies.mogoaicloudserviceapk e8xxImplementation rootProject.ext.dependencies.mogoaicloudserviceapk f8xxImplementation rootProject.ext.dependencies.mogoaicloudserviceapk + fPadLenovoImplementation rootProject.ext.dependencies.mogoaicloudserviceapk f80xImplementation rootProject.ext.dependencies.mogoaicloudserviceapk f8AmapImplementation rootProject.ext.dependencies.mogoaicloudserviceapk em3Implementation rootProject.ext.dependencies.mogoaicloudserviceapk @@ -29,6 +30,7 @@ project.dependencies { em4Implementation project(':foudations:mogo-aicloud-services-apk') e8xxImplementation project(':foudations:mogo-aicloud-services-apk') f8xxImplementation project(':foudations:mogo-aicloud-services-apk') + fPadLenovoImplementation project(':foudations:mogo-aicloud-services-apk') f80xImplementation project(':foudations:mogo-aicloud-services-apk') f8AmapImplementation project(':foudations:mogo-aicloud-services-apk') em3Implementation project(':foudations:mogo-aicloud-services-apk') diff --git a/app/functions/basedmap.gradle b/app/functions/basedmap.gradle index 5b2d05f88c..320d8a4e27 100644 --- a/app/functions/basedmap.gradle +++ b/app/functions/basedmap.gradle @@ -4,6 +4,7 @@ project.dependencies { if (Boolean.valueOf(RELEASE)) { f8xxImplementation rootProject.ext.dependencies.mapcustom + fPadLenovoImplementation rootProject.ext.dependencies.mapcustom f80xImplementation rootProject.ext.dependencies.mapcustom fochtaxiImplementation rootProject.ext.dependencies.mapcustom fochbusImplementation rootProject.ext.dependencies.mapcustom @@ -22,6 +23,7 @@ project.dependencies { em3Implementation rootProject.ext.dependencies.mapamap } else { f8xxImplementation project(':libraries:map-custom') + fPadLenovoImplementation project(':libraries:map-custom') f80xImplementation project(':libraries:map-custom') fochtaxiImplementation project(':libraries:map-custom') fochbusImplementation project(':libraries:map-custom') diff --git a/app/functions/baseservices.gradle b/app/functions/baseservices.gradle index e05e0aad93..f5a0f534a5 100644 --- a/app/functions/baseservices.gradle +++ b/app/functions/baseservices.gradle @@ -13,6 +13,7 @@ project.dependencies { em4Implementation rootProject.ext.dependencies.mogobaseserviceapk e8xxImplementation rootProject.ext.dependencies.mogobaseserviceapk f8xxImplementation rootProject.ext.dependencies.mogobaseserviceapk + fPadLenovoImplementation rootProject.ext.dependencies.mogobaseserviceapk f80xImplementation rootProject.ext.dependencies.mogobaseserviceapk f8AmapImplementation rootProject.ext.dependencies.mogobaseserviceapk em3Implementation rootProject.ext.dependencies.mogobaseserviceapk @@ -30,6 +31,7 @@ project.dependencies { em4Implementation project(':foudations:mogo-base-services-apk') e8xxImplementation project(':foudations:mogo-base-services-apk') f8xxImplementation project(':foudations:mogo-base-services-apk') + fPadLenovoImplementation project(':foudations:mogo-base-services-apk') f80xImplementation project(':foudations:mogo-base-services-apk') f8AmapImplementation project(':foudations:mogo-base-services-apk') em3Implementation project(':foudations:mogo-base-services-apk') diff --git a/app/functions/bizguide.gradle b/app/functions/bizguide.gradle index 778393ab43..3ac507dd4a 100644 --- a/app/functions/bizguide.gradle +++ b/app/functions/bizguide.gradle @@ -9,6 +9,7 @@ project.dependencies { em4Implementation rootProject.ext.dependencies.mogomoduleguide e8xxImplementation rootProject.ext.dependencies.mogomoduleguide f8xxImplementation rootProject.ext.dependencies.mogomoduleguide + fPadLenovoImplementation rootProject.ext.dependencies.mogomoduleguide f80xImplementation rootProject.ext.dependencies.mogomoduleguide f8AmapImplementation rootProject.ext.dependencies.mogomoduleguide em3Implementation rootProject.ext.dependencies.mogomoduleguide @@ -22,6 +23,7 @@ project.dependencies { em4Implementation project(':modules:mogo-module-guide') e8xxImplementation project(':modules:mogo-module-guide') f8xxImplementation project(':modules:mogo-module-guide') + fPadLenovoImplementation project(':modules:mogo-module-guide') f80xImplementation project(':modules:mogo-module-guide') f8AmapImplementation project(':modules:mogo-module-guide') em3Implementation project(':modules:mogo-module-guide') diff --git a/app/functions/leftpanel.gradle b/app/functions/leftpanel.gradle index eab467b173..8fbdf3da82 100644 --- a/app/functions/leftpanel.gradle +++ b/app/functions/leftpanel.gradle @@ -13,6 +13,7 @@ project.dependencies { e8xxImplementation rootProject.ext.dependencies.moduleleftpanelnoop e8xxImplementation rootProject.ext.dependencies.moduleleftpanelnoop f8xxImplementation rootProject.ext.dependencies.moduleleftpanelnoop + fPadLenovoImplementation rootProject.ext.dependencies.moduleleftpanelnoop f80xImplementation rootProject.ext.dependencies.moduleleftpanelnoop f8AmapImplementation rootProject.ext.dependencies.moduleleftpanelnoop em3Implementation rootProject.ext.dependencies.moduleleftpanelnoop @@ -30,6 +31,7 @@ project.dependencies { em4Implementation project(':modules:mogo-module-left-panel-noop') e8xxImplementation project(':modules:mogo-module-left-panel-noop') f8xxImplementation project(':modules:mogo-module-left-panel-noop') + fPadLenovoImplementation project(':modules:mogo-module-left-panel-noop') f80xImplementation project(':modules:mogo-module-left-panel-noop') f8AmapImplementation project(':modules:mogo-module-left-panel-noop') em3Implementation project(':modules:mogo-module-left-panel-noop') diff --git a/app/functions/och.gradle b/app/functions/och.gradle index 097bd40f7b..2a4c8dd1fc 100644 --- a/app/functions/och.gradle +++ b/app/functions/och.gradle @@ -10,6 +10,7 @@ project.dependencies { d8xxImplementation rootProject.ext.dependencies.mogoochnoop d80xImplementation rootProject.ext.dependencies.mogoochnoop f8xxImplementation rootProject.ext.dependencies.mogoochnoop + fPadLenovoImplementation rootProject.ext.dependencies.mogoochnoop f80xImplementation rootProject.ext.dependencies.mogoochnoop f8AmapImplementation rootProject.ext.dependencies.mogoochnoop em4Implementation rootProject.ext.dependencies.mogoochnoop @@ -26,6 +27,7 @@ project.dependencies { d8xxImplementation project(':OCH:mogo-och-noop') d80xImplementation project(':OCH:mogo-och-noop') f8xxImplementation project(':OCH:mogo-och-noop') + fPadLenovoImplementation project(':OCH:mogo-och-noop') f80xImplementation project(':OCH:mogo-och-noop') f8AmapImplementation project(':OCH:mogo-och-noop') em4Implementation project(':OCH:mogo-och-noop') diff --git a/app/functions/skin.gradle b/app/functions/skin.gradle index 039502982f..0d5cbb0ef0 100644 --- a/app/functions/skin.gradle +++ b/app/functions/skin.gradle @@ -10,6 +10,7 @@ project.dependencies { d8xxImplementation rootProject.ext.dependencies.skinsupportimpl d80xImplementation rootProject.ext.dependencies.skinsupportimpl f8xxImplementation rootProject.ext.dependencies.skinsupportimpl + fPadLenovoImplementation rootProject.ext.dependencies.skinsupportimpl f80xImplementation rootProject.ext.dependencies.skinsupportimpl f8AmapImplementation rootProject.ext.dependencies.skinsupportimpl em4Implementation rootProject.ext.dependencies.skinsupportimpl @@ -19,6 +20,7 @@ project.dependencies { phoneImplementation rootProject.ext.dependencies.skinsupportimpl f8xxImplementation rootProject.ext.dependencies.skinsupportlight + fPadLenovoImplementation rootProject.ext.dependencies.skinsupportlight f80xImplementation rootProject.ext.dependencies.skinsupportlight f8AmapImplementation rootProject.ext.dependencies.skinsupportlight em4Implementation rootProject.ext.dependencies.skinsupportlight @@ -42,6 +44,7 @@ project.dependencies { d8xxImplementation project(':skin:mogo-skin-support-impl') d80xImplementation project(':skin:mogo-skin-support-impl') f8xxImplementation project(':skin:mogo-skin-support-impl') + fPadLenovoImplementation project(':skin:mogo-skin-support-impl') f80xImplementation project(':skin:mogo-skin-support-impl') f8AmapImplementation project(':skin:mogo-skin-support-impl') em4Implementation project(':skin:mogo-skin-support-impl') @@ -51,6 +54,7 @@ project.dependencies { phoneImplementation project(':skin:mogo-skin-support-impl') f8xxImplementation project(':skin:mogo-skin-light') + fPadLenovoImplementation project(':skin:mogo-skin-light') f80xImplementation project(':skin:mogo-skin-light') f8AmapImplementation project(':skin:mogo-skin-light') em4Implementation project(':skin:mogo-skin-light') diff --git a/app/functions/tts.gradle b/app/functions/tts.gradle index 587ffe263d..17412804cd 100644 --- a/app/functions/tts.gradle +++ b/app/functions/tts.gradle @@ -8,6 +8,7 @@ project.dependencies { d8xxImplementation rootProject.ext.dependencies.ttszhi d80xImplementation rootProject.ext.dependencies.ttszhi f8xxImplementation rootProject.ext.dependencies.ttszhi + fPadLenovoImplementation rootProject.ext.dependencies.ttszhi f80xImplementation rootProject.ext.dependencies.ttszhi f8AmapImplementation rootProject.ext.dependencies.ttszhi em4Implementation rootProject.ext.dependencies.ttszhi @@ -24,6 +25,7 @@ project.dependencies { d8xxImplementation project(':tts:tts-zhi') d80xImplementation project(':tts:tts-zhi') f8xxImplementation project(':tts:tts-zhi') + fPadLenovoImplementation project(':tts:tts-zhi') f80xImplementation project(':tts:tts-zhi') f8AmapImplementation project(':tts:tts-zhi') em4Implementation project(':tts:tts-zhi') diff --git a/app/regroup.gradle b/app/regroup.gradle index a7e280d8bd..e3632ceefd 100644 --- a/app/regroup.gradle +++ b/app/regroup.gradle @@ -3,7 +3,7 @@ afterEvaluate { def independent = ["em3", "em1", "d80x", "d82x", "bydauto", "em2", "phone"] - def launcher = ["f80x", "f8xx", "f8amap", "em4", "e8xx", "fochtaxi", "fochbus"] + def launcher = ["f80x", "f8xx", "f8amap", "em4", "e8xx", "fochtaxi", "fochbus", "fPadLenovo"] it.getTasks().iterator().forEachRemaining { def task = it 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 0868458787..950990eed4 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 @@ -79,6 +79,11 @@ public class DebugConfig { */ public static final int CAR_MACHINE_TYPE_BYD = 1; + /** + * 联想PAD + */ + public static final int CAR_MACHINE_TYPE_LENOVO = 2; + private static int sCarMachineType = CAR_MACHINE_TYPE_SELF_INNOVATE; /** @@ -471,10 +476,10 @@ public class DebugConfig { return result; } - public synchronized static String getStatusData(int type){ - if(type > 4){ + public synchronized static String getStatusData(int type) { + if (type > 4) { return sStatus[type].toString(); - }else{ + } else { return "0"; } }