[m1]

[1.1.2]
[打包过滤]

OCH/mogo-och-charter-passenger/build.gradle

@@ -64,7 +64,6 @@ dependencies {
     implementation rootProject.ext.dependencies.amapnavi3dmap
     implementation project(":OCH:mogo-och-common-module")
     compileOnly project(":libraries:mogo-map")
-    compileOnly project(':libraries:mogo-adas')
     implementation project(':core:mogo-core-res')
     testImplementation 'junit:junit:4.12'
 

OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/adapter/OrderSiteItemAdapter.kt

@@ -51,7 +51,7 @@ class OrderSiteItemAdapter(private val context: Context, private val dataList: M
 
     override fun onBindViewHolder(holder: TextVH, position: Int) {
         val siteInfo = dataList[holder.bindingAdapterPosition]
-        if(holder.bindingAdapterPosition>enableIndex){
+        if(holder.bindingAdapterPosition>=enableIndex){
             if(siteInfo.isCheck){
                 holder.iv_site_checked.setImageResource(R.drawable.m1_order_site_checked)
             }else{

app/build.gradle

@@ -287,62 +287,11 @@ android {
     apply from: "./productFlavors/fOchSweeper.gradle"
     apply from: "./productFlavors/fMultiDisplayOchBus.gradle"
     apply from: "./productFlavors/fMultiDisplayOchTaxi.gradle"
-    apply from: "./productFlavors/flavorsFilterConfig.gradle"
     //包车
     apply from: "./productFlavors/ochDriverM1.gradle"
     apply from: "./productFlavors/ochPassengerM1.gradle"
     apply from: "./productFlavors/fMultiDisplaySweeper.gradle"
-
-    variantFilter { variant ->
-        def names = variant.flavors*.name
-        //要检查特定的构建类型，请使用variant.buildType.name ==“ <buildType>”
-        // region 过滤noop 的flavors 不带och业务的
-        if (names.contains("noop") && !names.contains("fPadLenovo")) {
-            //Gradle会忽略满足上述条件的所有变体
-            setIgnore(true)
-        }
-        // endregion
-        // region 过滤sweper 的flavors
-        if (names.contains("sweeper") && !names.contains("fPadLenovoOchSweeper")&& !names.contains("fMultiDisplaySweeper")) {
-            //Gradle会忽略满足上述条件的所有变体
-            setIgnore(true)
-        }
-        // endregion
-
-        // region 过滤shuttle 的flavors
-        if (names.contains("shuttle")) {
-            //Gradle会忽略满足上述条件的所有变体
-            if (names.contains("fPadLenovoOchBus")) {
-            } else if (names.contains("fPadLenovoOchBusPassenger")) {
-            } else {
-                setIgnore(true)
-            }
-        }
-        // endregion
-        // region 过滤taxibase 的flavors
-        if (names.contains("taxibase")) {
-            //Gradle会忽略满足上述条件的所有变体
-            if (names.contains("fPadLenovoOchTaxi")) {
-            } else if (names.contains("fPadLenovoOchTaxiPassenger")) {
-            } else if (names.contains("fPadLenovo")) {
-            } else if (names.contains("fMultiDisplayOchTaxi")) {
-            } else {
-                setIgnore(true)
-            }
-        }
-        // endregion
-        // region 过滤taxibase 的flavors
-        if (names.contains("busbase")) {
-            //Gradle会忽略满足上述条件的所有变体
-            if (names.contains("fPadLenovoOchBus")) {
-            } else if (names.contains("fPadLenovoOchBusPassenger")) {
-            } else if (names.contains("fMultiDisplayOchBus")) {
-            } else {
-                setIgnore(true)
-            }
-        }
-        // endregion
-    }
+    apply from: "./productFlavors/flavorsFilterConfig.gradle"
 
     packagingOptions {
         exclude 'META-INF/io.netty.versions.properties'

app/productFlavors/fMultiDisplaySweeper.gradle

@@ -13,7 +13,7 @@ project.android.productFlavors {
         versionName rootProject.versionName
         // 应用包名
         applicationId rootProject.ext.android.fLauncherApplicationId
-        dimension "product"
+        dimension "vehicle"
 
         // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0
         buildConfigField 'int', 'CAR_MACHINE_TYPE', '2'

app/productFlavors/flavorsFilterConfig.gradle

@@ -54,6 +54,7 @@ project.android.variantFilter { variant ->
             //Gradle会忽略满足上述条件的所有变体
             if (names.contains("ochDriverM1")) {
             } else if (names.contains("ochPassengerM1")) {
+            } else if (names.contains("fMultiDisplaySweeper")) {
             } else {
                 setIgnore(true)
             }