From 52909df70be8a9fe84fbf356b6319477b10d3d49 Mon Sep 17 00:00:00 2001
From: renwj <renwenjie920@hotmail.com>
Date: Thu, 26 Sep 2024 18:41:20 +0800
Subject: [PATCH] =?UTF-8?q?[6.7.0][=E7=8A=B6=E6=80=81=E6=A0=8F=E6=94=B9?=
 =?UTF-8?q?=E7=89=88]=20=E6=94=B9=E5=8F=98=E7=8A=B6=E6=80=81=E6=A0=8F?=
 =?UTF-8?q?=E9=AB=98=E5=BA=A672dp->67dp?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/res/layout/charter_base_fragment.xml |  2 +-
 .../mogo/och/facade/route/FacadeProvider.kt   |  2 +-
 .../main/res/layout/offline_base_fragment.xml |  2 +-
 .../res/layout/shuttle_wadk_task_running.xml  |  2 +-
 .../main/res/layout/sweeper_base_fragment.xml |  2 +-
 .../layout/sweeper_cloud_base_fragment.xml    |  2 +-
 .../main/res/layout/taxi_base_fragment.xml    |  2 +-
 .../layout/taxi_operation_tab_item_custom.xml |  2 +-
 .../layout/unmanned_taxi_base_fragment.xml    |  2 +-
 .../hmi/bone/toolkit/ToolKitDataManager.kt    |  1 -
 .../core/function/hmi/ui/MoGoHmiProvider.kt   | 23 ++++++++++++-------
 .../res/layout/hmi_steering_wheel_bus.xml     |  4 ++--
 .../res/layout/item_passenger_msg_box_v2x.xml |  4 ++--
 .../res/layout/module_main_activity_main.xml  |  2 +-
 .../src/main/res/layout/view_car_info_tab.xml |  2 +-
 .../src/main/res/layout/view_fault_reason.xml | 10 ++++----
 .../src/main/res/layout/view_status_bar.xml   |  2 +-
 .../src/main/res/layout/view_wifi_state.xml   |  2 +-
 .../src/main/res/layout/view_work_order.xml   | 10 ++++----
 .../src/main/res/values/dimens.xml            |  1 +
 20 files changed, 43 insertions(+), 36 deletions(-)

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 f3d5d7b9bf..118eac2203 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
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout_marginTop="@dimen/dp_72">
+    android:layout_marginTop="@dimen/dp_status_bar_height">
     <!--高精地图-->
     <com.mogo.eagle.core.function.view.MapBizView
         android:id="@+id/mapBizView"
