From 215f94f1c67efefa1467dcc20a4553233e6e9582 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Fri, 3 Mar 2023 12:04:34 +0800 Subject: [PATCH] =?UTF-8?q?[m1]=20[1.1.2]=20[=E6=89=93=E5=8C=85=E8=BF=87?= =?UTF-8?q?=E6=BB=A4]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OCH/mogo-och-charter-passenger/build.gradle | 1 - .../ui/adapter/OrderSiteItemAdapter.kt | 2 +- app/build.gradle | 53 +------------------ .../fMultiDisplaySweeper.gradle | 2 +- app/productFlavors/flavorsFilterConfig.gradle | 1 + 5 files changed, 4 insertions(+), 55 deletions(-) diff --git a/OCH/mogo-och-charter-passenger/build.gradle b/OCH/mogo-och-charter-passenger/build.gradle index 5df49d3b86..dc997608a9 100644 --- a/OCH/mogo-och-charter-passenger/build.gradle +++ b/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' diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/adapter/OrderSiteItemAdapter.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/adapter/OrderSiteItemAdapter.kt index e25ffa27f9..d51a2a4077 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/adapter/OrderSiteItemAdapter.kt +++ b/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{ diff --git a/app/build.gradle b/app/build.gradle index de46f407ea..99b2846afa 100644 --- a/app/build.gradle +++ b/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 ==“ ” - // 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' diff --git a/app/productFlavors/fMultiDisplaySweeper.gradle b/app/productFlavors/fMultiDisplaySweeper.gradle index fbfd08b1e7..4dddc88a45 100644 --- a/app/productFlavors/fMultiDisplaySweeper.gradle +++ b/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' diff --git a/app/productFlavors/flavorsFilterConfig.gradle b/app/productFlavors/flavorsFilterConfig.gradle index 7b583f5fe5..da97a5a339 100644 --- a/app/productFlavors/flavorsFilterConfig.gradle +++ b/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) }