From 5e3b75c730508cdc696ab167a319676eb0849fae Mon Sep 17 00:00:00 2001
From: EmArrow <zhongchao@zhidaoauto.com>
Date: Thu, 12 Sep 2024 11:24:22 +0800
Subject: [PATCH] [6.7.0-tmp]

---
 .../src/main/res/layout/bus_base_fragment.xml |   2 +-
 .../main/res/layout/charter_base_fragment.xml |   2 +-
 .../main/res/layout/shuttle_base_fragment.xml |   2 +-
 .../res/layout/shuttle_weak_base_fragment.xml |   2 +-
 .../main/res/layout/taxi_base_fragment.xml    |   4 +-
 .../main/res/layout/taxi_p_base_fragment.xml  |   2 +-
 .../layout/unmanned_taxi_base_fragment.xml    |   2 +-
 .../res/layout/taxt_u_p_base_fragment.xml     |   2 +-
 .../hmi/{ui => }/bone/BoneContainerView.kt    |   2 +-
 .../hmi/{ui => }/bone/BoneTabLayout.kt        |   2 +-
 .../hmi/{ui => }/bone/BoneTopStatusLayout.kt  |   2 +-
 .../hmi/{ui => }/bone/TabSwitchView.kt        |   2 +-
 .../function/hmi/bone/tab/CarInfoTabView.kt   |  18 ++++
 .../core/function/hmi/ui/MoGoHmiProvider.kt   |   4 -
 .../hmi/ui/switch/DemoModeHiddenSwitch.kt     |  30 ------
 .../hmi/ui/{map => tools}/OfflineMapDialog.kt |   7 +-
 .../ui/{greenwave => widget}/GreenWaveView.kt |   2 +-
 .../hmi/ui/widget/SystemVersionView.kt        |   5 +-
 .../res/drawable-nodpi/bg_tab_view_top.png    | Bin 0 -> 13038 bytes
 .../main/res/layout/view_bone_container.xml   |   4 +-
 .../src/main/res/layout/view_bone_tab.xml     |  47 +++++----
 .../src/main/res/layout/view_car_info_tab.xml |  94 ++++++++++++++++++
 .../src/main/res/values/color.xml             |   2 +
 .../src/main/res/values/strings.xml           |   5 +
 24 files changed, 162 insertions(+), 82 deletions(-)
 rename core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/{ui => }/bone/BoneContainerView.kt (91%)
 rename core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/{ui => }/bone/BoneTabLayout.kt (98%)
 rename core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/{ui => }/bone/BoneTopStatusLayout.kt (91%)
 rename core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/{ui => }/bone/TabSwitchView.kt (97%)
 create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/CarInfoTabView.kt
 delete mode 100644 core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/switch/DemoModeHiddenSwitch.kt
 rename core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/{map => tools}/OfflineMapDialog.kt (96%)
 rename core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/{greenwave => widget}/GreenWaveView.kt (99%)
 create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable-nodpi/bg_tab_view_top.png
 create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_car_info_tab.xml

diff --git a/OCH/bus/driver/src/main/res/layout/bus_base_fragment.xml b/OCH/bus/driver/src/main/res/layout/bus_base_fragment.xml
index 1e21997ac6..1aeb771c17 100644
--- a/OCH/bus/driver/src/main/res/layout/bus_base_fragment.xml
+++ b/OCH/bus/driver/src/main/res/layout/bus_base_fragment.xml
@@ -107,7 +107,7 @@
         app:layout_goneMarginEnd="40dp"
         app:layout_goneMarginTop="@dimen/dp_236" />
 
-    <com.mogo.eagle.core.function.hmi.ui.greenwave.GreenWaveView
+    <com.mogo.eagle.core.function.hmi.ui.widget.GreenWaveView
         android:layout_marginTop="@dimen/dp_71"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/OCH/charter/driver/src/main/res/layout/charter_base_fragment.xml b/OCH/charter/driver/src/main/res/layout/charter_base_fragment.xml
index b3e8b707c5..c18cab4bf5 100644
--- a/OCH/charter/driver/src/main/res/layout/charter_base_fragment.xml
+++ b/OCH/charter/driver/src/main/res/layout/charter_base_fragment.xml
@@ -114,7 +114,7 @@
         android:visibility="invisible"
         app:layout_constraintTop_toBottomOf="@+id/viewLimitingVelocity"/>
 
