From 8b66dfee8936ca239973a1e98cbe40dfd191419b Mon Sep 17 00:00:00 2001 From: yangyakun Date: Thu, 18 May 2023 18:09:27 +0800 Subject: [PATCH] =?UTF-8?q?[charter]=20[3.2.0]=20[=E5=BC=95=E7=94=A8?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 1 + .../flavorfilter/flavorsFilterConfig.gradle | 2 +- app/script/functions/och.gradle | 40 ++++++++++++++++++- app/script/productFlavors/bus.gradle | 7 ---- app/script/productFlavors/charter.gradle | 9 ++--- app/script/productFlavors/noop.gradle | 5 --- app/script/productFlavors/shuttle.gradle | 16 ++++---- app/script/productFlavors/sweeper.gradle | 5 --- app/script/productFlavors/taxi.gradle | 7 ++-- app/script/vehicleFlavors/ochJL.gradle | 4 +- app/script/vehicleFlavors/ochM1.gradle | 2 + app/script/vehicleFlavors/ochM2.gradle | 4 +- 12 files changed, 64 insertions(+), 38 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index beaa66ba42..70bad84dd7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -92,6 +92,7 @@ android { } lintOptions { + checkReleaseBuilds false abortOnError false } diff --git a/app/script/flavorfilter/flavorsFilterConfig.gradle b/app/script/flavorfilter/flavorsFilterConfig.gradle index 87c0a86212..25c24d1d72 100644 --- a/app/script/flavorfilter/flavorsFilterConfig.gradle +++ b/app/script/flavorfilter/flavorsFilterConfig.gradle @@ -25,7 +25,7 @@ project.android.variantFilter { variant -> def vehicleContain = true roleValue.each{vehicleValue-> if (names.contains(vehicleValue)) { - println "need $names" + //println "need $names" vehicleContain = false } } diff --git a/app/script/functions/och.gradle b/app/script/functions/och.gradle index 29d99eae0f..b4ec11b06e 100644 --- a/app/script/functions/och.gradle +++ b/app/script/functions/och.gradle @@ -1,3 +1,4 @@ +apply from: "./script/utils.gradle" // 网约车服务：仅小巴车、出租车渠道用 project.dependencies { if (Boolean.valueOf(USE_MAVEN_PACKAGE)) { @@ -14,7 +15,44 @@ project.dependencies { // fMultiDisplayOchTaxiImplementation(rootProject.ext.dependencies.mogoochtaxi) } else { - fPadLenovoImplementation (project(':OCH:mogo-och-noop')) + + if (isCurrentDriver("noop")) { + fPadLenovoImplementation(project(':OCH:mogo-och-noop')) + } + + if (isCurrentDriver("bus")) { + implementation project.project(':OCH:mogo-och-bus') + } else if (isCurrentPassenger("bus")) { + implementation project.project(':OCH:mogo-och-bus-passenger') + } else { + } + + if (isCurrentDriver("charter")) { + implementation project.project(':OCH:mogo-och-charter') + } else if (isCurrentPassenger("charter")) { + implementation project.project(':OCH:mogo-och-charter-passenger') + } else { + + } + + if (isCurrentDriver("shuttle")) { + implementation project(':OCH:mogo-och-shuttle') + } else if (isCurrentPassenger("shuttle")) { + implementation project.project(':OCH:mogo-och-shuttle-passenger') + } else { + } + + if (isCurrentFlavors("sweeper")) { + implementation project.project(':OCH:mogo-och-sweeper') + } + + if (isCurrentDriver("taxi")) { + implementation project.project(':OCH:mogo-och-taxi') + } else if (isCurrentPassenger("taxi")) { + implementation project.project(':OCH:mogo-och-taxi-passenger') + } else { + + } // 多屏幕-Bus司机端 // fMultiDisplayOchBusImplementation (project(':OCH:mogo-och-bus')) diff --git a/app/script/productFlavors/bus.gradle b/app/script/productFlavors/bus.gradle index 0dcfad1caf..271d9e36e6 100644 --- a/app/script/productFlavors/bus.gradle +++ b/app/script/productFlavors/bus.gradle @@ -24,13 +24,6 @@ project.android.productFlavors { // ④构建 是否支持多屏异显异交互 buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' - - if(isCurrentDriver("bus")){ - project.dependencies.add('implementation', project.project(':OCH:mogo-och-bus')) - } - if(isCurrentPassenger("bus")){ - project.dependencies.add('implementation', project.project(':OCH:mogo-och-bus-passenger')) - } } } diff --git a/app/script/productFlavors/charter.gradle b/app/script/productFlavors/charter.gradle index 5c4d34e613..b657f22013 100644 --- a/app/script/productFlavors/charter.gradle +++ b/app/script/productFlavors/charter.gradle @@ -1,4 +1,4 @@ -apply from: "./script/utils.gradle" + project.android.productFlavors { // 包车业务 @@ -24,12 +24,11 @@ project.android.productFlavors { if(isCurrentDriver("charter")){ // ③是否需要重写状态栏 buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false' - project.dependencies.add('implementation', project.project(':OCH:mogo-och-charter')) - } - if(isCurrentPassenger("charter")){ + }else if(isCurrentPassenger("charter")){ // ③是否需要重写状态栏 buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'true' - project.dependencies.add('implementation', project.project(':OCH:mogo-och-charter-passenger')) + }else { + buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'true' } } } \ No newline at end of file diff --git a/app/script/productFlavors/noop.gradle b/app/script/productFlavors/noop.gradle index 12de255384..4c0e0dd5b6 100644 --- a/app/script/productFlavors/noop.gradle +++ b/app/script/productFlavors/noop.gradle @@ -23,10 +23,5 @@ project.android.productFlavors { // ④构建 是否支持多屏异显异交互 buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' - - if(isCurrentDriver("noop")){ - project.dependencies.add('implementation', project.project(':OCH:mogo-och-noop')) - } - } } \ No newline at end of file diff --git a/app/script/productFlavors/shuttle.gradle b/app/script/productFlavors/shuttle.gradle index dc5ecd99a1..0ea25aec59 100644 --- a/app/script/productFlavors/shuttle.gradle +++ b/app/script/productFlavors/shuttle.gradle @@ -23,26 +23,28 @@ project.android.productFlavors { buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false' // ④构建 是否支持多屏异显异交互 buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' - project.dependencies.add('implementation', project.project(':OCH:mogo-och-shuttle')) manifestPlaceholders.put("SCREEN_ORIENTATION", "landscape") - } - if (isCurrentPassenger("shuttle")) { - if(isM2()){ + } else if (isCurrentPassenger("shuttle")) { + if (isM2()) { // ③是否需要重写状态栏 buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'true' // ④构建 是否支持多屏异显异交互 buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' manifestPlaceholders.put("SCREEN_ORIENTATION", "portrait") } - if(isJL()){ + if (isJL()) { // ③是否需要重写状态栏 buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'true' // ④构建 是否支持多屏异显异交互 buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'true' manifestPlaceholders.put("SCREEN_ORIENTATION", "landscape") } - - project.dependencies.add('implementation', project.project(':OCH:mogo-och-shuttle-passenger')) + } else { + // ③是否需要重写状态栏 + buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'true' + // ④构建 是否支持多屏异显异交互 + buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'true' + manifestPlaceholders.put("SCREEN_ORIENTATION", "landscape") } } } \ No newline at end of file diff --git a/app/script/productFlavors/sweeper.gradle b/app/script/productFlavors/sweeper.gradle index 48a93a6e1e..9021152caf 100644 --- a/app/script/productFlavors/sweeper.gradle +++ b/app/script/productFlavors/sweeper.gradle @@ -23,10 +23,5 @@ project.android.productFlavors { // ④构建 是否支持多屏异显异交互 buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' - - - if(isCurrentFlavors("sweeper")){ - project.dependencies.add('implementation', project.project(':OCH:mogo-och-sweeper')) - } } } \ No newline at end of file diff --git a/app/script/productFlavors/taxi.gradle b/app/script/productFlavors/taxi.gradle index 963222eb2c..82c4323f0d 100644 --- a/app/script/productFlavors/taxi.gradle +++ b/app/script/productFlavors/taxi.gradle @@ -21,14 +21,13 @@ project.android.productFlavors { buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' if (isCurrentDriver("taxi")) { - project.dependencies.add('implementation', project.project(':OCH:mogo-och-taxi')) // 在启动的时候把Task给清空 manifestPlaceholders.put("ACTIVITY_ROOT", true) - } - if (isCurrentPassenger("taxi")) { - project.dependencies.add('implementation', project.project(':OCH:mogo-och-taxi-passenger')) + }else if (isCurrentPassenger("taxi")) { // 在启动的时候把Task给清空 manifestPlaceholders.put("ACTIVITY_ROOT", false) + }else { + manifestPlaceholders.put("ACTIVITY_ROOT", false) } } } \ No newline at end of file diff --git a/app/script/vehicleFlavors/ochJL.gradle b/app/script/vehicleFlavors/ochJL.gradle index 831bdd7ecd..e397aa4ce3 100644 --- a/app/script/vehicleFlavors/ochJL.gradle +++ b/app/script/vehicleFlavors/ochJL.gradle @@ -2,7 +2,9 @@ project.android.productFlavors { // 衡阳-联想Pad-网约车-小巴车 ochJL { dimension "vehicle" - matchingFallbacks = ['jinlvvan'] + //matchingFallbacks = ['jinlvvan'] + + missingDimensionStrategy "vehicle", "jinlvvan", "m2", "jinlvvan" // 配置AndroidManifest.xml中用到的参数 manifestPlaceholders = [ diff --git a/app/script/vehicleFlavors/ochM1.gradle b/app/script/vehicleFlavors/ochM1.gradle index 27dd69aeee..cef5f106cc 100644 --- a/app/script/vehicleFlavors/ochM1.gradle +++ b/app/script/vehicleFlavors/ochM1.gradle @@ -5,6 +5,8 @@ project.android.productFlavors { ochM1 { dimension "vehicle" + missingDimensionStrategy "vehicle", "driverm1","m2", "jinlvvan" + // 配置AndroidManifest.xml中用到的参数 manifestPlaceholders = [ // BUGLY_APP_CHANNEL diff --git a/app/script/vehicleFlavors/ochM2.gradle b/app/script/vehicleFlavors/ochM2.gradle index 2f016eb3fa..1d84fbd321 100644 --- a/app/script/vehicleFlavors/ochM2.gradle +++ b/app/script/vehicleFlavors/ochM2.gradle @@ -3,9 +3,9 @@ project.android.productFlavors { ochM2 { dimension "vehicle" // 和 och/mogo-och-bus-passenger 的flavors的m2对应 - matchingFallbacks = ['m2'] - + //matchingFallbacks = ['m2'] + missingDimensionStrategy "vehicle", "m2", "jinlvvan", 'driverm1' //高德地图鉴权信息 manifestPlaceholders = [ CHANNEL_VALUE_TAIL: "M2",