From 0e000cf2d10d9e83ccdf92142c1e632de6cace13 Mon Sep 17 00:00:00 2001
From: zhongchao <zhongchao@zhidaoauto.com>
Date: Thu, 16 Feb 2023 21:02:10 +0800
Subject: [PATCH] [2.13.0-arch-opt]turn light bug fix and add toggle debug view
 trigger

---
 .../src/main/res/layout/bus_p_base_fragment.xml  |  8 ++++++++
 .../src/main/res/layout/bus_base_fragment.xml    |  8 ++++++++
 .../java/com/mogo/och/noop/OchNoopFragment.kt    |  5 +----
 .../main/res/layout/och_noop_fragment_hmi.xml    | 16 ++++++++--------
 .../src/main/res/layout/taxi_p_base_fragment.xml |  8 ++++++++
 .../src/main/res/layout/taxi_base_fragment.xml   |  8 ++++++++
 .../hmi/ui/setting/ToggleDebugViewTrigger.kt     | 16 ++++++++++++++++
 .../hmi/ui/vehicle/TurnLightViewStatus.kt        |  6 ++++--
 8 files changed, 61 insertions(+), 14 deletions(-)
 create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/ToggleDebugViewTrigger.kt

diff --git a/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml b/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml
index 3e12a1ebb2..96b90db2b4 100644
--- a/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml
+++ b/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml
@@ -12,6 +12,14 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"/>
 
+    <com.mogo.eagle.core.function.hmi.ui.setting.ToggleDebugViewTrigger
+        android:layout_width="@dimen/dp_400"
+        android:layout_height="@dimen/dp_100"
+        android:longClickable="true"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
     <com.mogo.eagle.core.function.hmi.ui.widget.SteeringWheelView
         android:id="@+id/steering_wheel"
         android:layout_width="@dimen/dp_490"
diff --git a/OCH/mogo-och-bus/src/main/res/layout/bus_base_fragment.xml b/OCH/mogo-och-bus/src/main/res/layout/bus_base_fragment.xml
index 582b0f7d84..f56ae10f7f 100644
--- a/OCH/mogo-och-bus/src/main/res/layout/bus_base_fragment.xml
+++ b/OCH/mogo-och-bus/src/main/res/layout/bus_base_fragment.xml
@@ -11,6 +11,14 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"/>
 
+    <com.mogo.eagle.core.function.hmi.ui.setting.ToggleDebugViewTrigger
+        android:layout_width="@dimen/dp_400"
+        android:layout_height="@dimen/dp_100"
+        android:longClickable="true"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
     <FrameLayout
         android:id="@+id/fl_speed"
         android:layout_width="@dimen/dp_616"
diff --git a/OCH/mogo-och-noop/src/main/java/com/mogo/och/noop/OchNoopFragment.kt b/OCH/mogo-och-noop/src/main/java/com/mogo/och/noop/OchNoopFragment.kt
index a716c3ba70..31b9425b91 100644
--- a/OCH/mogo-och-noop/src/main/java/com/mogo/och/noop/OchNoopFragment.kt
+++ b/OCH/mogo-och-noop/src/main/java/com/mogo/och/noop/OchNoopFragment.kt
@@ -24,10 +24,7 @@ class OchNoopFragment : MvpFragment<OchNoopContract.View?, OchNoopPresenter?>(),
     }
 
     override fun initViews() {
-        viewShowDebugView.setOnLongClickListener {
-            ToggleDebugView.toggleDebugView.toggle(requireContext())
-            true
-        }
+
     }
 
 
diff --git a/OCH/mogo-och-noop/src/main/res/layout/och_noop_fragment_hmi.xml b/OCH/mogo-och-noop/src/main/res/layout/och_noop_fragment_hmi.xml
index b5c29c1225..8cb712a588 100644
--- a/OCH/mogo-och-noop/src/main/res/layout/och_noop_fragment_hmi.xml
+++ b/OCH/mogo-och-noop/src/main/res/layout/och_noop_fragment_hmi.xml
@@ -6,19 +6,19 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <View
-        android:id="@+id/viewShowDebugView"
-        android:layout_width="@dimen/dp_400"
-        android:layout_height="@dimen/dp_100"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
-
     <com.mogo.eagle.core.function.view.MapBizView
         android:id="@+id/mapBizView"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
+    <com.mogo.eagle.core.function.hmi.ui.setting.ToggleDebugViewTrigger
+        android:layout_width="@dimen/dp_400"
+        android:layout_height="@dimen/dp_100"
+        android:longClickable="true"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
     <!--刹车、转向-->
     <com.mogo.eagle.core.function.hmi.ui.vehicle.SteeringBrakeView
         android:layout_width="wrap_content"
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml
index d8661b96c3..9e0352eb96 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml
@@ -10,6 +10,14 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"/>
 
+    <com.mogo.eagle.core.function.hmi.ui.setting.ToggleDebugViewTrigger
+        android:layout_width="@dimen/dp_400"
+        android:layout_height="@dimen/dp_100"
+        android:longClickable="true"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
     <com.mogo.eagle.core.function.hmi.ui.widget.SteeringWheelView
         android:id="@+id/steering_wheel"
         android:layout_width="@dimen/dp_630"
diff --git a/OCH/mogo-och-taxi/src/main/res/layout/taxi_base_fragment.xml b/OCH/mogo-och-taxi/src/main/res/layout/taxi_base_fragment.xml
index f67fbec9cc..849f2e05f1 100644
--- a/OCH/mogo-och-taxi/src/main/res/layout/taxi_base_fragment.xml
+++ b/OCH/mogo-och-taxi/src/main/res/layout/taxi_base_fragment.xml
@@ -11,6 +11,14 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"/>
 
+    <com.mogo.eagle.core.function.hmi.ui.setting.ToggleDebugViewTrigger
+        android:layout_width="@dimen/dp_400"
+        android:layout_height="@dimen/dp_100"
+        android:longClickable="true"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
     <LinearLayout
         android:id="@+id/module_mogo_och_speed_layout"
         android:layout_height="@dimen/taxi_tab_speed_width_height"
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/ToggleDebugViewTrigger.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/ToggleDebugViewTrigger.kt
new file mode 100644
index 0000000000..72de44ebc8
--- /dev/null
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/ToggleDebugViewTrigger.kt
@@ -0,0 +1,16 @@
+package com.mogo.eagle.core.function.hmi.ui.setting
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.View
+
+class ToggleDebugViewTrigger(context: Context, attrs: AttributeSet?
+) : View(context, attrs){
+
+    init {
+        setOnLongClickListener {
+            ToggleDebugView.toggleDebugView.toggle(this.context)
+            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/vehicle/TurnLightViewStatus.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/TurnLightViewStatus.kt
index fd1931ee7f..c4ebcd4dae 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/TurnLightViewStatus.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/TurnLightViewStatus.kt
@@ -163,8 +163,10 @@ open class TurnLightViewStatus @JvmOverloads constructor(
             }
 
             override fun onAnimationEnd(p0: Animation?) {
-                left_nor_image.visibility = View.GONE
-                right_nor_image.visibility = View.GONE
+                if (!visible) {
+                    left_nor_image.visibility = View.GONE
+                    right_nor_image.visibility = View.GONE
+                }
             }
         })