-    <com.mogo.eagle.core.function.hmi.ui.greenwave.GreenWaveView
+    <com.mogo.eagle.core.function.hmi.ui.widget.GreenWaveView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/dp_71"
diff --git a/OCH/shuttle/driver/src/main/res/layout/shuttle_base_fragment.xml b/OCH/shuttle/driver/src/main/res/layout/shuttle_base_fragment.xml
index 159ebca0d0..d28e7acc15 100644
--- a/OCH/shuttle/driver/src/main/res/layout/shuttle_base_fragment.xml
+++ b/OCH/shuttle/driver/src/main/res/layout/shuttle_base_fragment.xml
@@ -104,7 +104,7 @@
         android:visibility="invisible"
         app:layout_constraintTop_toBottomOf="@+id/viewLimitingVelocity"/>
 
-    <com.mogo.eagle.core.function.hmi.ui.greenwave.GreenWaveView
+    <com.mogo.eagle.core.function.hmi.ui.widget.GreenWaveView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/dp_71"
diff --git a/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_base_fragment.xml b/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_base_fragment.xml
index e66b6e78cf..31d8e148f3 100644
--- a/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_base_fragment.xml
+++ b/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_base_fragment.xml
@@ -104,7 +104,7 @@
         android:visibility="invisible"
         app:layout_constraintTop_toBottomOf="@+id/viewLimitingVelocity"/>
 
-    <com.mogo.eagle.core.function.hmi.ui.greenwave.GreenWaveView
+    <com.mogo.eagle.core.function.hmi.ui.widget.GreenWaveView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/dp_71"
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 b450e2cbf8..06872c5fe4 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
@@ -139,7 +139,7 @@
         app:layout_goneMarginEnd="40dp"
         app:layout_goneMarginTop="@dimen/dp_236" />
 
-    <com.mogo.eagle.core.function.hmi.ui.greenwave.GreenWaveView
+    <com.mogo.eagle.core.function.hmi.ui.widget.GreenWaveView
         android:layout_width="@dimen/dp_580"
         android:layout_height="@dimen/dp_129"
         android:layout_marginTop="@dimen/dp_71"
@@ -453,7 +453,7 @@
         app:layout_constraintStart_toStartOf="parent" />
 
 
-    <com.mogo.eagle.core.function.hmi.ui.bone.BoneContainerView
+    <com.mogo.eagle.core.function.hmi.bone.BoneContainerView
         android:id="@+id/boneContainerView"
         android:layout_width="@dimen/dp_1046"
         android:layout_height="match_parent"
diff --git a/OCH/taxi/passenger/src/main/res/layout/taxi_p_base_fragment.xml b/OCH/taxi/passenger/src/main/res/layout/taxi_p_base_fragment.xml
index b28c81d8cf..51b391e0dd 100644
--- a/OCH/taxi/passenger/src/main/res/layout/taxi_p_base_fragment.xml
+++ b/OCH/taxi/passenger/src/main/res/layout/taxi_p_base_fragment.xml
@@ -255,7 +255,7 @@
         app:layout_constraintBottom_toTopOf="@id/aciv_xiaozhi_normal"
         app:layout_constraintEnd_toEndOf="parent" />
 
-    <com.mogo.eagle.core.function.hmi.ui.greenwave.GreenWaveView
+    <com.mogo.eagle.core.function.hmi.ui.widget.GreenWaveView
         android:layout_width="@dimen/dp_580"
         android:layout_height="@dimen/dp_156"
         android:layout_marginEnd="@dimen/dp_30"
diff --git a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml
index 3a98c9f5c2..0ae4b7253b 100644
--- a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml
+++ b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml
@@ -138,7 +138,7 @@
         android:visibility="invisible"
         app:layout_constraintTop_toBottomOf="@+id/viewLimitingVelocity"/>
 
-    <com.mogo.eagle.core.function.hmi.ui.greenwave.GreenWaveView
+    <com.mogo.eagle.core.function.hmi.ui.widget.GreenWaveView
         android:layout_width="@dimen/dp_580"
         android:layout_height="@dimen/dp_129"
         android:layout_marginTop="@dimen/dp_71"
