[6.4.0]

[DriverPassenger]

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

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
 }

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": {

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\""
 
     }
 }

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

app/script/vehicleFlavors/M1.gradle

@@ -1,5 +1,3 @@
-apply from: "./script/utils.gradle"
-
 project.android.productFlavors {
     // 金旅M1车
     M1 {

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());
         }