Merge branch 'dev_minibus-d_230425_3.2.0' into code_opt_3.3.0

# Conflicts:
#	core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/CloudPoiManager.java

app/script/productFlavors/bus.gradle

@@ -19,8 +19,13 @@ project.android.productFlavors {
         // ②连接的工控机IP地址
         buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\""
 
-        // ③是否需要重写状态栏
-        buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'true'
+        if (isCurrentDriver("bus")) {
+            // ③是否需要重写状态栏
+            buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false'
+        } else if (isCurrentPassenger("bus")) {
+            // ③是否需要重写状态栏
+            buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'true'
+        }
 
         // ④构建 是否支持多屏异显异交互
         buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false'

app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt

@@ -150,7 +150,13 @@ object ConfigStartUp {
                     HDTypes.GUARDBAR.type,
                     HDTypes.TRAFFIC_DEVICE.type,
                     HDTypes.CABLE.type,
-                    HDTypes.SIGNAL_LINE.type
+                    HDTypes.SIGNAL_LINE.type,
+                    HDTypes.building.type,
+                    HDTypes.streetLight.type,
+                    HDTypes.area.type,
+                    HDTypes.regional.type,
+                    HDTypes.geometricLinear.type,
+                    HDTypes.geometricSurface.type
                 )
             )
         // .setZoom( 20 )