From e61c5d362a2f4057e15fd7b39211cb6c00bfb7e1 Mon Sep 17 00:00:00 2001
From: EmArrow <zhongchao@zhidaoauto.com>
Date: Tue, 10 Sep 2024 18:56:10 +0800
Subject: [PATCH] [6.7.0-tmp]

---
 .../main/res/layout/taxi_base_fragment.xml    | 14 +++---
 .../function/hmi/ui/bone/TabSwitchView.kt     | 23 +++++++++
 .../res/drawable/selector_tab_car_info.xml    |  2 +-
 .../main/res/layout/view_bone_container.xml   |  4 +-
 .../src/main/res/layout/view_bone_tab.xml     |  2 +-
 .../src/main/res/layout/view_tab_switch.xml   | 50 +++++++++++++++++++
 .../eagle/core/data/enums/EventTypeEnumNew.kt |  2 +-
 7 files changed, 86 insertions(+), 11 deletions(-)
 create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bone/TabSwitchView.kt
 create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_tab_switch.xml

diff --git a/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml b/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml
index 1147981975..7978a9aeb4 100644
--- a/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml
+++ b/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml
@@ -453,11 +453,11 @@
         app:layout_constraintStart_toStartOf="parent" />
 
 
-<!--    <com.mogo.eagle.core.function.hmi.ui.bone.BoneContainerView-->
-<!--        android:id="@+id/boneContainerView"-->
-<!--        android:layout_width="@dimen/dp_1046"-->
-<!--        android:layout_height="match_parent"-->
-<!--        android:elevation="100dp"-->
-<!--        app:layout_constraintLeft_toLeftOf="parent"-->
-<!--        app:layout_constraintTop_toTopOf="parent" />-->
+    <com.mogo.eagle.core.function.hmi.ui.bone.BoneContainerView
+        android:id="@+id/boneContainerView"
+        android:layout_width="@dimen/dp_1046"
+        android:layout_height="match_parent"
+        android:elevation="100dp"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bone/TabSwitchView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bone/TabSwitchView.kt
new file mode 100644
index 0000000000..898aca9a75
--- /dev/null
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bone/TabSwitchView.kt
@@ -0,0 +1,23 @@
+package com.mogo.eagle.core.function.hmi.ui.bone
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import androidx.constraintlayout.widget.ConstraintLayout
+import com.mogo.eagle.core.function.hmi.R
+
+class TabSwitchView @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0
+) : ConstraintLayout(context, attrs, defStyleAttr)  {
+
+    init {
+        LayoutInflater.from(context).inflate(R.layout.view_tab_switch, this, true)
+        initView()
+    }
+
+    private fun initView() {
+
+    }
+}
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/selector_tab_car_info.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/selector_tab_car_info.xml
index 65f01d24d5..506d8241a1 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/selector_tab_car_info.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/selector_tab_car_info.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:drawable="@drawable/icon_tab_car_info" android:state_checked="false" />
-    <item android:drawable="@drawable/icon_tab_car_info_open" android:state_checked="true" />
+    <item android:drawable="@drawable/icon_tab_car_info_open" android:state_checked="true"/>
 </selector>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_bone_container.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_bone_container.xml
index d655accc62..d6ffd6479f 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_bone_container.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_bone_container.xml
@@ -11,6 +11,7 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
+        android:elevation="10dp"
         android:layout_height="wrap_content"/>
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -27,7 +28,8 @@
         android:id="@+id/clBoneTab"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:elevation="10dp"
+        android:layout_marginTop="@dimen/dp_385"
+        android:elevation="20dp"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_bone_tab.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_bone_tab.xml
index 93475586c3..b1ab694aaf 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_bone_tab.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_bone_tab.xml
@@ -17,7 +17,7 @@
 
         <ToggleButton
             android:id="@+id/tbCarInfo"
-            android:layout_width="0dp"
+            android:layout_width="@dimen/dp_220"
             android:layout_height="match_parent"
             android:layout_weight="1"
             android:background="@drawable/selector_tab_car_info"
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
new file mode 100644
index 0000000000..d0874154a2
--- /dev/null
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_tab_switch.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="@dimen/dp_220"
+    android:layout_height="@dimen/dp_140">
+
+    <ToggleButton
+        android:id="@+id/tbTabClick"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:checked="false"
+        android:gravity="center"
+        android:textOff=""
+        android:textOn="" />
+
+    <ImageView
+        android:id="@+id/ivTabDefault"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:scaleType="center"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <ImageView
+        android:id="@+id/ivTabClick"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <ImageView
+        android:id="@+id/ivTabClickBg"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <View
+        id
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeEnumNew.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeEnumNew.kt
index a13998beec..33fa0c3d71 100644
--- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeEnumNew.kt
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeEnumNew.kt
@@ -313,7 +313,7 @@ enum class EventTypeEnumNew(
         "超速",
         poiTypeSrcVr = R.drawable.icon_warning_v2x_over_speed,
         content = "当前路段限速 %s KM/H，已超速",
-        tts = "蘑菇路侧提醒您，当前路段限速 %s KM/H，已超速"
+        tts = "蘑菇路侧提醒您，当前路段限速 %s 千米每小时，已超速"
     ),
     //------------道路危险情况预警 obu end ----------->