From 74d451828c8ac89f4e5d6ada138865dd346c4a7b Mon Sep 17 00:00:00 2001 From: yangyakun Date: Mon, 29 Apr 2024 10:58:18 +0800 Subject: [PATCH] [6.4.0] [DriverPassenger] --- OCH/facade/script/och.gradle | 10 +++++++ OCH/facade/script/utils.gradle | 27 ++++++------------- app/script/flavorfilter/flavors.json | 4 +-- app/script/roleFlavors/driverpassenger.gradle | 6 ++--- app/script/utils.gradle | 26 +++--------------- app/script/vehicleFlavors/M1.gradle | 2 -- .../function/main/MainLauncherActivity.java | 2 +- 7 files changed, 28 insertions(+), 49 deletions(-) diff --git a/OCH/facade/script/och.gradle b/OCH/facade/script/och.gradle index f7e7d52d68..1cf3e062c8 100644 --- a/OCH/facade/script/och.gradle +++ b/OCH/facade/script/och.gradle @@ -12,6 +12,11 @@ project.dependencies { } else if (isCurrentPassenger("B1")) { implementation project.project(':OCH:bus:passenger') implementation project.project(':OCH:shuttle:passenger') + } else if (isCurrentBaiLing("B1")) { + implementation project.project(':OCH:shuttle:driver') + implementation project.project(':OCH:bus:driver') + implementation project.project(':OCH:bus:passenger') + implementation project.project(':OCH:shuttle:passenger') } else if (isCurrentDriver("M1")) { implementation project.project(':OCH:charter:driver') } else if (isCurrentPassenger("M1")) { @@ -22,6 +27,11 @@ project.dependencies { } else if (isCurrentPassenger("B2")) { implementation project.project(':OCH:bus:passenger') implementation project.project(':OCH:shuttle:passenger') + } else if (isCurrentPassenger("B2")) { + implementation project.project(':OCH:shuttle:driver') + implementation project.project(':OCH:bus:driver') + implementation project.project(':OCH:bus:passenger') + implementation project.project(':OCH:shuttle:passenger') } else if (isCurrentDriver("T1T2")) { if(isCurrentDriver("saas")){ implementation project.project(':OCH:taxi:unmanned-driver') diff --git a/OCH/facade/script/utils.gradle b/OCH/facade/script/utils.gradle index 0e854c72c6..cbad04bec1 100644 --- a/OCH/facade/script/utils.gradle +++ b/OCH/facade/script/utils.gradle @@ -12,6 +12,13 @@ boolean isCurrentPassenger(String flavors) { return false } +boolean isCurrentBaiLing(String flavors) { + if(isBaiLing() && isCurrentFlavors(flavors)){ + return true + } + return false +} + boolean isDriver() { for (String s : gradle.startParameter.taskNames) { if (s.contains("Driver") | s.contains("driver")) { @@ -30,23 +37,6 @@ boolean isPassenger() { return false } -boolean isJL() { - for (String s : gradle.startParameter.taskNames) { - if (s.contains("b1") | s.contains("B1")) { - return true - } - } - return false -} - -boolean isM2() { - for (String s : gradle.startParameter.taskNames) { - if (s.contains("b2") | s.contains("B2")) { - return true - } - } - return false -} boolean isCurrentFlavors(String flavors){ for (String s : gradle.startParameter.taskNames) { @@ -76,6 +66,5 @@ ext { isCurrentFlavors = this.&isCurrentFlavors isCurrentDriver = this.&isCurrentDriver isCurrentPassenger = this.&isCurrentPassenger - isJL = this.&isJL - isM2 = this.&isM2 + isCurrentBaiLing = this.&isCurrentBaiLing } \ No newline at end of file diff --git a/app/script/flavorfilter/flavors.json b/app/script/flavorfilter/flavors.json index 202e7b7db8..38cb76e48d 100644 --- a/app/script/flavorfilter/flavors.json +++ b/app/script/flavorfilter/flavors.json @@ -1,8 +1,8 @@ { "mogo": { "C1":["driver"], - "B1":["driver","passenger"], - "B2":["driver","passenger"], + "B1":["driver","passenger","bailing"], + "B2":["driver","passenger","bailing"], "T1T2":["driver","passenger"] }, "dali": { diff --git a/app/script/roleFlavors/driverpassenger.gradle b/app/script/roleFlavors/driverpassenger.gradle index e5b4c91f05..3b18ac2bb6 100644 --- a/app/script/roleFlavors/driverpassenger.gradle +++ b/app/script/roleFlavors/driverpassenger.gradle @@ -1,5 +1,5 @@ project.android.productFlavors { - driverPassenger { + bailing { dimension "role" externalNativeBuild { ndk { @@ -9,11 +9,11 @@ project.android.productFlavors { } manifestPlaceholders = [ - CHANNEL_VALUE_BODY : "DriverPassenger", + CHANNEL_VALUE_BODY : "Driver", ] // ①标识 - buildConfigField 'String', 'APP_IDENTITY_MODE_BODY', "\"DriverPassenger\"" + buildConfigField 'String', 'APP_IDENTITY_MODE_BODY', "\"Driver\"" } } \ No newline at end of file diff --git a/app/script/utils.gradle b/app/script/utils.gradle index 4a401cc85f..5769fbdc43 100644 --- a/app/script/utils.gradle +++ b/app/script/utils.gradle @@ -104,21 +104,6 @@ def variantVehicleName() { return "buspassenger" } - -boolean isCurrentDriver(String flavors) { - if(isDriver() && isCurrentFlavors(flavors)){ - return true - } - return false -} - -boolean isCurrentPassenger(String flavors) { - if(isPassenger() && isCurrentFlavors(flavors)){ - return true - } - return false -} - boolean isDriver() { for (String s : gradle.startParameter.taskNames) { if (s.contains("Driver") | s.contains("driver")) { @@ -138,11 +123,10 @@ boolean isPassenger() { return false } -boolean isCurrentFlavors(String flavors){ +boolean isBaiLing() { for (String s : gradle.startParameter.taskNames) { - - def lowerCase = flavors.toLowerCase() - if (s.toLowerCase().contains(lowerCase)) { + println "----------isPassenger------${s}" + if (s.contains("Bailing") | s.contains("bailing")) { return true } } @@ -152,9 +136,7 @@ boolean isCurrentFlavors(String flavors){ ext { isPassenger = this.&isPassenger isDriver = this.&isDriver - isCurrentFlavors = this.&isCurrentFlavors - isCurrentDriver = this.&isCurrentDriver - isCurrentPassenger = this.&isCurrentPassenger + isBaiLing = this.&isBaiLing readMediaUrlConfigFromJsonFile = this.&readMediaUrlConfigFromJsonFile readMusicUrlConfigFromJsonFile = this.&readMusicUrlConfigFromJsonFile readProductWithVehicleConfigFromJsonFile = this.&readProductWithVehicleConfigFromJsonFile diff --git a/app/script/vehicleFlavors/M1.gradle b/app/script/vehicleFlavors/M1.gradle index 454f16c6f2..e0c5d06c97 100644 --- a/app/script/vehicleFlavors/M1.gradle +++ b/app/script/vehicleFlavors/M1.gradle @@ -1,5 +1,3 @@ -apply from: "./script/utils.gradle" - project.android.productFlavors { // 金旅M1车 M1 { diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java index bed1854d3a..5858f1c323 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java @@ -121,7 +121,7 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis .navigation(getContext()); } else { ochProvider = (IMoGoFunctionProvider) ARouter.getInstance() - .build("/noop/api") + .build("/driver/api") .navigation(getContext()); }