增加了联想渠道-出租车，小巴车

2021-05-17 17:37:02 +08:00
parent 5ea0007c55
commit 552b0d8592
11 changed files with 114 additions and 2 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -229,7 +229,7 @@ android {
            dimension "product"
            buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'false'
            // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0
-            buildConfigField 'int', 'CAR_MACHINE_TYPE', '2'
+            buildConfigField 'int', 'CAR_MACHINE_TYPE', '0'
            buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'true'
            manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue,CHANNEL_VALUE: "f8xx"]
            // 是否使用高德sdk自定义导航
@@ -251,6 +251,64 @@ android {
            // 是否需要使用工控机的rtk定位
            buildConfigField 'boolean', 'IS_USE_ADAS_RTK_LOCATION_INFO', 'true'
        }
+        // f系列-网约车-出租车
+        fPadLenovoOchTaxi {
+            // 应用包名
+            applicationId rootProject.ext.android.fLauncherApplicationId
+            dimension "product"
+            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'
+            // 是否加载引导模块
+            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系列-网约车-小巴车
+        fPadLenovoOchBus {
+            // 应用包名
+            applicationId rootProject.ext.android.fLauncherApplicationId
+            dimension "product"
+            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'
+            // 是否加载引导模块
+            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 {
            // 应用包名
--- a/app/functions/abiFilters.gradle
+++ b/app/functions/abiFilters.gradle
@@ -37,6 +37,24 @@ project.android.productFlavors {
            }
        }
    }
+    // 联想Pad
+    fPadLenovoOchTaxi {
+        externalNativeBuild {
+            ndk {
+                // 设置支持的SO库架构
+                abiFilters "arm64-v8a"
+            }
+        }
+    }
+    // 联想Pad
+    fPadLenovoOchBus {
+        externalNativeBuild {
+            ndk {
+                // 设置支持的SO库架构
+                abiFilters "arm64-v8a"
+            }
+        }
+    }
    // f系列-分体机
    f80x {
        externalNativeBuild {
--- a/app/functions/aicloudservices.gradle
+++ b/app/functions/aicloudservices.gradle
@@ -18,6 +18,8 @@ project.dependencies {
        em3Implementation rootProject.ext.dependencies.mogoaicloudserviceapk
        fochtaxiImplementation rootProject.ext.dependencies.mogoaicloudserviceapk
        fochbusImplementation rootProject.ext.dependencies.mogoaicloudserviceapk
+        fPadLenovoOchTaxi rootProject.ext.dependencies.mogoaicloudserviceapk
+        fPadLenovoOchBus  rootProject.ext.dependencies.mogoaicloudserviceapk
    } else {
        bydautoImplementation project(':foudations:mogo-aicloud-services-sdk')
        phoneImplementation project(':foudations:mogo-aicloud-services-sdk')
@@ -36,5 +38,7 @@ project.dependencies {
        em3Implementation project(':foudations:mogo-aicloud-services-apk')
        fochtaxiImplementation project(':foudations:mogo-aicloud-services-apk')
        fochbusImplementation project(':foudations:mogo-aicloud-services-apk')
+        fPadLenovoOchTaxiImplementation project(':foudations:mogo-aicloud-services-apk')
+        fPadLenovoOchBusImplementation project(':foudations:mogo-aicloud-services-apk')
    }
 }
--- a/app/functions/basedmap.gradle
+++ b/app/functions/basedmap.gradle
@@ -8,6 +8,8 @@ project.dependencies {
        f80xImplementation rootProject.ext.dependencies.mapcustom
        fochtaxiImplementation rootProject.ext.dependencies.mapcustom
        fochbusImplementation rootProject.ext.dependencies.mapcustom
+        fPadLenovoOchTaxi rootProject.ext.dependencies.mapcustom
+        fPadLenovoOchBus  rootProject.ext.dependencies.mapcustom
        phoneImplementation rootProject.ext.dependencies.mapcustom

        f8AmapImplementation rootProject.ext.dependencies.mapamap
@@ -27,6 +29,8 @@ project.dependencies {
        f80xImplementation project(':libraries:map-custom')
        fochtaxiImplementation project(':libraries:map-custom')
        fochbusImplementation project(':libraries:map-custom')
+        fPadLenovoOchTaxiImplementation project(':libraries:map-custom')
+        fPadLenovoOchBusImplementation project(':libraries:map-custom')
        phoneImplementation project(':libraries:map-custom')

        f8AmapImplementation project(':libraries:map-amap')
--- a/app/functions/baseservices.gradle
+++ b/app/functions/baseservices.gradle
@@ -19,6 +19,8 @@ project.dependencies {
        em3Implementation rootProject.ext.dependencies.mogobaseserviceapk
        fochtaxiImplementation rootProject.ext.dependencies.mogobaseserviceapk
        fochbusImplementation rootProject.ext.dependencies.mogobaseserviceapk
+        fPadLenovoOchTaxi rootProject.ext.dependencies.mogobaseserviceapk
+        fPadLenovoOchBus  rootProject.ext.dependencies.mogobaseserviceapk
    } else {
        bydautoImplementation project(':foudations:mogo-base-services-sdk')
        phoneImplementation project(':foudations:mogo-base-services-sdk')
@@ -37,5 +39,7 @@ project.dependencies {
        em3Implementation project(':foudations:mogo-base-services-apk')
        fochtaxiImplementation project(':foudations:mogo-base-services-apk')
        fochbusImplementation project(':foudations:mogo-base-services-apk')
+        fPadLenovoOchTaxiImplementation project(':foudations:mogo-base-services-apk')
+        fPadLenovoOchBusImplementation project(':foudations:mogo-base-services-apk')
    }
 }
--- a/app/functions/bizguide.gradle
+++ b/app/functions/bizguide.gradle
@@ -15,6 +15,8 @@ project.dependencies {
        em3Implementation rootProject.ext.dependencies.mogomoduleguide
        fochtaxiImplementation rootProject.ext.dependencies.mogomoduleguide
        fochbusImplementation rootProject.ext.dependencies.mogomoduleguide
+        fPadLenovoOchTaxi rootProject.ext.dependencies.mogomoduleguide
+        fPadLenovoOchBus rootProject.ext.dependencies.mogomoduleguide
    } else {
        bydautoImplementation project(':modules:mogo-module-guide')
        phoneImplementation project(':modules:mogo-module-guide')
@@ -29,5 +31,7 @@ project.dependencies {
        em3Implementation project(':modules:mogo-module-guide')
        fochtaxiImplementation project(':modules:mogo-module-guide')
        fochbusImplementation project(':modules:mogo-module-guide')
+        fPadLenovoOchTaxiImplementation project(':modules:mogo-module-guide')
+        fPadLenovoOchBusImplementation project(':modules:mogo-module-guide')
    }
 }
--- a/app/functions/leftpanel.gradle
+++ b/app/functions/leftpanel.gradle
@@ -19,6 +19,8 @@ project.dependencies {
        em3Implementation rootProject.ext.dependencies.moduleleftpanelnoop
        fochtaxiImplementation rootProject.ext.dependencies.moduleleftpanelnoop
        fochbusImplementation rootProject.ext.dependencies.moduleleftpanelnoop
+        fPadLenovoOchTaxi rootProject.ext.dependencies.moduleleftpanelnoop
+        fPadLenovoOchBus  rootProject.ext.dependencies.moduleleftpanelnoop
        phoneImplementation rootProject.ext.dependencies.moduleleftpanelnoop
    } else {
        bydautoImplementation project(':modules:mogo-module-left-panel')
@@ -37,6 +39,8 @@ project.dependencies {
        em3Implementation project(':modules:mogo-module-left-panel-noop')
        fochtaxiImplementation project(':modules:mogo-module-left-panel-noop')
        fochbusImplementation project(':modules:mogo-module-left-panel-noop')
+        fPadLenovoOchTaxiImplementation project(':modules:mogo-module-left-panel-noop')
+        fPadLenovoOchBusImplementation project(':modules:mogo-module-left-panel-noop')
        phoneImplementation project(':modules:mogo-module-left-panel-noop')
    }
 }
--- a/app/functions/och.gradle
+++ b/app/functions/och.gradle
@@ -17,6 +17,8 @@ project.dependencies {
        e8xxImplementation rootProject.ext.dependencies.mogoochnoop
        fochtaxiImplementation rootProject.ext.dependencies.mogoochtaxi
        fochbusImplementation rootProject.ext.dependencies.mogoochbus
+        fPadLenovoOchTaxi rootProject.ext.dependencies.mogoochtaxi
+        fPadLenovoOchBus  rootProject.ext.dependencies.mogoochbus
    } else {
        bydautoImplementation project(':OCH:mogo-och-noop')
        phoneImplementation project(':OCH:mogo-och-noop')
@@ -34,5 +36,7 @@ project.dependencies {
        e8xxImplementation project(':OCH:mogo-och-noop')
        fochtaxiImplementation project(':OCH:mogo-och-taxi')
        fochbusImplementation project(':OCH:mogo-och-bus')
+        fPadLenovoOchTaxiImplementation project(':OCH:mogo-och-taxi')
+        fPadLenovoOchBusImplementation project(':OCH:mogo-och-bus')
    }
 }
--- a/app/functions/skin.gradle
+++ b/app/functions/skin.gradle
@@ -17,6 +17,8 @@ project.dependencies {
        e8xxImplementation rootProject.ext.dependencies.skinsupportimpl
        fochtaxiImplementation rootProject.ext.dependencies.skinsupportimpl
        fochbusImplementation rootProject.ext.dependencies.skinsupportimpl
+        fPadLenovoOchTaxi rootProject.ext.dependencies.skinsupportimpl
+        fPadLenovoOchBus  rootProject.ext.dependencies.skinsupportimpl
        phoneImplementation rootProject.ext.dependencies.skinsupportimpl

        f8xxImplementation rootProject.ext.dependencies.skinsupportlight
@@ -30,6 +32,8 @@ project.dependencies {
        em3Implementation rootProject.ext.dependencies.skinsupportlight
        fochtaxiImplementation rootProject.ext.dependencies.skinsupportlight
        fochbusImplementation rootProject.ext.dependencies.skinsupportlight
+        fPadLenovoOchTaxi rootProject.ext.dependencies.skinsupportlight
+        fPadLenovoOchBus  rootProject.ext.dependencies.skinsupportlight
        phoneImplementation rootProject.ext.dependencies.skinsupportlight
    } else {

@@ -51,6 +55,8 @@ project.dependencies {
        e8xxImplementation project(':skin:mogo-skin-support-impl')
        fochtaxiImplementation project(':skin:mogo-skin-support-impl')
        fochbusImplementation project(':skin:mogo-skin-support-impl')
+        fPadLenovoOchTaxiImplementation project(':skin:mogo-skin-support-impl')
+        fPadLenovoOchBusImplementation project(':skin:mogo-skin-support-impl')
        phoneImplementation project(':skin:mogo-skin-support-impl')

        f8xxImplementation project(':skin:mogo-skin-light')
@@ -64,6 +70,8 @@ project.dependencies {
        em3Implementation project(':skin:mogo-skin-light')
        fochtaxiImplementation project(':skin:mogo-skin-light')
        fochbusImplementation project(':skin:mogo-skin-light')
+        fPadLenovoOchTaxiImplementation project(':skin:mogo-skin-light')
+        fPadLenovoOchBusImplementation project(':skin:mogo-skin-light')
        phoneImplementation project(':skin:mogo-skin-light')
    }
 }
--- a/app/functions/tts.gradle
+++ b/app/functions/tts.gradle
@@ -15,6 +15,8 @@ project.dependencies {
        e8xxImplementation rootProject.ext.dependencies.ttszhi
        fochtaxiImplementation rootProject.ext.dependencies.ttszhi
        fochbusImplementation rootProject.ext.dependencies.ttszhi
+        fPadLenovoOchTaxi rootProject.ext.dependencies.ttszhi
+        fPadLenovoOchBus  rootProject.ext.dependencies.ttszhi
        phoneImplementation rootProject.ext.dependencies.ttszhi
    } else {
        bydautoImplementation project(':tts:tts-di')
@@ -32,6 +34,8 @@ project.dependencies {
        e8xxImplementation project(':tts:tts-zhi')
        fochtaxiImplementation project(':tts:tts-zhi')
        fochbusImplementation project(':tts:tts-zhi')
+        fPadLenovoOchTaxiImplementation project(':tts:tts-zhi')
+        fPadLenovoOchBusImplementation project(':tts:tts-zhi')
        phoneImplementation project(':tts:tts-zhi')
    }
 }
--- 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", "fPadLenovo"]
+    def launcher = ["f80x", "f8xx", "f8amap", "em4", "e8xx", "fochtaxi", "fochbus", "fPadLenovo", "fPadLenovoOchTaxi", "fPadLenovoOchBus"]

    it.getTasks().iterator().forEachRemaining {
        def task = it