[6.4.0]

[gradle 名称简写]

app/script/flavorfilter/flavors.json

@@ -1,26 +1,26 @@
 {
   "mogo": {
-    "ochFT":["driver"],
-    "ochJL":["driver","passenger"],
-    "ochM2":["driver","passenger"],
-    "ochDFHQ":["driver","passenger"],
-    "ochM1":["driver","passenger"]
+    "C1":["driver"],
+    "B1":["driver","passenger"],
+    "B2":["driver","passenger"],
+    "T1T2":["driver","passenger"],
+    "M1":["driver","passenger"]
   },
   "dali": {
-    "ochJL":["driver","passenger"],
-    "ochM1":["driver","passenger"],
-    "ochM2":["driver","passenger"]
+    "B1":["driver","passenger"],
+    "M1":["driver","passenger"],
+    "B2":["driver","passenger"]
   },
   "yantai": {
-    "ochJL":["driver","passenger"],
-    "ochM1":["driver","passenger"],
-    "ochM2":["driver","passenger"],
-    "ochFT":["driver"]
+    "B1":["driver","passenger"],
+    "M1":["driver","passenger"],
+    "B2":["driver","passenger"],
+    "C1":["driver"]
   },
   "saas": {
-    "ochDFHQ":["driver","passenger"],
-    "ochJL":["driver","passenger"],
-    "ochM2":["driver","passenger"],
-    "ochM1":["driver","passenger"]
+    "T1T2":["driver","passenger"],
+    "B1":["driver","passenger"],
+    "B2":["driver","passenger"],
+    "M1":["driver","passenger"]
   }
 }

app/script/utils.gradle

@@ -23,6 +23,7 @@ boolean isDriver() {
 
 boolean isPassenger() {
     for (String s : gradle.startParameter.taskNames) {
+        println "----------isPassenger------${s}"
         if (s.contains("Passenger") | s.contains("passenger")) {
             return true
         }

app/script/vehicleFlavors/B1.gradle

@@ -1,6 +1,6 @@
 project.android.productFlavors {
     // 衡阳-联想Pad-网约车-小巴车
-    ochJL {
+    B1 {
         dimension "vehicle"
         matchingFallbacks = ['jinlvvan']
         missingDimensionStrategy "vehicle", "jinlvvan"

app/script/vehicleFlavors/B2.gradle

@@ -2,7 +2,7 @@ apply from: "./script/utils.gradle"
 
 project.android.productFlavors {
     // 衡阳-联想Pad-网约车-小巴车-乘客端
-    ochM2 {
+    B2 {
         dimension "vehicle"
         // 和 och/mogo-och-bus-passenger 的flavors的m2对应
         if(isPassenger()){

app/script/vehicleFlavors/C1.gradle

@@ -1,6 +1,6 @@
 project.android.productFlavors {
     // 福田车
-    ochFT {
+    C1 {
         dimension "vehicle"
         missingDimensionStrategy "vehicle","ft","jinlvvan"
 

app/script/vehicleFlavors/M1.gradle

@@ -2,7 +2,7 @@ apply from: "./script/utils.gradle"
 
 project.android.productFlavors {
     // 金旅M1车
-    ochM1 {
+    M1 {
         dimension "vehicle"
         missingDimensionStrategy "vehicle", "jinlvvan"
 

app/script/vehicleFlavors/T1T2.gradle

@@ -1,6 +1,6 @@
 project.android.productFlavors {
     // 东风红旗
-    ochDFHQ {
+    ochT1T2 {
         dimension "vehicle"
         missingDimensionStrategy "vehicle","dfhq","jinlvvan"