diff --git a/OCH/mogo-och-bus-passenger/build.gradle b/OCH/mogo-och-bus-passenger/build.gradle index f9be5b07ca..2d6a5e71c9 100644 --- a/OCH/mogo-och-bus-passenger/build.gradle +++ b/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 { diff --git a/OCH/mogo-och-bus/build.gradle b/OCH/mogo-och-bus/build.gradle index 4de0719cb7..40b7e59a97 100644 --- a/OCH/mogo-och-bus/build.gradle +++ b/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 { diff --git a/app/build.gradle b/app/build.gradle index 726a2d8cef..49a801e341 100644 --- a/app/build.gradle +++ b/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" diff --git a/app/functions/och.gradle b/app/functions/och.gradle index 6a3e9f0776..75563a5eed 100644 --- a/app/functions/och.gradle +++ b/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')) { diff --git a/app/productFlavors/fPadLenovoOchBus.gradle b/app/productFlavors/fPadLenovoOchBus.gradle index 4f251e6744..69ed2fb261 100644 --- a/app/productFlavors/fPadLenovoOchBus.gradle +++ b/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' diff --git a/app/productFlavors/fPadLenovoOchBusPassenger.gradle b/app/productFlavors/fPadLenovoOchBusPassenger.gradle index 4d739711e0..541c5f8b34 100644 --- a/app/productFlavors/fPadLenovoOchBusPassenger.gradle +++ b/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' diff --git a/app/productFlavors/fPadLenovoOchBusShuttle.gradle b/app/productFlavors/fPadLenovoOchBusShuttle.gradle new file mode 100644 index 0000000000..3604121610 --- /dev/null +++ b/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' + } +} \ No newline at end of file diff --git a/app/productFlavors/fPadLenovoOchBusShuttlePassenger.gradle b/app/productFlavors/fPadLenovoOchBusShuttlePassenger.gradle new file mode 100644 index 0000000000..082cff7c18 --- /dev/null +++ b/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' + } +} \ No newline at end of file