From de90e27a24f52b209e8b0c63f2f629d91905f662 Mon Sep 17 00:00:00 2001
From: EmArrow <zhongchao@zhidaoauto.com>
Date: Tue, 8 Oct 2024 15:21:45 +0800
Subject: [PATCH] [6.7.0] add func of carinfo in bind

---
 .../core/function/hmi/bone/tab/CarInfoTabView.kt   |  8 ++++++++
 .../src/main/res/layout/view_car_info_tab.xml      | 14 +++++++-------
 .../src/main/res/layout/view_tab_switch.xml        |  4 ++--
 .../function/api/och/IOchCustomViewProvider.kt     |  5 +++++
 .../call/och/CallerOchCustomViewManager.kt         |  7 +++++++
 5 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/CarInfoTabView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/CarInfoTabView.kt
index f0f6b2f939..a801ccd787 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/CarInfoTabView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/CarInfoTabView.kt
@@ -18,6 +18,7 @@ import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsListenerManage
 import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager
 import com.mogo.eagle.core.function.call.hmi.CallerHmiListenerManager
 import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager
+import com.mogo.eagle.core.function.call.och.CallerOchCustomViewManager
 import com.mogo.eagle.core.function.hmi.R
 import com.mogo.eagle.core.function.hmi.ui.tools.OfflineMapDialog
 import com.mogo.eagle.core.function.hmi.ui.utils.HmiActionLog
@@ -29,6 +30,7 @@ import com.mogo.eagle.core.utilcode.util.NetworkUtils
 import com.mogo.eagle.core.utilcode.util.ToastUtils
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
 import com.mogo.map.MogoData
+import kotlinx.android.synthetic.main.view_car_info_tab.view.clBind
 import kotlinx.android.synthetic.main.view_car_info_tab.view.ivCarType
 import kotlinx.android.synthetic.main.view_car_info_tab.view.tvADMapVersion
 import kotlinx.android.synthetic.main.view_car_info_tab.view.tvADVersionName
@@ -90,6 +92,12 @@ class CarInfoTabView @JvmOverloads constructor(
     }
 
     private fun initView() {
+
+        val qrCodeView = CallerOchCustomViewManager.getOchBindQRCodeView(context)
+        qrCodeView?.let {
+            clBind.addView(qrCodeView)
+        }
+
         showCurrentPadVersion()
         showCurrentAdVersion()
         updateAdHdMapVersion()
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_car_info_tab.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_car_info_tab.xml
index 9971faecc5..f9a36dfc20 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_car_info_tab.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_car_info_tab.xml
@@ -112,13 +112,13 @@
                 app:layout_constraintLeft_toRightOf="@+id/tvCarNoPos"
                 app:layout_constraintTop_toTopOf="@+id/tvCarNoPos" />
 
-<!--            <ImageView-->
-<!--                android:id="@+id/tvCarBindCode"-->
-<!--                android:layout_width="wrap_content"-->
-<!--                android:layout_height="wrap_content"-->
-<!--                app:layout_constraintBottom_toBottomOf="@+id/tvCarNoPos"-->
-<!--                app:layout_constraintRight_toRightOf="@+id/tvCarExit"-->
-<!--                app:layout_constraintTop_toTopOf="@+id/tvCarNoPos" />-->
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/clBind"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:layout_constraintBottom_toBottomOf="@+id/tvCarNoPos"
+                app:layout_constraintRight_toRightOf="@+id/tvCarExit"
+                app:layout_constraintTop_toTopOf="@+id/tvCarNoPos" />
 
             <TextView
                 android:id="@+id/tvVersionPos"
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_tab_switch.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_tab_switch.xml
index 52feb12d9c..1643e1a554 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_tab_switch.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_tab_switch.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="@dimen/dp_220"
-    android:layout_height="@dimen/dp_140">
+    android:layout_height="@dimen/dp_141">
 
     <ImageView
         android:id="@+id/ivTabDefault"
@@ -31,7 +31,7 @@
     <ImageView
         android:id="@+id/ivTabClickBg"
         android:layout_width="@dimen/dp_220"
-        android:layout_height="@dimen/dp_140"
+        android:layout_height="@dimen/dp_141"
         android:scaleType="fitXY"
         android:src="@drawable/icon_tab_click_bg"
         android:visibility="gone"
diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/och/IOchCustomViewProvider.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/och/IOchCustomViewProvider.kt
index 5ec0708c0b..1d2e9c3332 100644
--- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/och/IOchCustomViewProvider.kt
+++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/och/IOchCustomViewProvider.kt
@@ -22,6 +22,11 @@ interface IOchCustomViewProvider : IProvider {
      */
     fun createOchBusinessView(context: Context?): View?
 
+    /**
+     * 创建 绑定二维码 自定义 View
+     */
+    fun createOchBindQRCodeView(context: Context?): View?
+
     /**
      * 创建 自动自动驾驶 自定义 View
      */
diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/och/CallerOchCustomViewManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/och/CallerOchCustomViewManager.kt
index 882ff65b56..8541e7d216 100644
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/och/CallerOchCustomViewManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/och/CallerOchCustomViewManager.kt
@@ -29,6 +29,13 @@ object CallerOchCustomViewManager {
         return ochCustomViewProviderApi?.createOchBusinessView(context)
     }
 
+    /**
+     * 创建 绑定二维码 自定义 View
+     */
+    fun getOchBindQRCodeView(context: Context?):View?{
+        return ochCustomViewProviderApi?.createOchBindQRCodeView(context)
+    }
+
     /**
      * 创建 启动自动驾驶 自定义 View
      */