diff --git a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml
index a8bb5e6ea0..55bd21768e 100644
--- a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml
+++ b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml
@@ -266,7 +266,7 @@
         android:layout_marginBottom="-80dp"
         app:layout_constraintEnd_toEndOf="parent" />
 
-    <com.mogo.eagle.core.function.hmi.ui.greenwave.GreenWaveView
+    <com.mogo.eagle.core.function.hmi.ui.widget.GreenWaveView
         android:layout_width="@dimen/dp_580"
         android:layout_height="@dimen/dp_156"
         android:layout_marginEnd="@dimen/dp_30"
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bone/BoneContainerView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/BoneContainerView.kt
similarity index 91%
rename from core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bone/BoneContainerView.kt
rename to core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/BoneContainerView.kt
index 34e45cf2d7..f4c7284c75 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bone/BoneContainerView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/BoneContainerView.kt
@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.function.hmi.ui.bone
+package com.mogo.eagle.core.function.hmi.bone
 
 import android.content.Context
 import android.util.AttributeSet
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bone/BoneTabLayout.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/BoneTabLayout.kt
similarity index 98%
rename from core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bone/BoneTabLayout.kt
rename to core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/BoneTabLayout.kt
index 46057679a6..9025aac49b 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bone/BoneTabLayout.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/BoneTabLayout.kt
@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.function.hmi.ui.bone
+package com.mogo.eagle.core.function.hmi.bone
 
 import android.content.Context
 import android.util.AttributeSet
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/bone/BoneTopStatusLayout.kt
similarity index 91%
rename from core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bone/BoneTopStatusLayout.kt
rename to core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/BoneTopStatusLayout.kt
index 862ab006b7..8b80f69779 100644
--- 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/bone/BoneTopStatusLayout.kt
@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.function.hmi.ui.bone
+package com.mogo.eagle.core.function.hmi.bone
 
 import android.content.Context
 import android.util.AttributeSet
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/bone/TabSwitchView.kt
similarity index 97%
rename from core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bone/TabSwitchView.kt
rename to core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/TabSwitchView.kt
index d599a25720..55665aa178 100644
--- 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/bone/TabSwitchView.kt
@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.function.hmi.ui.bone
+package com.mogo.eagle.core.function.hmi.bone
 
 import android.content.Context
 import android.util.AttributeSet
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
new file mode 100644
index 0000000000..15619af6b8
--- /dev/null
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/CarInfoTabView.kt
@@ -0,0 +1,18 @@
+package com.mogo.eagle.core.function.hmi.bone.tab
+
+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 CarInfoTabView @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)
+    }
+}
\ 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/MoGoHmiProvider.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiProvider.kt
index 83539c43d3..cad2aabef1 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiProvider.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiProvider.kt
@@ -1,11 +1,9 @@
 package com.mogo.eagle.core.function.hmi.ui
 
 import android.content.Context
-import android.telecom.Call
 import android.text.TextUtils
 import android.view.Gravity
 import android.view.ViewGroup
-import android.view.WindowManager
 import androidx.lifecycle.ProcessLifecycleOwner
 import androidx.lifecycle.lifecycleScope
 import com.alibaba.android.arouter.facade.annotation.Route
@@ -32,7 +30,6 @@ import com.mogo.eagle.core.function.call.hmi.CallerHmiViewControlListenerManager
 import com.mogo.eagle.core.function.call.v2x.CallerTrafficLightListenerManager
 import com.mogo.eagle.core.function.call.v2x.CallerTurnLightListenerManager
 import com.mogo.eagle.core.function.hmi.ui.camera.RoadVideoDialog
-import com.mogo.eagle.core.function.hmi.ui.greenwave.GreenWaveView
 import com.mogo.eagle.core.function.hmi.ui.lookaround.M1LookAroundView
 import com.mogo.eagle.core.function.hmi.ui.notice.DispatchDialogManager
 import com.mogo.eagle.core.function.hmi.ui.notice.NoticeCheckDialog
@@ -49,7 +46,6 @@ import com.mogo.eagle.core.function.hmi.ui.utils.HmiActionLog
 import com.mogo.eagle.core.function.hmi.ui.widget.StatusBarView
 import com.mogo.eagle.core.function.hmi.xiaozhi.XiaoZhiStateManager
 import com.mogo.eagle.core.utilcode.floating.MoGoPopWindow
