Merge branch 'dev_robotaxi-d_230711_3.4.0' into dev_20230708_unmanned_3.5.0

# Conflicts:
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RomaBusView.kt
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RomaPassengerView.kt
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RomaTaxiView.kt
#	core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/AiCloudIdentifyDataManager.kt
#	gradle.properties

app/script/flavorfilter/flavors.json

@@ -15,7 +15,7 @@
     },
     "taxi" :{
       "driver": ["ochDFHQ"],
-      "driverpassenger": ["ochDFHQ"],
+      "driverPassenger": ["ochDFHQ"],
       "passenger": ["ochDFHQ"]
     },
     "taxiunmanned" :{
@@ -25,7 +25,7 @@
     },
     "bus" :{
       "driver": ["ochJL"],
-      "driverpassenger": ["ochJL"],
+      "driverPassenger": ["ochJL"],
       "passenger": ["ochJL"]
     },
     "charter" :{
@@ -63,7 +63,7 @@
     },
     "bus" :{
       "driver": ["ochJL"],
-      "driverpassenger": ["ochJL"],
+      "driverPassenger": ["ochJL"],
       "passenger": ["ochJL"]
     }
   }

app/script/productFlavors/taxi.gradle

@@ -14,20 +14,23 @@ project.android.productFlavors {
         // ②连接的工控机IP地址
         buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.1.102\""
 
-        // ③是否需要重写状态栏
-        buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false'
-
         // ④构建 是否支持多屏异显异交互
         buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false'
 
         if (isCurrentDriver("taxi")) {
             // 在启动的时候把Task给清空
             manifestPlaceholders.put("ACTIVITY_ROOT", true)
+            // ③是否需要重写状态栏
+            buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false'
         }else if (isCurrentPassenger("taxi")) {
             // 在启动的时候把Task给清空
             manifestPlaceholders.put("ACTIVITY_ROOT", false)
+            // ③是否需要重写状态栏
+            buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'true'
         }else {
             manifestPlaceholders.put("ACTIVITY_ROOT", false)
+            // ③是否需要重写状态栏
+            buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false'
         }
     }
 }

app/script/roleFlavors/driverpassenger.gradle

@@ -1,5 +1,5 @@
 project.android.productFlavors {
-    driverpassenger {
+    driverPassenger {
         dimension "role"
         externalNativeBuild {
             ndk {