Merge branch 'refs/heads/dev_robotaxi-d_240912_6.7.0' into dev_robotaxi-d_240912_6.7.2_local

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/StatusManager.kt

@@ -11,6 +11,7 @@ import androidx.lifecycle.Lifecycle.Event.ON_DESTROY
 import com.mogo.commons.utils.MogoAnalyticUtils
 import com.mogo.eagle.core.data.deva.chain.ChainConstant
 import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotActionsListenerManager
+import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager
 import com.mogo.eagle.core.utilcode.kotlin.*
 import com.mogo.eagle.core.utilcode.mogo.logger.*
 import com.mogo.eagle.core.utilcode.util.*
@@ -189,7 +190,7 @@ object StatusManager {
         if (!hasInit) {
             return 0
         }
-        var ret = 0
+        var xor = 0
         model.status.value?.second?.filter {
             it is IAutopilotPreLaunchStatus
         }?.takeIf {
@@ -216,7 +217,7 @@ object StatusManager {
                                             is GearStatus -> "档位"
                                             is RouteDownloadStatus -> if (item.state == RouteStart) "轨迹下载中" else "轨迹下载失败"
                                             is FSMStatus -> "FSM"
-                                            is OtherErrorStatus -> "未知"
+                                            is OtherErrorStatus -> "type: ${item.type}, reason:${item.reason?.getUnableLaunchReason()}"
                                             else -> "其它"
                                         }
                                     }
@@ -232,19 +233,20 @@ object StatusManager {
             }
         }?.forEachIndexed { index, status ->
             val shl = 1 shl index
-            if (status.isException()) {
-                ret = if (status is RouteDownloadStatus) {
-                    if (status.state == RouteStart) {
-                        ret or shl
-                    } else {
-                        ret or (shl shl 1)
-                    }
-                } else  {
-                    ret or shl
+            xor = if (status is RouteDownloadStatus) {
+                if (status.state == RouteStart) {
+                    xor or shl
+                } else {
+                    xor or (shl shl 1)
                 }
+            } else  {
+                if (status is OtherErrorStatus) {
+                    CallerDevaToolsManager.getExtra().putString(R.id.autopilot_start_error.toString(), status.reason?.getUnableLaunchReason())
+                }
+                xor or shl
             }
         }
-        return ret
+        return xor
     }
 
     fun hasInit(): Boolean {

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/map/MapContainerLayout.kt

@@ -14,10 +14,12 @@ import android.view.animation.AccelerateDecelerateInterpolator
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.view.marginStart
 import androidx.core.view.marginTop
+import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.data.map.MogoLatLng
 import com.mogo.eagle.core.function.api.datacenter.IDataCenterBizListener
 import com.mogo.eagle.core.function.call.datacenter.CallerDataCenterBizListener
 import com.mogo.eagle.core.function.hmi.R
+import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
 import com.mogo.eagle.core.utilcode.mogo.view.OnPreventFastClickListener
 import com.mogo.map.listener.IMogoMapListener
 import com.mogo.map.listener.MogoMapListenerHandler
@@ -234,7 +236,11 @@ class MapContainerLayout @JvmOverloads constructor(
     private fun updateShadowBg(isSmallMap: Boolean) {
         Log.d(TAG, "updateShadowBg")
         if (!isSmallMap) {
-            shadowView.setBackgroundResource(R.drawable.gaojing_bg)
+            if (AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode)) {
+                shadowView.setBackgroundResource(R.drawable.gaojing_bg)
+            } else {
+                shadowView.setBackgroundResource(R.drawable.gaojing_bus_bg)
+            }
         } else {
             shadowView.background = null
         }