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

---
 .../main/res/layout/taxi_base_fragment.xml    | 67 ++++++++++---------
 .../hmi/ui/bone/BoneTopStatusLayout.kt        | 23 +++++++
 .../main/res/layout/view_bone_container.xml   |  7 ++
 .../main/res/layout/view_bone_top_status.xml  |  9 +++
 .../src/main/res/values/dimens.xml            |  1 +
 5 files changed, 74 insertions(+), 33 deletions(-)
 create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bone/BoneTopStatusLayout.kt
 create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_bone_top_status.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 827352b04a..1147981975 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
@@ -164,35 +164,33 @@
         android:id="@+id/roadV2NEventWindowView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginRight="@dimen/dp_45"
         android:layout_marginTop="@dimen/dp_350"
+        android:layout_marginRight="@dimen/dp_45"
+        android:visibility="gone"
         app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        android:visibility="gone"/>
+        app:layout_constraintTop_toTopOf="parent" />
 
     <!--自动探查-->
     <com.mogo.och.common.module.wigets.rodedata.OchAutomaticExplorationView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
         android:layout_marginTop="@dimen/dp_350"
         android:layout_marginRight="@dimen/dp_50"
-        app:explorationUser="driver"
         android:visibility="gone"
-        />
+        app:explorationUser="driver"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <!--红绿灯提醒-->
     <com.mogo.eagle.core.function.hmi.ui.notice.traffic.TrafficLightPromptView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
         android:layout_marginTop="@dimen/dp_350"
         android:layout_marginRight="@dimen/dp_50"
-        app:promptUser="driver"
         android:visibility="gone"
-        />
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:promptUser="driver" />
 
     <!--  地图marker点击触发路侧直播  -->
     <com.mogo.eagle.core.function.hmi.ui.camera.RoadCrossLiveView
@@ -246,13 +244,12 @@
     <com.mogo.eagle.core.function.hmi.ui.widget.FusionTrafficLightView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
         android:layout_marginTop="@dimen/hmi_traffic_light_layout_margin_top"
         android:visibility="gone"
         app:fusionLightUser="driver"
-        />
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <!--接管提示-->
     <com.mogo.eagle.core.function.hmi.ui.vehicle.TakeOverView
@@ -278,12 +275,12 @@
 
     <com.mogo.och.common.module.wigets.map.switchvisual.VisualViewDirver
         android:id="@+id/vvd_change_angle"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintBottom_toTopOf="@+id/toolsView"
-        android:layout_marginBottom="@dimen/dp_48"
-        android:layout_marginStart="@dimen/dp_618"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/dp_618"
+        android:layout_marginBottom="@dimen/dp_48"
+        app:layout_constraintBottom_toTopOf="@+id/toolsView"
+        app:layout_constraintStart_toStartOf="parent" />
 
 
     <com.mogo.och.common.module.wigets.map.orderstatus.OrderStatusView
@@ -338,12 +335,12 @@
 
     <com.mogo.och.common.module.wigets.map.drawline.LineView
         android:id="@+id/lineView"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toRightOf="@id/rtv_switch"
+        android:layout_width="@dimen/dp_142"
+        android:layout_height="@dimen/dp_142"
         android:layout_marginStart="-11dp"
         android:layout_marginBottom="@dimen/dp_17"
-        android:layout_width="@dimen/dp_142"
-        android:layout_height="@dimen/dp_142"/>
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toRightOf="@id/rtv_switch" />
 
     <com.mogo.eagle.core.function.hmi.ui.widget.RomaDistanceView
         android:layout_width="wrap_content"
@@ -424,14 +421,14 @@
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/aciv_show_guid"
-        app:layout_constraintStart_toStartOf="@+id/smallMapView"
-        app:layout_constraintEnd_toEndOf="@+id/smallMapView"
-        app:layout_constraintBottom_toTopOf="@+id/smallMapView"
+        android:layout_width="@dimen/dp_209"
+        android:layout_height="@dimen/dp_91"
+        android:layout_marginBottom="-32dp"
         android:src="@drawable/taxi_overmap_tag"
         android:visibility="gone"
-        android:layout_marginBottom="-32dp"
-        android:layout_width="@dimen/dp_209"
-        android:layout_height="@dimen/dp_91"/>
+        app:layout_constraintBottom_toTopOf="@+id/smallMapView"
+        app:layout_constraintEnd_toEndOf="@+id/smallMapView"
+        app:layout_constraintStart_toStartOf="@+id/smallMapView" />
 
     <com.mogo.eagle.core.function.smp.view.SmallMapView
         android:id="@+id/smallMapView"
@@ -456,7 +453,11 @@
         app:layout_constraintStart_toStartOf="parent" />
 
 
-    <com.mogo.eagle.core.function.hmi.ui.bone.BoneContainerView
-        android:layout_width=""
-        android:layout_height=""
+<!--    <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/BoneTopStatusLayout.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bone/BoneTopStatusLayout.kt
new file mode 100644
index 0000000000..94f0ff979a
--- /dev/null
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bone/BoneTopStatusLayout.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 BoneTopStatusLayout @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0
+) : ConstraintLayout(context, attrs, defStyleAttr) {
+
+    init {
+        LayoutInflater.from(context).inflate(R.layout.view_bone_tab, 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/layout/view_bone_container.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_bone_container.xml
index 28c5490eb3..d655accc62 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
@@ -6,6 +6,13 @@
     android:background="@drawable/bone_bg"
     android:layout_gravity="center">
 
+    <com.mogo.eagle.core.function.hmi.ui.bone.BoneTopStatusLayout
+        android:layout_width="match_parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        android:layout_height="wrap_content"/>
+
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/clBoneBiz"
         android:layout_width="match_parent"
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_bone_top_status.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_bone_top_status.xml
new file mode 100644
index 0000000000..882e3650f6
--- /dev/null
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_bone_top_status.xml
@@ -0,0 +1,9 @@
+<?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_964"
+    android:layout_height="@dimen/dp_357">
+
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/core/mogo-core-res/src/main/res/values/dimens.xml b/core/mogo-core-res/src/main/res/values/dimens.xml
index 9663b6fecb..20abdadda0 100644
--- a/core/mogo-core-res/src/main/res/values/dimens.xml
+++ b/core/mogo-core-res/src/main/res/values/dimens.xml
@@ -1028,6 +1028,7 @@
     <dimen name="dp_1000">1000dp</dimen>
     <dimen name="dp_1003">1003dp</dimen>
     <dimen name="dp_1017">1017dp</dimen>
+    <dimen name="dp_1046">1046dp</dimen>
     <dimen name="dp_1055">1055dp</dimen>
     <dimen name="dp_1090">1090dp</dimen>
     <dimen name="dp_1092">1092dp</dimen>