bus 司机乘客添加接驳flavor

OCH/mogo-och-bus-passenger/build.gradle

@@ -38,6 +38,20 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+    flavorDimensions "product"
+    productFlavors {
+
+        basc {
+            dimension "product"
+            buildConfigField 'int', 'NEW_TEST', '0'
+        }
+
+        // 接驳车
+        shuttle {
+            dimension "product"
+            buildConfigField 'int', 'NEW_TEST', '1'
+        }
+    }
 }
 
 dependencies {

OCH/mogo-och-bus/build.gradle

@@ -38,6 +38,23 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+
+
+    flavorDimensions "product"
+    productFlavors {
+
+        basc {
+            dimension "product"
+            buildConfigField 'int', 'NEW_TEST', '0'
+        }
+
+        // 接驳车
+        shuttle {
+            dimension "product"
+            buildConfigField 'int', 'NEW_TEST', '1'
+        }
+    }
+
 }
 
 dependencies {

app/build.gradle

@@ -226,8 +226,10 @@ android {
     // 配置不同渠道参数，直接影响功能完整度
     apply from: "./productFlavors/fPadLenovo.gradle"
     apply from: "./productFlavors/fPadLenovoOchBus.gradle"
+    apply from: "./productFlavors/fPadLenovoOchBusShuttle.gradle"
     apply from: "./productFlavors/fPadLenovoOchTaxi.gradle"
     apply from: "./productFlavors/fPadLenovoOchBusPassenger.gradle"
+    apply from: "./productFlavors/fPadLenovoOchBusShuttlePassenger.gradle"
     apply from: "./productFlavors/fPadLenovoOchTaxiPassenger.gradle"
     apply from: "./productFlavors/fPadLenovoOchSweeper.gradle"
 

app/functions/och.gradle

@@ -25,6 +25,14 @@ project.dependencies {
             exclude group: 'com.mogo.eagle.core' //by group
             exclude group: 'com.mogo.eagle.core.function' //by group
         }
+        // Bus司机端
+        fPadLenovoOchBusShuttleImplementation(rootProject.ext.dependencies.mogoochbus) {
+            exclude group: 'com.mogo.commons' //by group
+            exclude group: 'com.mogo.module' //by group
+            exclude group: 'com.mogo.map' //by group
+            exclude group: 'com.mogo.eagle.core' //by group
+            exclude group: 'com.mogo.eagle.core.function' //by group
+        }
 
         // Bus乘客端
         fPadLenovoOchBusPassengerImplementation(rootProject.ext.dependencies.mogoochbus) {
@@ -34,6 +42,15 @@ project.dependencies {
             exclude group: 'com.mogo.eagle.core' //by group
             exclude group: 'com.mogo.eagle.core.function' //by group
         }
+        // Bus乘客端
+        fPadLenovoOchBusShuttlePassengerImplementation(rootProject.ext.dependencies.mogoochbus) {
+            exclude group: 'com.mogo.commons' //by group
+            exclude group: 'com.mogo.module' //by group
+            exclude group: 'com.mogo.map' //by group
+            exclude group: 'com.mogo.eagle.core' //by group
+            exclude group: 'com.mogo.eagle.core.function' //by group
+        }
+
 
         // taxi司机端
         fPadLenovoOchTaxiImplementation(rootProject.ext.dependencies.mogoochtaxi) {
@@ -76,6 +93,14 @@ project.dependencies {
             exclude group: 'com.mogo.eagle.core' //by group
             exclude group: 'com.mogo.eagle.core.function' //by group
         }
+        // Bus司机端
+        fPadLenovoOchBusShuttleImplementation (project(':OCH:mogo-och-bus')) {
+            exclude group: 'com.mogo.commons' //by group
+            exclude group: 'com.mogo.module' //by group
+            exclude group: 'com.mogo.map' //by group
+            exclude group: 'com.mogo.eagle.core' //by group
+            exclude group: 'com.mogo.eagle.core.function' //by group
+        }
 
         // Bus乘客端
         fPadLenovoOchBusPassengerImplementation (project(':OCH:mogo-och-bus-passenger')) {
@@ -85,6 +110,14 @@ project.dependencies {
             exclude group: 'com.mogo.eagle.core' //by group
             exclude group: 'com.mogo.eagle.core.function' //by group
         }
+        // Bus乘客端
+        fPadLenovoOchBusShuttlePassengerImplementation (project(':OCH:mogo-och-bus-passenger')) {
+            exclude group: 'com.mogo.commons' //by group
+            exclude group: 'com.mogo.module' //by group
+            exclude group: 'com.mogo.map' //by group
+            exclude group: 'com.mogo.eagle.core' //by group
+            exclude group: 'com.mogo.eagle.core.function' //by group
+        }
 
         // taxi司机端
         fPadLenovoOchTaxiImplementation (project(':OCH:mogo-och-taxi')) {

app/productFlavors/fPadLenovoOchBus.gradle

@@ -14,6 +14,7 @@ project.android.productFlavors {
         // 应用包名
         applicationId rootProject.ext.android.fLauncherApplicationId
         dimension "product"
+        matchingFallbacks = ['basc']
 
         // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0
         buildConfigField 'int', 'CAR_MACHINE_TYPE', '2'

app/productFlavors/fPadLenovoOchBusPassenger.gradle

@@ -12,6 +12,7 @@ project.android.productFlavors {
         // 应用包名
         applicationId rootProject.ext.android.fLauncherApplicationId
         dimension "product"
+        matchingFallbacks = ['basc']
 
         // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0
         buildConfigField 'int', 'CAR_MACHINE_TYPE', '2'

app/productFlavors/fPadLenovoOchBusShuttle.gradle

@@ -0,0 +1,39 @@
+project.android.productFlavors {
+    // 衡阳-联想Pad-网约车-小巴车
+    fPadLenovoOchBusShuttle {
+        externalNativeBuild {
+            ndk {
+                // 设置支持的SO库架构
+                abiFilters "arm64-v8a"
+            }
+        }
+        minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo
+        targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo
+        versionCode rootProject.versionCode as int
+        versionName rootProject.versionName
+        // 应用包名
+        applicationId rootProject.ext.android.fLauncherApplicationId
+        dimension "product"
+        matchingFallbacks = ['shuttle']
+
+        // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0
+        buildConfigField 'int', 'CAR_MACHINE_TYPE', '2'
+        //高德地图鉴权信息
+        manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue, CHANNEL_VALUE: "fPadLenovoOchBus",ACTIVITY_ROOT:true]
+
+        // 是否基于地图
+        buildConfigField 'boolean', 'IS_MAP_BASED', 'true'
+
+        // 是否需要实时上报坐标
+        buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true'
+        // GPS数据提供源： 0-Android系统，1-工控机，2-OBU
+        buildConfigField 'int', 'GPS_PROVIDER', "1"
+
+        // 构建的应用身份类型，出租车0|小巴A-司机｜乘客
+        buildConfigField 'int', 'APP_IDENTITY_MODE', "0xA0"
+        // 连接的工控机IP地址
+        buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\""
+        // 构建的是否是演示（美化）模式
+        buildConfigField 'boolean', 'IS_DEMO_MODE', 'false'
+    }
+}

app/productFlavors/fPadLenovoOchBusShuttlePassenger.gradle

@@ -0,0 +1,37 @@
+project.android.productFlavors {
+    // 衡阳-联想Pad-网约车-小巴车-乘客端
+    fPadLenovoOchBusShuttlePassenger {
+        externalNativeBuild {
+            ndk {
+                // 设置支持的SO库架构
+                abiFilters "arm64-v8a"
+            }
+        }
+        minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo
+        targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo
+        // 应用包名
+        applicationId rootProject.ext.android.fLauncherApplicationId
+        dimension "product"
+        matchingFallbacks = ['shuttle']
+
+        // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0
+        buildConfigField 'int', 'CAR_MACHINE_TYPE', '2'
+        //高德地图鉴权信息
+        manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue, CHANNEL_VALUE: "fPadLenovoOchBusPassenger",ACTIVITY_ROOT:true]
+
+        // 是否基于地图
+        buildConfigField 'boolean', 'IS_MAP_BASED', 'true'
+
+        // 是否需要实时上报坐标
+        buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true'
+        // GPS数据提供源： 0-Android系统，1-工控机，2-OBU
+        buildConfigField 'int', 'GPS_PROVIDER', "1"
+
+        // 构建的应用身份类型，出租车0|小巴A-司机0｜乘客1
+        buildConfigField 'int', 'APP_IDENTITY_MODE', "0xA1"
+        // 连接的工控机IP地址
+        buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.103\""
+        // 构建的是否是演示（美化）模式
+        buildConfigField 'boolean', 'IS_DEMO_MODE', 'false'
+    }
+}