[gradle]

[3.2.0]
[gradle rebuild bugfix]

app/script/functions/och.gradle

@@ -17,41 +17,36 @@ project.dependencies {
     } else {
 
         if (isCurrentDriver("noop")) {
-            fPadLenovoImplementation(project(':OCH:mogo-och-noop'))
-        }
-
-        if (isCurrentDriver("bus")) {
+            noopImplementation(project(':OCH:mogo-och-noop'))
+        } else 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")) {
+        } 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")) {
+        } 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")) {
+        } else if (isCurrentDriver("sweeper")) {
             implementation project.project(':OCH:mogo-och-sweeper')
-        }
-
-        if (isCurrentDriver("taxi")) {
+        } else if (isCurrentDriver("taxi")) {
             implementation project.project(':OCH:mogo-och-taxi')
         } else if (isCurrentPassenger("taxi")) {
             implementation project.project(':OCH:mogo-och-taxi-passenger')
         } else {
-
+            noopImplementation(project(':OCH:mogo-och-noop'))
+            implementation project.project(':OCH:mogo-och-bus')
+            implementation project.project(':OCH:mogo-och-bus-passenger')
+            implementation project.project(':OCH:mogo-och-charter')
+            implementation project.project(':OCH:mogo-och-charter-passenger')
+            implementation project.project(':OCH:mogo-och-shuttle')
+            implementation project.project(':OCH:mogo-och-shuttle-passenger')
+            implementation project.project(':OCH:mogo-och-sweeper')
+            implementation project.project(':OCH:mogo-och-taxi')
+            implementation project.project(':OCH:mogo-och-taxi-passenger')
         }
 
         // 多屏幕-Bus司机端

app/script/vehicleFlavors/ochJL.gradle

@@ -2,8 +2,7 @@ project.android.productFlavors {
     // 衡阳-联想Pad-网约车-小巴车
     ochJL {
         dimension "vehicle"
-        //matchingFallbacks = ['jinlvvan']
-
+        matchingFallbacks = ['jinlvvan']
         missingDimensionStrategy "vehicle", "jinlvvan", "m2", "jinlvvan"
 
         // 配置AndroidManifest.xml中用到的参数

app/script/vehicleFlavors/ochM1.gradle

@@ -4,7 +4,7 @@ project.android.productFlavors {
     // 金旅M1车
     ochM1 {
         dimension "vehicle"
-
+        matchingFallbacks = ['driverm1']
         missingDimensionStrategy "vehicle", "driverm1","m2", "jinlvvan"
 
         // 配置AndroidManifest.xml中用到的参数
@@ -21,9 +21,5 @@ project.android.productFlavors {
         // ③不能启动自驾的档位
         buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'false'
 
-        if(isDriver()){
-            matchingFallbacks = ['driverm1']
-        }
-
     }
 }

app/script/vehicleFlavors/ochM2.gradle

@@ -3,8 +3,7 @@ project.android.productFlavors {
     ochM2 {
         dimension "vehicle"
         // 和 och/mogo-och-bus-passenger 的flavors的m2对应
-        //matchingFallbacks = ['m2']
-
+        matchingFallbacks = ['m2']
         missingDimensionStrategy "vehicle", "m2", "jinlvvan", 'driverm1'
         //高德地图鉴权信息
         manifestPlaceholders = [