Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0

# Conflicts:
#	app/build.gradle
#	app/functions/och.gradle
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/ToggleDebugView.kt

app/build.gradle

@@ -291,6 +291,58 @@ android {
     //包车
     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
+    }
 
     packagingOptions {
         exclude 'META-INF/io.netty.versions.properties'