From ae836ca84710d1b8b59925ee05e2be4dde506e45 Mon Sep 17 00:00:00 2001
From: chenfufeng <chenfufeng@zhidaoauto.com>
Date: Mon, 16 Jun 2025 20:02:27 +0800
Subject: [PATCH] =?UTF-8?q?[8.1.0][feat]=E4=BC=98=E5=8C=96=E5=86=B3?=
 =?UTF-8?q?=E7=AD=96=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../passenger/presenter/PM2ADASPresenter.kt   | 18 ++++
 .../b2/layout/shuttle_p_m2_hpmap_fragment.xml | 16 ++--
 .../passenger/ui/homepage/HomeViewModel.kt    |  2 +-
 .../routeoverlay/DecisionDataManager.kt       | 26 ++++--
 .../routeoverlay/PredictionDataManager.kt     | 25 +++--
 .../function/view/CoordinateAnimationView.kt  | 10 ++
 .../core/function/view/DecisionLayout.kt      | 23 ++++-
 .../eagle/core/function/view/MapBizView.kt    |  5 +
 .../core/function/view/PredictionLayout.kt    | 15 ++-
 .../layout/layout_b2_decision_container.xml   | 93 +++++++++++++++++++
 .../layout/layout_b2_prediction_container.xml | 35 +++++++
 .../src/main/res/values/attrs.xml             |  7 ++
 12 files changed, 249 insertions(+), 26 deletions(-)
 create mode 100644 core/function-impl/mogo-core-function-map/src/main/res/layout/layout_b2_decision_container.xml
 create mode 100644 core/function-impl/mogo-core-function-map/src/main/res/layout/layout_b2_prediction_container.xml

diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/presenter/PM2ADASPresenter.kt b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/presenter/PM2ADASPresenter.kt
index ae43e866a0..7781ff15d1 100644
--- a/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/presenter/PM2ADASPresenter.kt
+++ b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/presenter/PM2ADASPresenter.kt
@@ -3,6 +3,7 @@ package com.mogo.och.shuttle.weaknet.passenger.presenter
 import androidx.lifecycle.LifecycleOwner
 import com.amap.api.maps.model.LatLng
 import com.mogo.commons.mvp.Presenter
+import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.util.ThreadUtils
 import com.mogo.och.common.module.biz.birdge.BridgeListener
@@ -184,25 +185,30 @@ class PM2ADASPresenter(view: PM2HPMapFragment?) :
             if(haveLine){// 有订单
                 if(arrived){//展示高德地图
                     if(aiMessageShowmagic){
+                        updateMapFlag(false)
                         // 展示高德地图+展示mogomind
                         mView?.showAmap_mind()
                         return@runInMainThread
                     }else{
+                        updateMapFlag(false)
                         // 展示高德地图
                         mView?.showAmap()
                         return@runInMainThread
                     }
                 }else{// 展示高精地图
                     if(aiMessageShowmagic){
+                        updateMapFlag(false)
                         // 展示高精地图
                         mView?.showHDMap_mind()
                         return@runInMainThread
                     }else{
                         if(havePredictionInfos&&haveTrajectoryInfos){
+                            updateMapFlag(true)
                             // 展示高精地图+展示预测和决策
                             mView?.showHDMap_aip_prediction()
                             return@runInMainThread
                         }else{
+                            updateMapFlag(false)
                             // 展示高精地图
                             mView?.showHDMap()
                             return@runInMainThread
@@ -212,13 +218,25 @@ class PM2ADASPresenter(view: PM2HPMapFragment?) :
                 }
             }else{// 没有订单
                 if(aiMessageShowmagic){// 有mogomind 消息
+                    updateMapFlag(false)
                     // 展示高精地图+mogoMind
                     mView?.showHDMap_mind()
                 }else{
+                    updateMapFlag(false)
                     // 展示高精地图
                     mView?.showHDMap()
                 }
             }
         }
     }
+
+    private fun updateMapFlag(open: Boolean) {
+//        if (open) {
+//            FunctionBuildConfig.isDrawDecIdentifyData = true
+//            FunctionBuildConfig.isDrawPreIdentifyData = true
+//        } else {
+//            FunctionBuildConfig.isDrawDecIdentifyData = false
+//            FunctionBuildConfig.isDrawPreIdentifyData = false
+//        }
+    }
 }
