From 23c126ebcc833014e6b916351e9606994090a07f Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Tue, 7 May 2024 10:05:08 +0800
Subject: [PATCH] =?UTF-8?q?[6.4.0]=20[=E6=B7=BB=E5=8A=A0=E4=B8=80=E4=B8=AA?=
 =?UTF-8?q?=E5=85=A8=E7=B1=BB=E5=9E=8B=E8=BD=A6=E5=9E=8B]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 OCH/facade/script/och.gradle         | 21 +++++++++++++++++++++
 app/build.gradle                     |  1 +
 app/config/productWithVehicle.json   |  3 ++-
 app/script/flavorfilter/flavors.json |  3 ++-
 app/script/vehicleFlavors/ALL.gradle | 25 +++++++++++++++++++++++++
 5 files changed, 51 insertions(+), 2 deletions(-)
 create mode 100644 app/script/vehicleFlavors/ALL.gradle

diff --git a/OCH/facade/script/och.gradle b/OCH/facade/script/och.gradle
index 8b4e4d70f7..3201d01e84 100644
--- a/OCH/facade/script/och.gradle
+++ b/OCH/facade/script/och.gradle
@@ -48,6 +48,27 @@ project.dependencies {
             if(isCurrentPassenger("mogo")){
                 implementation project.project(':OCH:taxi:passenger')
             }
+        } else if (isCurrentDriver("ALL")) {
+            if(isCurrentDriver("saas")){
+                implementation project.project(':OCH:taxi:unmanned-driver')
+            }
+            if(isCurrentDriver("mogo")){
+                implementation project.project(':OCH:taxi:driver')
+            }
+            implementation project.project(':OCH:bus:driver')
+            implementation project.project(':OCH:charter:driver')
+            implementation project.project(':OCH:shuttle:driver')
+            implementation project.project(':OCH:sweeper:driver')
+        } else if (isCurrentPassenger("ALL")) {
+            if(isCurrentPassenger("saas")){
+                implementation project.project(':OCH:taxi:unmanned-passenger')
+            }
+            if(isCurrentPassenger("mogo")){
+                implementation project.project(':OCH:taxi:passenger')
+            }
+            implementation project.project(':OCH:bus:passenger')
+            implementation project.project(':OCH:charter:passenger')
+            implementation project.project(':OCH:shuttle:passenger')
         } else {
             implementation project.project(':OCH:bus:driver')
             implementation project.project(':OCH:bus:passenger')
diff --git a/app/build.gradle b/app/build.gradle
index a385002589..dbb17b2eb1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -153,6 +153,7 @@ android {
     apply from: "./script/vehicleFlavors/B1.gradle"
     apply from: "./script/vehicleFlavors/B2.gradle"
     apply from: "./script/vehicleFlavors/T1T2.gradle"
+    apply from: "./script/vehicleFlavors/ALL.gradle"
     apply from: "./script/vehicleFlavors/C1.gradle"
     //包车
     apply from: "./script/vehicleFlavors/M1.gradle"
diff --git a/app/config/productWithVehicle.json b/app/config/productWithVehicle.json
index 3c94c7772a..b3804432b0 100644
--- a/app/config/productWithVehicle.json
+++ b/app/config/productWithVehicle.json
@@ -18,6 +18,7 @@
     "T1T2":["taxi"],
     "B1":["shuttle","bus"],
     "B2":["shuttle","bus"],
-    "M1":["charter","shuttle"]
+    "M1":["charter","shuttle"],
+    "ALL":["charter","shuttle","bus","taxi"]
   }
 }
diff --git a/app/script/flavorfilter/flavors.json b/app/script/flavorfilter/flavors.json
index 38cb76e48d..db92dbf098 100644
--- a/app/script/flavorfilter/flavors.json
+++ b/app/script/flavorfilter/flavors.json
@@ -20,6 +20,7 @@
     "T1T2":["driver","passenger"],
     "B1":["driver","passenger"],
     "B2":["driver","passenger"],
-    "M1":["driver","passenger"]
+    "M1":["driver","passenger"],
+    "ALL":["driver","passenger"]
   }
 }
diff --git a/app/script/vehicleFlavors/ALL.gradle b/app/script/vehicleFlavors/ALL.gradle
new file mode 100644
index 0000000000..14f1b47a8d
--- /dev/null
+++ b/app/script/vehicleFlavors/ALL.gradle
@@ -0,0 +1,25 @@
+project.android.productFlavors {
+    // 东风红旗
+    ALL {
+        dimension "vehicle"
+        missingDimensionStrategy "vehicle","dfhq","jinlvvan"
+
+
+        // 配置AndroidManifest.xml中用到的参数
+        manifestPlaceholders = [
+                CHANNEL_VALUE_TAIL: "ALL",
+        ]
+
+
+        // ①标识构建的应用身份类型，具体查看  README.md APP_IDENTITY_MODE规则
+        buildConfigField 'String', 'APP_IDENTITY_MODE_TAIL', "\"ALL\""
+
+        // ②构建的是否要动态更换模型
+        buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true'
+
+        // ③能启动自驾的档位 MAP<360代码中会移除P档
+        buildConfigField 'java.util.Set<chassis.Chassis.GearPosition>', 'LAUNCH_AUTOPILOT_GEAR', 'new java.util.HashSet<chassis.Chassis.GearPosition>(){{add(chassis.Chassis.GearPosition.GEAR_D);add(chassis.Chassis.GearPosition.GEAR_N);add(chassis.Chassis.GearPosition.GEAR_P);}}'
+
+    }
+
+}
\ No newline at end of file