-import com.mogo.eagle.core.utilcode.kotlin.lifeCycleScope
 import com.mogo.eagle.core.utilcode.kotlin.safeCancel
 import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/switch/DemoModeHiddenSwitch.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/switch/DemoModeHiddenSwitch.kt
deleted file mode 100644
index 68947a6019..0000000000
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/switch/DemoModeHiddenSwitch.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.mogo.eagle.core.function.hmi.ui.switch
-
-import android.content.Context
-import android.util.AttributeSet
-import android.view.View
-import com.mogo.eagle.core.data.config.FunctionBuildConfig
-import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager
-import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
-import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
-
-class DemoModeHiddenSwitch(context: Context, attrs: AttributeSet?) : View(context, attrs) {
-
-    init {
-        isClickable = true
-        setOnClickListener {
-            //只在司机端设置美化模式开关功能
-            if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) {
-                //单次查询,是否有行程信息（订单进行中时点击不生效）,autopilotControlParameters为null代表不处于自动驾驶状态下
-                if (CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().autopilotControlParameters == null) {
-                    FunctionBuildConfig.isDemoMode = !FunctionBuildConfig.isDemoMode
-                    CallerAutoPilotControlManager.setDemoMode(FunctionBuildConfig.isDemoMode)
-                    if (!FunctionBuildConfig.isDemoMode) {
-                        //关闭美化模式时，通知工控机
-                        CallerAutoPilotControlManager.setIPCDemoMode(FunctionBuildConfig.isDemoMode)
-                    }
-                }
-            }
-        }
-    }
-}
\ 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/map/OfflineMapDialog.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/OfflineMapDialog.kt
similarity index 96%
rename from core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/map/OfflineMapDialog.kt
rename to core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/OfflineMapDialog.kt
index 97975280d0..368d5fb89a 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/map/OfflineMapDialog.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/OfflineMapDialog.kt
@@ -1,8 +1,7 @@
-package com.mogo.eagle.core.function.hmi.ui.map
+package com.mogo.eagle.core.function.hmi.ui.tools
 
 import android.annotation.SuppressLint
 import android.content.Context
-import android.os.Looper
 import android.view.View
 import android.widget.ImageView
 import android.widget.ProgressBar
@@ -13,12 +12,8 @@ import com.mogo.eagle.core.data.map.MogoLocation
 import com.mogo.eagle.core.function.call.hmi.CallerHmiListenerManager
 import com.mogo.eagle.core.function.hmi.R
 import com.mogo.eagle.core.function.hmi.dialog.BaseFloatDialog
-import com.mogo.eagle.core.function.hmi.ui.utils.HmiActionLog
 import com.mogo.eagle.core.function.hmi.ui.utils.HmiActionLog.Companion.hmiAction
-import com.mogo.eagle.core.function.hmi.ui.widget.SystemVersionView
-import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_HMI
-import com.mogo.eagle.core.utilcode.util.ThreadUtils
 import com.mogo.map.MogoData.Companion.mogoMapData
 import me.jessyan.autosize.utils.AutoSizeUtils
 
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/greenwave/GreenWaveView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/GreenWaveView.kt
similarity index 99%
rename from core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/greenwave/GreenWaveView.kt
rename to core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/GreenWaveView.kt
index 806c1c4aca..c7a9d7a643 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/greenwave/GreenWaveView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/GreenWaveView.kt
@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.function.hmi.ui.greenwave
+package com.mogo.eagle.core.function.hmi.ui.widget
 
 import android.content.Context
 import android.util.AttributeSet
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SystemVersionView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SystemVersionView.kt
index 41b7ba8c83..1d1b659df3 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SystemVersionView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SystemVersionView.kt
@@ -2,7 +2,6 @@ package com.mogo.eagle.core.function.hmi.ui.widget
 
 import android.content.Context
 import android.util.AttributeSet
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import androidx.constraintlayout.widget.ConstraintLayout
@@ -19,15 +18,13 @@ 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.hmi.R
-import com.mogo.eagle.core.function.hmi.ui.map.OfflineMapDialog
+import com.mogo.eagle.core.function.hmi.ui.tools.OfflineMapDialog
 import com.mogo.eagle.core.function.hmi.ui.utils.HmiActionLog.Companion.hmiAction
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_HMI
 import com.mogo.eagle.core.utilcode.util.*
 import com.mogo.map.MogoData.Companion.mogoMapData
 import kotlinx.android.synthetic.main.view_system_version.view.*
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
 import system_master.SsmInfo
 import system_master.SystemStatusInfo
 
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-nodpi/bg_tab_view_top.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-nodpi/bg_tab_view_top.png
new file mode 100644
index 0000000000000000000000000000000000000000..921fd9cdf4117663c6197f9c1d8c9af5483dbe58
GIT binary patch
literal 13038
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
Hl|TLm9EY2D