\ No newline at end of file
diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/shuttle_p_m2_hpmap_fragment.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/shuttle_p_m2_hpmap_fragment.xml
index 1030224196..26ddd954ef 100644
--- a/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/shuttle_p_m2_hpmap_fragment.xml
+++ b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/shuttle_p_m2_hpmap_fragment.xml
@@ -51,9 +51,8 @@
             android:layout_width="@dimen/dp_430"
             android:layout_height="@dimen/dp_650"/>
 
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/cl_aip_contain"
+        <com.mogo.eagle.core.function.view.PredictionLayout
+            android:id="@+id/cl_prediction_contain"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             android:visibility="gone"
@@ -61,10 +60,11 @@
             android:layout_marginTop="@dimen/dp_3"
             android:layout_marginEnd="@dimen/dp_1"
             android:layout_width="@dimen/dp_411"
-            android:layout_height="@dimen/dp_332"/>
+            android:layout_height="@dimen/dp_332"
+            app:car_type="B2" />
 
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/cl_prediction_contain"
+        <com.mogo.eagle.core.function.view.DecisionLayout
+            android:id="@+id/cl_aip_contain"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             android:visibility="gone"
@@ -72,7 +72,9 @@
             android:layout_marginEnd="@dimen/dp_1"
             android:layout_marginBottom="@dimen/dp_m_1"
             android:layout_width="@dimen/dp_411"
-            android:layout_height="@dimen/dp_332"/>
+            android:layout_height="@dimen/dp_332"
+            app:car_type="B2"
+            />
 
         <com.mogo.och.shuttle.weaknet.passenger.ui.mind.MindView
             android:id="@+id/mindView"
diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/homepage/HomeViewModel.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/homepage/HomeViewModel.kt
index fcd3470973..edf0fec7d3 100644
--- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/homepage/HomeViewModel.kt
+++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/homepage/HomeViewModel.kt
@@ -56,7 +56,7 @@ class HomeViewModel : ViewModel(), BridgeListener, OrderListener {
 
     private fun checkScreenChange(){
         CallerLogger.d(TAG,"havePredictionInfos:${havePredictionInfos}--haveTrajectoryInfos:${haveTrajectoryInfos}--order:${order}")
-        if(order!=null&&havePredictionInfos&&havePredictionInfos){
+        if(havePredictionInfos&&havePredictionInfos){//order!=null&&
             FunctionBuildConfig.isDrawDecIdentifyData = true
             FunctionBuildConfig.isDrawPreIdentifyData = true
             // 展示三联屏
diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/routeoverlay/DecisionDataManager.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/routeoverlay/DecisionDataManager.kt
index 04d64fcc27..27b8107886 100644
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/routeoverlay/DecisionDataManager.kt
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/routeoverlay/DecisionDataManager.kt
@@ -11,6 +11,7 @@ import com.mogo.eagle.core.function.call.autopilot.CallerPlanningTrajectoryListe
 import com.mogo.eagle.core.utilcode.util.ThreadUtils
 import com.mogo.map.MogoMap
 import com.mogo.map.MogoMap.Companion.mapInstance
+import me.jessyan.autosize.utils.AutoSizeUtils
 import mogo.telematics.pad.MessagePad
 
 class DecisionDataManager private constructor() : IMoGoPlanningTrajectoryListener {
@@ -38,6 +39,22 @@ class DecisionDataManager private constructor() : IMoGoPlanningTrajectoryListene
 
     private var lastUpdateTime = 0L
 
+    /**
+     * 高精地图宽、高
+     */
+    @Volatile
+    var mapWidth = 808
+    @Volatile
+    var mapHeight = 1300
+
+    /**
+     * 决策地图宽、高
+     */
+    @Volatile
+    var decWidth = 238
+    @Volatile
+    var decHeight = 458
+
     init {
         val frequentThread = HandlerThread("decision_thread")
         frequentThread.start()
@@ -93,15 +110,12 @@ class DecisionDataManager private constructor() : IMoGoPlanningTrajectoryListene
                     var y = 0f
                     var offset = 0f
                     for (i in 0 until lonLatList.size) {
-                        x = lonLatList[i].x * 238 / 808.toFloat()
+                        x = lonLatList[i].x * decWidth / mapWidth.toFloat()
                         points[i * 2] = x
 
-                        // TODO:需要根据UI布局而变化，成比例缩放(高精地图返回的y轴是镜像的，需要在y轴方向上翻转一下)
-                        // float yB = heightB - (yA * (heightB / heightA));
-                        // yB = 480 - (yA * 480 / 1300)
-                        y = (458 + 14 - lonLatList[i].y * 458 / 1300).toFloat()
+                        y = (decHeight + 14 - lonLatList[i].y * decHeight / mapHeight).toFloat()
                         if (i == 0) {
-                            offset = 357 - y// carBitmapTop等于height * 0.78，offset = carBitmapTop - 1stY
+                            offset = decHeight * 0.78f - y// carBitmapTop等于height * 0.78，offset = carBitmapTop - 1stY
                         }
                         points[i * 2 + 1] = y + offset
                         Log.d(TAG, "转换后的屏幕坐标为：(${x},${y})")
diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/routeoverlay/PredictionDataManager.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/routeoverlay/PredictionDataManager.kt
index d2ebb603bf..e4d1befc80 100644
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/routeoverlay/PredictionDataManager.kt
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/routeoverlay/PredictionDataManager.kt
@@ -35,6 +35,22 @@ class PredictionDataManager private constructor() {
 
     private var lastUpdateTime = 0L
 
+    /**
+     * 高精地图宽、高
+     */
+    @Volatile
+    var mapWidth = 808
+    @Volatile
+    var mapHeight = 1300
+
+    /**
+     * 决策地图宽、高
+     */
+    @Volatile
+    var decWidth = 238
+    @Volatile
+    var decHeight = 458
+
     init {
         val frequentThread = HandlerThread("prediction_thread")
         frequentThread.start()
@@ -95,15 +111,12 @@ class PredictionDataManager private constructor() {
                 var y = 0f
                 var offset = 0f
                 for (i in 0 until lonLatList.size) {
-                    x = lonLatList[i].x * 238 / 808.toFloat()
+                    x = lonLatList[i].x * decWidth / mapWidth.toFloat()
                     points[i * 2] = x
 
-                    // TODO:需要根据UI布局而变化，成比例缩放(高精地图返回的y轴是镜像的，需要在y轴方向上翻转一下)
-                    // float yB = heightB - (yA * (heightB / heightA));
-                    // yB = 480 - (yA * 480 / 1300)
-                    y = (458 + 14 - lonLatList[i].y * 458 / 1300).toFloat()
+                    y = (decHeight + 14 - lonLatList[i].y * decHeight / mapHeight).toFloat()
                     if (i == 0) {
-                        offset = 357 - y// carBitmapTop等于height * 0.78，offset = carBitmapTop - 1stY
+                        offset = decHeight * 0.78f - y// carBitmapTop等于height * 0.78，offset = carBitmapTop - 1stY
                     }
                     points[i * 2 + 1] = y + offset
                     Log.d(TAG, "预测数据转换后的屏幕坐标为：(${x},${y})")
diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/CoordinateAnimationView.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/CoordinateAnimationView.kt
index 81b31ee817..cb0ceae443 100644
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/CoordinateAnimationView.kt
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/CoordinateAnimationView.kt
@@ -15,8 +15,11 @@ import android.view.SurfaceHolder
 import android.view.SurfaceView
 import android.view.View
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotIdentifyListener
+import com.mogo.eagle.core.function.business.routeoverlay.DecisionDataManager
+import com.mogo.eagle.core.function.business.routeoverlay.PredictionDataManager
 import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotIdentifyListenerManager
 import com.mogo.eagle.core.function.map.R
+import com.mogo.eagle.core.utilcode.util.UiThreadHandler
 import me.jessyan.autosize.utils.AutoSizeUtils
 import kotlin.math.min
 
@@ -110,6 +113,9 @@ class CoordinateAnimationView @JvmOverloads constructor(
             AutoSizeUtils.dp2px(context, 128f),
             AutoSizeUtils.dp2px(context, 280f)
         )
+        if (index == 1) {
+            storeWidthsAndHeights()
+        }
 //        circlePaint = Paint()
 //        circlePaint!!.color = Color.RED
 //        circlePaint!!.style = Paint.Style.STROKE
@@ -156,6 +162,10 @@ class CoordinateAnimationView @JvmOverloads constructor(
         setLayerType(LAYER_TYPE_HARDWARE, null)
     }
 
+    private fun storeWidthsAndHeights() {
+        // TODO:("此时获得的宽高为0")
+    }
+
     private fun getOriginBitmap(resId: Int, desWidth: Int, desHeight: Int): Bitmap {
         val bitmap = BitmapFactory.decodeResource(resources, resId)
         val scaleWidth = (bitmap.width * 2)
diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/DecisionLayout.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/DecisionLayout.kt
index f62c20d56f..ecde6d6bfe 100644
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/DecisionLayout.kt
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/DecisionLayout.kt
@@ -26,15 +26,32 @@ class DecisionLayout @JvmOverloads constructor(
     @Volatile
     private var lastTime = 0L
 
+    private var carType = 0
+
     init {
-        LayoutInflater.from(context).inflate(R.layout.layout_decision_container, this, true)
-        initView()
+        initView(attrs)
     }
 
-    private fun initView() {
+    private fun initView(attrs: AttributeSet?) {
+        val typedArray = context.obtainStyledAttributes(attrs, R.styleable.CarMapLayout)
+        carType = typedArray.getInt(R.styleable.CarMapLayout_car_type, 0)
+        typedArray.recycle()
+        when (carType) {
+            0 -> LayoutInflater.from(context).inflate(R.layout.layout_decision_container, this, true)
+            else -> LayoutInflater.from(context).inflate(R.layout.layout_b2_decision_container, this, true)
+        }
+    }
+
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
         CallerAutopilotIdentifyListenerManager.addListener(TAG, this)
     }
 
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+        CallerAutopilotIdentifyListenerManager.removeListener(TAG)
+    }
+
     fun onCreate(savedInstanceState: Bundle?) {
     }
 
diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/MapBizView.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/MapBizView.kt
index ccda7886ad..bb2c9ed3b9 100644
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/MapBizView.kt
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/MapBizView.kt
@@ -3,15 +3,20 @@ package com.mogo.eagle.core.function.view
 import android.content.Context
 import android.os.Bundle
 import android.util.AttributeSet
+import android.util.Log
 import androidx.lifecycle.LifecycleObserver
 import chassis.Chassis
 import com.mogo.eagle.core.data.config.FunctionBuildConfig.accThreshold
 import com.mogo.eagle.core.data.map.MogoLocation
 import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationWGS84Listener
 import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisStatesListener
+import com.mogo.eagle.core.function.business.routeoverlay.DecisionDataManager
+import com.mogo.eagle.core.function.business.routeoverlay.PredictionDataManager
 import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationWGS84ListenerManager
 import com.mogo.eagle.core.function.call.autopilot.CallerChassisStatesListenerManager
 import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager
+import com.mogo.eagle.core.function.view.CoordinateAnimationView.Companion
+import com.mogo.eagle.core.utilcode.util.UiThreadHandler
 import com.mogo.eagle.core.widget.media.video.TextureVideoViewOutlineProvider
 import com.mogo.map.MogoMap
 import com.mogo.map.MogoMapView
diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/PredictionLayout.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/PredictionLayout.kt
index bcc2e5595a..92eb717fe6 100644
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/PredictionLayout.kt
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/PredictionLayout.kt
@@ -12,13 +12,22 @@ class PredictionLayout @JvmOverloads constructor(
     context: Context,
     attrs: AttributeSet? = null
 ) : ConstraintLayout(context, attrs) {
+
+    private var carType = 0
+
     init {
         LayoutInflater.from(context).inflate(R.layout.layout_prediction_container, this, true)
-        initView()
+        initView(attrs)
     }
 
-    private fun initView() {
-
+    private fun initView(attrs: AttributeSet?) {
+        val typedArray = context.obtainStyledAttributes(attrs, R.styleable.CarMapLayout)
+        carType = typedArray.getInt(R.styleable.CarMapLayout_car_type, 0)
+        typedArray.recycle()
+        when (carType) {
+            0 -> LayoutInflater.from(context).inflate(R.layout.layout_prediction_container, this, true)
+            else -> LayoutInflater.from(context).inflate(R.layout.layout_b2_prediction_container, this, true)
+        }
     }
 
     fun onCreate(savedInstanceState: Bundle?) {
diff --git a/core/function-impl/mogo-core-function-map/src/main/res/layout/layout_b2_decision_container.xml b/core/function-impl/mogo-core-function-map/src/main/res/layout/layout_b2_decision_container.xml
new file mode 100644
index 0000000000..f0e085b467
--- /dev/null
+++ b/core/function-impl/mogo-core-function-map/src/main/res/layout/layout_b2_decision_container.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
+
+    <com.mogo.eagle.core.function.view.CoordinateAnimationView
+        android:id="@+id/preDetailView2"
+        android:layout_width="110dp"
+        android:layout_height="211dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_marginStart="@dimen/dp_27"
+        android:layout_marginBottom="24dp"
+        app:map_index="0"
+        />
+
+    <com.mogo.eagle.core.function.view.CoordinateAnimationView
+        android:id="@+id/decMapView"
+        android:layout_width="110dp"
+        android:layout_height="211dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_marginBottom="24dp"
+        app:map_index="1"
+        />
+
+    <com.mogo.eagle.core.function.view.CoordinateAnimationView
+        android:id="@+id/preDetailView3"
+        android:layout_width="110dp"
+        android:layout_height="211dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_marginEnd="@dimen/dp_27"
+        android:layout_marginBottom="20dp"
+        app:map_index="2"
+        />
+
+    <TextView
+        android:id="@+id/tvDecTitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="AIP 规划与决策"
+        android:textColor="#394047"
+        android:textSize="32dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:layout_marginTop="@dimen/dp_39"
+        />
+
+    <TextView
+        android:id="@+id/tvPre1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tvDecTitle"
+        android:layout_marginStart="@dimen/dp_58"
+        android:layout_marginTop="@dimen/dp_15"
+        android:text="11%"
+        android:textColor="#63707D"
+        android:textSize="33dp"
+        />
+
+    <TextView
+        android:id="@+id/tvPre2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tvDecTitle"
+        android:layout_marginTop="@dimen/dp_15"
+        android:text="86%"
+        android:textColor="#63707D"
+        android:textSize="33dp"
+        />
+
+    <TextView
+        android:id="@+id/tvPre3"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tvDecTitle"
+        android:layout_marginEnd="@dimen/dp_58"
+        android:layout_marginTop="@dimen/dp_15"
+        android:text="3%"
+        android:textColor="#63707D"
+        android:textSize="33dp"
+        />
+</merge>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-map/src/main/res/layout/layout_b2_prediction_container.xml b/core/function-impl/mogo-core-function-map/src/main/res/layout/layout_b2_prediction_container.xml
new file mode 100644
index 0000000000..1c2106bf51
--- /dev/null
+++ b/core/function-impl/mogo-core-function-map/src/main/res/layout/layout_b2_prediction_container.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Prediction 预测"
+        android:textColor="#394047"
+        android:textSize="@dimen/dp_32"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:layout_marginTop="@dimen/dp_41"
+        />
+
+    <com.mogo.eagle.core.function.view.PredictionMapView
+        android:id="@+id/preDetailView"
+        android:layout_width="373dp"
+        android:layout_height="294dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_marginBottom="26dp"
+        app:carPosition="6"
+        app:isAutoLocation="false"
+        app:isDisplayAnim="false"
+        app:isWeatherEnable="false"
+        app:styleMode="MAP_STYLE_DAY_VR_AIP"
+        app:vrAngleMode="MAP_STYLE_VR_ANGLE_TOP" />
+</merge>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-map/src/main/res/values/attrs.xml b/core/function-impl/mogo-core-function-map/src/main/res/values/attrs.xml
index 245195f992..be76c98da4 100644
--- a/core/function-impl/mogo-core-function-map/src/main/res/values/attrs.xml
+++ b/core/function-impl/mogo-core-function-map/src/main/res/values/attrs.xml
@@ -80,4 +80,11 @@
     <declare-styleable name="CoordinateAnimationView">
         <attr name="map_index" format="integer" />
     </declare-styleable>
+
+    <declare-styleable name="CarMapLayout">
+        <attr name="car_type" format="enum" >
+            <enum name="Taxi" value="0" />
+            <enum name="B2" value="1" /> />
+        </attr>
+    </declare-styleable>
 </resources>
\ No newline at end of file