diff --git a/OCH/facade/src/main/java/com/mogo/och/facade/route/FacadeProvider.kt b/OCH/facade/src/main/java/com/mogo/och/facade/route/FacadeProvider.kt
index 62e3b7c16a..d5be5d83a9 100644
--- a/OCH/facade/src/main/java/com/mogo/och/facade/route/FacadeProvider.kt
+++ b/OCH/facade/src/main/java/com/mogo/och/facade/route/FacadeProvider.kt
@@ -231,7 +231,7 @@ abstract class FacadeProvider : IMoGoFunctionProvider, ILoginCallback {
             removeStatusBar()
         } else {
             onBusinessChange(businessEnum)
-            LoginStatusManager.setLoginStatus(LoginStatusEnum.Login)
+//            LoginStatusManager.setLoginStatus(LoginStatusEnum.Login)
             val supportFragmentManager: FragmentManager? = activity?.supportFragmentManager
             val fragment = getFragment()
             d(TAG, "切换 fragment:${fragment}_activity:$activity _ ${containerId}_$this")
diff --git a/OCH/offline/driver/src/main/res/layout/offline_base_fragment.xml b/OCH/offline/driver/src/main/res/layout/offline_base_fragment.xml
index 05277af1b5..971385fc58 100644
--- a/OCH/offline/driver/src/main/res/layout/offline_base_fragment.xml
+++ b/OCH/offline/driver/src/main/res/layout/offline_base_fragment.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout_marginTop="@dimen/dp_72">
+    android:layout_marginTop="@dimen/dp_status_bar_height">
 
     <com.mogo.och.offline.view.BizMapView
         android:id="@+id/mapBizView"
diff --git a/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_wadk_task_running.xml b/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_wadk_task_running.xml
index 6303daf800..2d24367bde 100644
--- a/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_wadk_task_running.xml
+++ b/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_wadk_task_running.xml
@@ -4,7 +4,7 @@
     android:layout_width="960dp"
     android:layout_height="match_parent"
     android:background="#F0151D41"
-    android:layout_marginTop="@dimen/dp_72"
+    android:layout_marginTop="@dimen/dp_status_bar_height"
     android:id="@+id/clLayout"
     >
 
diff --git a/OCH/sweeper/driver/src/main/res/layout/sweeper_base_fragment.xml b/OCH/sweeper/driver/src/main/res/layout/sweeper_base_fragment.xml
index 84c1b3dd01..a996505d9a 100644
--- a/OCH/sweeper/driver/src/main/res/layout/sweeper_base_fragment.xml
+++ b/OCH/sweeper/driver/src/main/res/layout/sweeper_base_fragment.xml
@@ -5,7 +5,7 @@
     android:id="@+id/sweeper_root_View"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout_marginTop="@dimen/dp_72"
+    android:layout_marginTop="@dimen/dp_status_bar_height"
     android:clickable="true">
 
     <com.mogo.eagle.core.function.view.MapBizView
diff --git a/OCH/sweeper/driver/src/main/res/layout/sweeper_cloud_base_fragment.xml b/OCH/sweeper/driver/src/main/res/layout/sweeper_cloud_base_fragment.xml
index 76386bdeee..bbb42f2ac2 100644
--- a/OCH/sweeper/driver/src/main/res/layout/sweeper_cloud_base_fragment.xml
+++ b/OCH/sweeper/driver/src/main/res/layout/sweeper_cloud_base_fragment.xml
@@ -5,7 +5,7 @@
     android:id="@+id/sweeper_root_View"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout_marginTop="@dimen/dp_72"
+    android:layout_marginTop="@dimen/dp_status_bar_height"
     android:clickable="true">
 
     <com.mogo.eagle.core.function.view.MapBizView
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 730ca8ec3d..4a5090a3d6 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
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout_marginTop="@dimen/dp_72">
+    android:layout_marginTop="@dimen/dp_status_bar_height">
 
     <com.mogo.eagle.core.function.hmi.ui.setting.ToggleDebugViewTrigger
         android:layout_width="@dimen/dp_400"
diff --git a/OCH/taxi/driver/src/main/res/layout/taxi_operation_tab_item_custom.xml b/OCH/taxi/driver/src/main/res/layout/taxi_operation_tab_item_custom.xml
index 7db8cad308..762a3346ab 100644
--- a/OCH/taxi/driver/src/main/res/layout/taxi_operation_tab_item_custom.xml
+++ b/OCH/taxi/driver/src/main/res/layout/taxi_operation_tab_item_custom.xml
@@ -18,7 +18,7 @@
 
     <ImageView
         android:id="@+id/operation_tab_line_iv"
-        android:layout_width="@dimen/dp_72"
+        android:layout_width="@dimen/dp_status_bar_height"
         android:layout_height="@dimen/dp_24"
         app:layout_constraintTop_toBottomOf="@+id/operation_tab_title"
         app:layout_constraintLeft_toLeftOf="parent"
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 afa1f93c78..8d91e5ba11 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
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout_marginTop="@dimen/dp_72">
+    android:layout_marginTop="@dimen/dp_status_bar_height">
     <com.mogo.eagle.core.function.view.MapBizView
         android:id="@+id/mapBizView"
         app:isWeatherEnable="false"
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/toolkit/ToolKitDataManager.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/toolkit/ToolKitDataManager.kt
index 3bed3e83df..759be8cbd3 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/toolkit/ToolKitDataManager.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/toolkit/ToolKitDataManager.kt
@@ -178,7 +178,6 @@ object ToolKitDataManager : IToolKitItemClickListener, IOrderListener {
 
             ToolTypeEnum.OPERATION_PANEL.name -> {
                 ctx?.also {
-//                    SopView.sopView.toggle(it)
                     CallerHmiManager.toggleOperatePanel(true)
                 }
             }
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 a72bdad6c9..7b2fa8f6f7 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
@@ -68,6 +68,7 @@ import com.zhjt.service_biz.BizConfig
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
+import java.lang.ref.WeakReference
 import java.util.concurrent.atomic.AtomicBoolean
 import java.util.concurrent.atomic.AtomicReference
 
@@ -95,6 +96,8 @@ class MoGoHmiProvider : IMoGoHmiProvider {
 
     private val xiaozhi by lazy { XiaoZhiStateManager() }
 
+    private val operatePanel by lazy { AtomicReference<WeakReference<View>>() }
+
     override fun init(context: Context?) {
         this.context = context
     }
@@ -448,22 +451,26 @@ class MoGoHmiProvider : IMoGoHmiProvider {
             Log.d(TAG, "toggleOperatePanel --- activity is null, show: $show")
             return
         }
+        var target = operatePanel.get()?.get()
         if (show) {
-            var target = activity.findViewById<View>(R.id.id_operate_panel)
             if (target == null) {
-                val vs = activity.findViewById<ViewStub>(R.id.vs_operate_panel) ?: throw AssertionError()
-                target = vs.inflate()
+                target = activity.findViewById(R.id.id_operate_panel)
+                if (target == null) {
+                    val vs = activity.findViewById<ViewStub>(R.id.vs_operate_panel) ?: throw AssertionError()
+                    target = vs.inflate()
+                }
+            }
+            if (target != null) {
+                operatePanel.set(WeakReference(target))
             }
             if (target != null && target.visibility != View.VISIBLE) {
                 TransitionManager.beginDelayedTransition(target.parent as ViewGroup, Slide(Gravity.START).also { it.duration = 150; it.addTarget(target) })
                 target.visibility = View.VISIBLE
-                target.post { target.bringToFront() }
             }
         } else {
-            val operatePanelView = activity.findViewById<View>(R.id.id_operate_panel)
-            if (operatePanelView != null && operatePanelView.visibility == View.VISIBLE) {
-                TransitionManager.beginDelayedTransition(operatePanelView.parent as ViewGroup, Slide(Gravity.START).also { it.duration = 150; it.addTarget(operatePanelView) })
-                operatePanelView.visibility = View.GONE
+            if (target != null && target.visibility == View.VISIBLE) {
+                TransitionManager.beginDelayedTransition(target.parent as ViewGroup, Slide(Gravity.START).also { it.duration = 150; it.addTarget(target) })
+                target.visibility = View.GONE
             }
         }
     }
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_steering_wheel_bus.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_steering_wheel_bus.xml
index d57659b22a..865f351d02 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_steering_wheel_bus.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_steering_wheel_bus.xml
@@ -48,7 +48,7 @@
         android:id="@+id/steering_tv_left"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_72"
+        android:layout_marginTop="@dimen/dp_status_bar_height"
         android:layout_marginRight="-16dp"
         android:gravity="right"
         android:text="0°"
@@ -63,7 +63,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginLeft="-16dp"
-        android:layout_marginTop="@dimen/dp_72"
+        android:layout_marginTop="@dimen/dp_status_bar_height"
         android:gravity="left"
         android:text="0°"
         android:textColor="#415479"
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_passenger_msg_box_v2x.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_passenger_msg_box_v2x.xml
index f128be2927..8638c693b9 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_passenger_msg_box_v2x.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_passenger_msg_box_v2x.xml
@@ -21,8 +21,8 @@
 
         <ImageView
             android:id="@+id/ivPassengerV2XImage"
-            android:layout_width="@dimen/dp_72"
-            android:layout_height="@dimen/dp_72"
+            android:layout_width="@dimen/dp_status_bar_height"
+            android:layout_height="@dimen/dp_status_bar_height"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintLeft_toLeftOf="parent"
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/module_main_activity_main.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/module_main_activity_main.xml
index ade816d6b1..102861b623 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/module_main_activity_main.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/module_main_activity_main.xml
@@ -47,7 +47,7 @@
         android:id="@id/vs_operate_panel"
         android:layout_width="@dimen/dp_1046"
         android:layout_height="match_parent"
-        android:layout_marginTop="@dimen/dp_72"
+        android:layout_marginTop="@dimen/dp_status_bar_height"
         android:inflatedId="@id/id_operate_panel"
         android:layout_gravity="start|top"
         android:layout="@layout/layout_operate_panel_holder" />
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 5127f01951..10ffbf69ed 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
@@ -101,7 +101,7 @@
             <TextView
                 android:id="@+id/tvCarNo"
                 android:layout_width="wrap_content"
-                android:layout_height="@dimen/dp_72"
+                android:layout_height="@dimen/dp_status_bar_height"
                 android:layout_marginStart="@dimen/dp_16"
                 android:background="@drawable/bg_tab_car_no"
                 android:gravity="center"
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_fault_reason.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_fault_reason.xml
index f86e4ba426..70f5111f12 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_fault_reason.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_fault_reason.xml
@@ -156,7 +156,7 @@
     <View
         android:id="@+id/viewTimeBg"
         android:layout_width="@dimen/dp_295"
-        android:layout_height="@dimen/dp_72"
+        android:layout_height="@dimen/dp_status_bar_height"
         app:layout_constraintLeft_toLeftOf="@id/viewFaultTimeLabel"
         app:layout_constraintTop_toBottomOf="@id/tvFaultTimeTitle"
         android:layout_marginTop="@dimen/dp_15"
@@ -165,8 +165,8 @@
 
     <ImageView
         android:id="@+id/ivTimeReduce"
-        android:layout_width="@dimen/dp_72"
-        android:layout_height="@dimen/dp_72"
+        android:layout_width="@dimen/dp_status_bar_height"
+        android:layout_height="@dimen/dp_status_bar_height"
         android:src="@drawable/icon_fault_time_reduce"
         app:layout_constraintTop_toTopOf="@id/viewTimeBg"
         app:layout_constraintBottom_toBottomOf="@id/viewTimeBg"
@@ -176,8 +176,8 @@
 
     <ImageView
         android:id="@+id/ivTimeAdd"
-        android:layout_width="@dimen/dp_72"
-        android:layout_height="@dimen/dp_72"
+        android:layout_width="@dimen/dp_status_bar_height"
+        android:layout_height="@dimen/dp_status_bar_height"
         android:src="@drawable/icon_fault_time_add"
         app:layout_constraintTop_toTopOf="@id/viewTimeBg"
         app:layout_constraintBottom_toBottomOf="@id/viewTimeBg"
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_status_bar.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_status_bar.xml
index 4e8bf3f9cf..b8a82bffcf 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_status_bar.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_status_bar.xml
@@ -2,7 +2,7 @@
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/dp_72"
+    android:layout_height="@dimen/dp_status_bar_height"
     tools:background="#A6000000"
     tools:parentTag="android.widget.FrameLayout">
 
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_wifi_state.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_wifi_state.xml
index 15ae97a3a0..56c1df9a57 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_wifi_state.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_wifi_state.xml
@@ -5,7 +5,7 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     tools:background="#A6000000"
-    tools:layout_height="@dimen/dp_72">
+    tools:layout_height="@dimen/dp_status_bar_height">
 
     <ImageView
         android:id="@+id/viewWifiStateBg"
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_work_order.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_work_order.xml
index 2124ee6bcd..61f7020e6b 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_work_order.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_work_order.xml
@@ -164,7 +164,7 @@
     <View
         android:id="@+id/view_time_bg"
         android:layout_width="@dimen/dp_295"
-        android:layout_height="@dimen/dp_72"
+        android:layout_height="@dimen/dp_status_bar_height"
         app:layout_constraintLeft_toLeftOf="@id/view_time_label"
         app:layout_constraintTop_toBottomOf="@id/tv_time_title"
         android:layout_marginTop="@dimen/dp_15"
@@ -173,8 +173,8 @@
 
     <ImageView
         android:id="@+id/iv_time_reduce"
-        android:layout_width="@dimen/dp_72"
-        android:layout_height="@dimen/dp_72"
+        android:layout_width="@dimen/dp_status_bar_height"
+        android:layout_height="@dimen/dp_status_bar_height"
         android:src="@drawable/icon_fault_time_reduce"
         app:layout_constraintTop_toTopOf="@id/view_time_bg"
         app:layout_constraintBottom_toBottomOf="@id/view_time_bg"
@@ -184,8 +184,8 @@
 
     <ImageView
         android:id="@+id/iv_time_add"
-        android:layout_width="@dimen/dp_72"
-        android:layout_height="@dimen/dp_72"
+        android:layout_width="@dimen/dp_status_bar_height"
+        android:layout_height="@dimen/dp_status_bar_height"
         android:src="@drawable/icon_fault_time_add"
         app:layout_constraintTop_toTopOf="@id/view_time_bg"
         app:layout_constraintBottom_toBottomOf="@id/view_time_bg"
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/values/dimens.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/values/dimens.xml
index 036c0ac988..d2b356c31c 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/values/dimens.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/values/dimens.xml
@@ -44,6 +44,7 @@
     <dimen name="dp_588">588dp</dimen>
     <dimen name="dp_1066">1066dp</dimen>
 
+    <dimen name="dp_status_bar_height">67dp</dimen>
     <dimen name="turnlight_bg_corner">60dp</dimen>
     <dimen name="turnlight_width">275dp</dimen>
     <dimen name="turnlight_height">120dp</dimen>