literal 0
HcmV?d00001

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 5e25bb8104..850c7eeb17 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,7 +6,7 @@
     android:background="@drawable/bone_bg"
     android:layout_gravity="center">
 
-    <com.mogo.eagle.core.function.hmi.ui.bone.BoneTopStatusLayout
+    <com.mogo.eagle.core.function.hmi.bone.BoneTopStatusLayout
         android:id="@+id/boneTopStatusLayout"
         android:layout_width="match_parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -25,7 +25,7 @@
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <com.mogo.eagle.core.function.hmi.ui.bone.BoneTabLayout
+    <com.mogo.eagle.core.function.hmi.bone.BoneTabLayout
         android:id="@+id/clBoneTab"
         android:layout_width="match_parent"
         android:layout_height="match_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 7fc4f4ae19..0b557c5c29 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
@@ -2,21 +2,40 @@
 <androidx.constraintlayout.widget.ConstraintLayout 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="@dimen/dp_964"
+    android:layout_width="@dimen/dp_960"
     android:layout_height="match_parent">
 
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/clBoneTabChild"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_1128"
+        android:elevation="1dp"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <com.mogo.eagle.core.function.hmi.bone.tab.CarInfoTabView
+            android:id="@+id/carInfoTabView"
+            android:layout_width="match_parent"
+            android:layout_marginStart="@dimen/dp_20"
+            android:layout_marginEnd="@dimen/dp_20"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            android:layout_height="match_parent"/>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="@dimen/dp_224"
         android:layout_marginBottom="@dimen/dp_m_2"
         android:background="@drawable/bone_tab_bg"
         android:elevation="10dp"
-        android:orientation="horizontal"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent">
 
-        <com.mogo.eagle.core.function.hmi.ui.bone.TabSwitchView
+        <com.mogo.eagle.core.function.hmi.bone.TabSwitchView
             android:id="@+id/tabSwitchCarInfo"
             android:layout_width="@dimen/dp_220"
             android:layout_height="@dimen/dp_140"
@@ -29,7 +48,7 @@
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <com.mogo.eagle.core.function.hmi.ui.bone.TabSwitchView
+        <com.mogo.eagle.core.function.hmi.bone.TabSwitchView
             android:id="@+id/tabSwitchMsgBox"
             android:layout_width="@dimen/dp_220"
             android:layout_height="@dimen/dp_140"
@@ -40,7 +59,7 @@
             app:layout_constraintLeft_toRightOf="@+id/tabSwitchCarInfo"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <com.mogo.eagle.core.function.hmi.ui.bone.TabSwitchView
+        <com.mogo.eagle.core.function.hmi.bone.TabSwitchView
             android:id="@+id/tabSwitchReport"
             android:layout_width="@dimen/dp_220"
             android:layout_height="@dimen/dp_140"
@@ -51,7 +70,7 @@
             app:layout_constraintLeft_toRightOf="@+id/tabSwitchMsgBox"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <com.mogo.eagle.core.function.hmi.ui.bone.TabSwitchView
+        <com.mogo.eagle.core.function.hmi.bone.TabSwitchView
             android:id="@+id/tabSwitchMore"
             android:layout_width="@dimen/dp_220"
             android:layout_height="@dimen/dp_140"
@@ -63,21 +82,5 @@
             app:layout_constraintTop_toTopOf="parent" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/clBoneTabChild"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/dp_1128"
