From 5795a5bd68126ce3a18e12686b7f5da50e689036 Mon Sep 17 00:00:00 2001
From: xuxinchao <xuxinchao@zhidaoauto.com>
Date: Fri, 12 Jul 2024 15:54:21 +0800
Subject: [PATCH] =?UTF-8?q?[6.5.0]=E5=8F=AA=E6=9C=89=E5=9C=A8=E6=9C=89?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81=E4=B8=8B=E6=89=8D=E5=BC=80?=
 =?UTF-8?q?=E5=A7=8B=E5=AE=89=E5=BF=83=E6=8E=A2=E6=9F=A5=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=80=92=E8=AE=A1=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../rodedata/OchAutomaticExplorationView.kt   | 38 ++++++++++++-----
 .../main/res/layout/taxi_base_fragment.xml    |  2 +-
 .../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 +-
 .../exploration/AutomaticExplorationView.kt   | 41 +++++++++++++------
 6 files changed, 61 insertions(+), 26 deletions(-)

diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/rodedata/OchAutomaticExplorationView.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/rodedata/OchAutomaticExplorationView.kt
index 24b5a8cc21..595b23a56f 100644
--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/rodedata/OchAutomaticExplorationView.kt
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/rodedata/OchAutomaticExplorationView.kt
@@ -20,18 +20,36 @@ class OchAutomaticExplorationView @JvmOverloads constructor(
 
     override fun onCurrentOrderStatusChanged(order: BaseOrderBean?) {
         if(order==null){
-
+            cancelTimer()
         }else {
             when (order.orderStatus) {
-                TaxiOrderStatusEnum.None.code -> {}
-                TaxiOrderStatusEnum.OnTheWayToStart.code -> {}
-                TaxiOrderStatusEnum.ArriveAtStart.code -> {}
-                TaxiOrderStatusEnum.UserArriveAtStart.code -> {}
-                TaxiOrderStatusEnum.OnTheWayToEnd.code -> {}
-                TaxiOrderStatusEnum.ArriveAtEnd.code -> {}
-                TaxiOrderStatusEnum.JourneyCompleted.code -> {}
-                TaxiOrderStatusEnum.Cancel.code -> {}
-                else -> {}
+                TaxiOrderStatusEnum.None.code -> {
+                    startShowTimer()
+                }
+                TaxiOrderStatusEnum.OnTheWayToStart.code -> {
+                    startShowTimer()
+                }
+                TaxiOrderStatusEnum.ArriveAtStart.code -> {
+                    startShowTimer()
+                }
+                TaxiOrderStatusEnum.UserArriveAtStart.code -> {
+                    startShowTimer()
+                }
+                TaxiOrderStatusEnum.OnTheWayToEnd.code -> {
+                    startShowTimer()
+                }
+                TaxiOrderStatusEnum.ArriveAtEnd.code -> {
+                    startShowTimer()
+                }
+                TaxiOrderStatusEnum.JourneyCompleted.code -> {
+                    startShowTimer()
+                }
+                TaxiOrderStatusEnum.Cancel.code -> {
+                    cancelTimer()
+                }
+                else -> {
+                    cancelTimer()
+                }
             }
         }
     }
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 44e48b71d2..5a6ce8e0ec 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
@@ -160,7 +160,7 @@
         app:layout_constraintTop_toTopOf="parent" />
 
     <!--自动探查-->
-    <com.mogo.eagle.core.function.hmi.ui.notice.exploration.AutomaticExplorationView
+    <com.mogo.och.common.module.wigets.rodedata.OchAutomaticExplorationView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         app:layout_constraintRight_toRightOf="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 1bfb6a09df..fdd39dbdfb 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
@@ -203,7 +203,7 @@
         app:layout_constraintTop_toTopOf="parent" />
 
     <!--自动探查-->
-    <com.mogo.eagle.core.function.hmi.ui.notice.exploration.AutomaticExplorationView
+    <com.mogo.och.common.module.wigets.rodedata.OchAutomaticExplorationView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="@dimen/dp_20"
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 ce7bda2a37..d66cfda948 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
@@ -219,7 +219,7 @@
         app:layout_constraintTop_toTopOf="parent" />
 
     <!--自动探查-->
-    <com.mogo.eagle.core.function.hmi.ui.notice.exploration.AutomaticExplorationView
+    <com.mogo.och.common.module.wigets.rodedata.OchAutomaticExplorationView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         app:layout_constraintRight_toRightOf="parent"
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 0b708d58f7..7e679e6262 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
@@ -106,7 +106,7 @@
         app:layout_constraintTop_toTopOf="parent" />
 
     <!--自动探查-->
-    <com.mogo.eagle.core.function.hmi.ui.notice.exploration.AutomaticExplorationView
+    <com.mogo.och.common.module.wigets.rodedata.OchAutomaticExplorationView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="@dimen/dp_20"
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/exploration/AutomaticExplorationView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/exploration/AutomaticExplorationView.kt
index 88e9d3eead..19982583ca 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/exploration/AutomaticExplorationView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/exploration/AutomaticExplorationView.kt
@@ -43,6 +43,7 @@ open class AutomaticExplorationView @JvmOverloads constructor(
     private var automaticExplorationAdapter: AutomaticExplorationAdapter ?= null
     private var rotationAnim: ObjectAnimator ?= null
     private var showViewTimer: CountDownTimer ?= null //展示自动探查倒计时
+    private var isCountingDown: Boolean = false //是否处于倒计时中
 
     companion object {
         private const val TAG = "AutomaticExplorationView"
@@ -88,21 +89,29 @@ open class AutomaticExplorationView @JvmOverloads constructor(
         automaticExplorationAdapter = AutomaticExplorationAdapter(context,user)
         rvExplorationList?.adapter = automaticExplorationAdapter
         rvExplorationList?.layoutManager = linearLayoutManager
-        startShowTimer()
     }
 
-    private fun startShowTimer(){
-        ThreadUtils.runOnUiThread {
-            showViewTimer = object: CountDownTimer(EXPLORATION_SHOW_TIME,EXPLORATION_SHOW_TIME){
-                override fun onTick(millisUntilFinished: Long) {
+    /**
+     * 开始倒计时
+     */
+    fun startShowTimer(){
+        if(!isCountingDown){
+            ThreadUtils.runOnUiThread {
+                if(showViewTimer == null){
+                    showViewTimer = object: CountDownTimer(EXPLORATION_SHOW_TIME,EXPLORATION_SHOW_TIME){
+                        override fun onTick(millisUntilFinished: Long) {
 
-                }
+                        }
 
-                override fun onFinish() {
-                    showAutoExploration()
+                        override fun onFinish() {
+                            showAutoExploration()
+                            isCountingDown = false
+                        }
+                    }
                 }
+                isCountingDown = true
+                showViewTimer?.start()
             }
-            showViewTimer?.start()
         }
     }
 
@@ -177,8 +186,7 @@ open class AutomaticExplorationView @JvmOverloads constructor(
     override fun onDetachedFromWindow() {
         super.onDetachedFromWindow()
         CallerMsgBoxListenerManager.removeListener(TAG)
-        showViewTimer?.cancel()
-        showViewTimer = null
+        cancelTimer()
     }
 
     /**
@@ -188,10 +196,19 @@ open class AutomaticExplorationView @JvmOverloads constructor(
         if(category == MsgCategory.NOTICE){
             if(msgBoxList.type == MsgBoxType.V2X){
                 //重置倒计时时长
-                showViewTimer?.cancel()
+                cancelTimer()
                 startShowTimer()
             }
         }
     }
 
+    /**
+     * 取消倒计时
+     */
+    fun cancelTimer(){
+        showViewTimer?.cancel()
+        showViewTimer = null
+        isCountingDown = false
+    }
+
 }
\ No newline at end of file