[charter]

[3.2.0] [引用修改]
2023-05-18 18:09:27 +08:00
parent f02999eea5
commit 8b66dfee89
12 changed files with 64 additions and 38 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -92,6 +92,7 @@ android {
    }

    lintOptions {
+        checkReleaseBuilds false
        abortOnError false
    }

--- 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
                                }
                            }
--- 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'))
--- 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'))
-        }
    }
 }

--- 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'
        }
    }
 }
--- 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'))
-        }
-
    }
 }
--- 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")
        }
    }
 }
--- 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'))
-        }
    }
 }
--- 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)
        }
    }
 }
--- 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 = [
--- 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
--- 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",