-        android:elevation="1dp"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/clCarInfo"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@color/acc_default_txt_color" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
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
new file mode 100644
index 0000000000..feb35276a6
--- /dev/null
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_car_info_tab.xml
@@ -0,0 +1,94 @@
+<?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"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/background_color">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginTop="@dimen/dp_21">
+
+        <View
+            android:id="@+id/topViewPos"
+            android:layout_width="@dimen/dp_856"
+            android:layout_height="@dimen/dp_100"
+            android:background="@drawable/bg_tab_view_top"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:layout_width="@dimen/dp_160"
+            android:layout_height="@dimen/dp_56"
+            android:layout_marginStart="@dimen/dp_64"
+            android:layout_marginTop="@dimen/dp_34"
+            android:text="@string/tab_car_info"
+            android:textColor="@color/color_CC_FFFFFF"
+            android:textSize="@dimen/dp_40"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <ImageView
+            android:id="@+id/ivCarType"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_280"
+            android:layout_marginTop="@dimen/dp_75"
+            app:layout_constraintTop_toBottomOf="@+id/topViewPos"
+            tools:ignore="ContentDescription" />
+
+        <TextView
+            android:id="@+id/tvCarLoginPos"
+            android:layout_width="@dimen/dp_152"
+            android:layout_height="@dimen/dp_53"
+            android:layout_marginStart="@dimen/dp_60"
+            android:layout_marginTop="@dimen/dp_22"
+            android:text="@string/tab_car_login_info"
+            android:textColor="@color/white"
+            android:textSize="@dimen/dp_38"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/ivCarType" />
+
+        <TextView
+            android:id="@+id/tvCarLoginInfo"
+            android:layout_width="@dimen/dp_185"
+            android:layout_height="@dimen/dp_45"
+            android:layout_marginStart="@dimen/dp_16"
+            android:layout_marginTop="@dimen/dp_7"
+            android:gravity="center"
+            android:textColor="@color/white"
+            android:textSize="@dimen/dp_32"
+            app:layout_constraintBottom_toBottomOf="@+id/tvCarLoginPos"
+            app:layout_constraintLeft_toRightOf="@+id/tvCarLoginPos"
+            app:layout_constraintTop_toTopOf="@+id/tvCarLoginPos" />
+
+        <TextView
+            android:id="@+id/tvCarExit"
+            android:layout_width="@dimen/dp_64"
+            android:layout_height="@dimen/dp_45"
+            android:layout_marginEnd="@dimen/dp_60"
+            android:gravity="center"
+            android:text="@string/tab_car_exit"
+            android:textColor="@color/color_FF1943"
+            android:textSize="@dimen/dp_32"
+            app:layout_constraintBottom_toBottomOf="@+id/tvCarLoginInfo"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/tvCarLoginInfo" />
+
+        <TextView
+            android:id="@+id/tvCarNoPos"
+            android:layout_width="@dimen/dp_152"
+            android:layout_height="@dimen/dp_53"
+            android:layout_marginStart="@dimen/dp_60"
+            android:layout_marginTop="@dimen/dp_49"
+            android:text="@string/tab_car_no"
+            android:textColor="@color/white"
+            android:textSize="@dimen/dp_38"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tvCarLoginPos" />
+
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml
index 29f5f47f65..2e6a7ccd9f 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml
@@ -27,6 +27,7 @@
     <color name="color_252B3F">#252B3F</color>
     <color name="color_131415">#131415</color>
     <color name="color_B2BED9">#B2BED9</color>
+    <color name="color_FF1943">#FF1943</color>
     <color name="color_27FFFFFF">#27FFFFFF</color>
     <color name="color_1E111111">#1E111111</color>
     <color name="color_FF213757">#FF213757</color>
@@ -47,6 +48,7 @@
     <color name="foreground_info">#FF333333</color>
     <color name="foreground_warn">#FFCCCCCC</color>
     <color name="color_80FFFFFF">#80FFFFFF</color>
+    <color name="color_CC_FFFFFF">#CCFFFFFF</color>
 
 
 
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/values/strings.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/values/strings.xml
index 21091c782c..d001c4cdd4 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/values/strings.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/values/strings.xml
@@ -2,6 +2,11 @@
     <string name="app_name">mogo-core-function-hmi</string>
     <string name="motice_push_check">查看</string>
 
+    <string name="tab_car_info">我的车辆</string>
+    <string name="tab_car_login_info">登陆信息</string>
+    <string name="tab_car_exit">退出</string>
+    <string name="tab_car_no">车辆绑定</string>
+
     <string name="log_min">最小化</string>
     <string name="log_info">日志</string>
     <string name="log_info_edt_hint">输入想要过滤的关键字</string>