From 395831e62d6692e71d114c5249e13bc3868d0c58 Mon Sep 17 00:00:00 2001
From: EmArrow <zhongchao@zhidaoauto.com>
Date: Fri, 13 Sep 2024 07:39:10 +0800
Subject: [PATCH] [6.7.0] fixbug pf ui

---
 .../eagle/core/function/hmi/bone/TabSwitchView.kt    |  2 --
 .../src/main/res/layout/view_bone_container.xml      |  4 +---
 .../src/main/res/layout/view_bone_tab.xml            | 12 ++++--------
 .../src/main/res/layout/view_tab_switch.xml          |  6 ++++--
 .../src/main/res/values/attr.xml                     |  1 -
 5 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/TabSwitchView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/TabSwitchView.kt
index 55665aa178..db7eea5a3e 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/TabSwitchView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/TabSwitchView.kt
@@ -28,7 +28,6 @@ class TabSwitchView @JvmOverloads constructor(
             val typedArray = context.obtainStyledAttributes(attrs, R.styleable.TabSwitch)
             tabDefaultRes = typedArray.getResourceId(R.styleable.TabSwitch_defaultRes, -1)
             tabClickRes = typedArray.getResourceId(R.styleable.TabSwitch_clickRes, -1)
-            tabClickBgRes = typedArray.getResourceId(R.styleable.TabSwitch_clickBgRes, -1)
             typedArray.recycle()
         } catch (e: Exception) {
             e.printStackTrace()
@@ -39,7 +38,6 @@ class TabSwitchView @JvmOverloads constructor(
     private fun initView() {
         ivTabDefault.setImageResource(tabDefaultRes)
         ivTabClick.setImageResource(tabClickRes)
-        ivTabClickBg.setImageResource(tabClickBgRes)
     }
 
     fun switchTab(isCheck: Boolean) {
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 4ce289e26c..ae5942f924 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
@@ -3,8 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/bone_bg"
-    android:layout_gravity="center">
+    android:background="@drawable/bone_bg">
 
     <com.mogo.eagle.core.function.hmi.bone.BoneTopStatusLayout
         android:id="@+id/boneTopStatusLayout"
@@ -21,7 +20,6 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/dp_385"
         app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
     <com.mogo.eagle.core.function.hmi.bone.BoneTabLayout
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 948ba2316c..76cd158a91 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,20 +17,20 @@
             android:layout_width="@dimen/dp_960"
             android:layout_height="@dimen/dp_1137"
             android:layout_marginStart="@dimen/dp_40"
+            android:visibility="gone"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
+        android:layout_width="@dimen/dp_960"
         android:layout_height="@dimen/dp_224"
-        android:layout_marginStart="@dimen/dp_20"
         android:layout_marginBottom="@dimen/dp_m_2"
         android:background="@drawable/bg_tab_switch"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent">
+        android:layout_marginStart="@dimen/dp_20"
+        app:layout_constraintLeft_toLeftOf="parent">
 
         <com.mogo.eagle.core.function.hmi.bone.TabSwitchView
             android:id="@+id/tabSwitchCarInfo"
@@ -38,7 +38,6 @@
             android:layout_height="@dimen/dp_140"
             android:layout_marginStart="@dimen/dp_40"
             android:layout_marginTop="@dimen/dp_20"
-            app:clickBgRes="@drawable/icon_tab_click_bg"
             app:clickRes="@drawable/icon_tab_car_info_click"
             app:defaultRes="@drawable/icon_tab_car_info"
             app:layout_constraintLeft_toLeftOf="parent"
@@ -49,7 +48,6 @@
             android:layout_width="@dimen/dp_220"
             android:layout_height="@dimen/dp_140"
             android:layout_marginTop="@dimen/dp_20"
-            app:clickBgRes="@drawable/icon_tab_click_bg"
             app:clickRes="@drawable/icon_tab_msg_box_click"
             app:defaultRes="@drawable/icon_tab_msg_box"
             app:layout_constraintLeft_toRightOf="@+id/tabSwitchCarInfo"
@@ -60,7 +58,6 @@
             android:layout_width="@dimen/dp_220"
             android:layout_height="@dimen/dp_140"
             android:layout_marginTop="@dimen/dp_20"
-            app:clickBgRes="@drawable/icon_tab_click_bg"
             app:clickRes="@drawable/icon_tab_report_click"
             app:defaultRes="@drawable/icon_tab_report"
             app:layout_constraintLeft_toRightOf="@+id/tabSwitchMsgBox"
@@ -71,7 +68,6 @@
             android:layout_width="@dimen/dp_220"
             android:layout_height="@dimen/dp_140"
             android:layout_marginTop="@dimen/dp_20"
-            app:clickBgRes="@drawable/icon_tab_click_bg"
             app:clickRes="@drawable/icon_tab_more_click"
             app:defaultRes="@drawable/icon_tab_more"
             app:layout_constraintLeft_toRightOf="@+id/tabSwitchReport"
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 fca451ec7d..02597d493e 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
@@ -30,8 +30,10 @@
 
     <ImageView
         android:id="@+id/ivTabClickBg"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="@dimen/dp_220"
+        android:layout_height="@dimen/dp_140"
+        android:scaleType="fitXY"
+        android:src="@drawable/icon_tab_click_bg"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/values/attr.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/values/attr.xml
index 8923ff5bec..57f5359a8d 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/values/attr.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/values/attr.xml
@@ -155,7 +155,6 @@
     <declare-styleable name="TabSwitch" >
         <attr name="defaultRes" format="reference"/>
         <attr name="clickRes" format="reference"/>
-        <attr name="clickBgRes" format="reference"/>
     </declare-styleable>
 
 </resources>
\ No newline at end of file