From 9ae98eb2793d91f5e7c314c2fae8cbdd9fd7820d Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Mon, 10 Apr 2023 19:38:35 +0800
Subject: [PATCH] =?UTF-8?q?[3.0.0]=20=E5=A4=84=E7=90=86=E5=8C=85=E8=BD=A6?=
 =?UTF-8?q?=E5=8F=B8=E6=9C=BA=E7=AB=AF=E5=80=92=E8=AE=A1=E6=97=B6bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../magic/mogo/och/charter/callback/DriverM1OrderCallback.kt  | 1 +
 .../com/magic/mogo/och/charter/fragment/DriverM1Fragment.kt   | 2 +-
 .../java/com/magic/mogo/och/charter/model/DriverM1Model.kt    | 1 +
 .../com/magic/mogo/och/charter/presenter/DriverM1Presenter.kt | 4 ++++
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/callback/DriverM1OrderCallback.kt b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/callback/DriverM1OrderCallback.kt
index ac199b8ed6..32496916dc 100644
--- a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/callback/DriverM1OrderCallback.kt
+++ b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/callback/DriverM1OrderCallback.kt
@@ -9,5 +9,6 @@ import com.magic.mogo.och.charter.bean.QueryCurrentOrderResponse
 interface DriverM1OrderCallback {
     fun updateOrderUI(orderStatus: QueryCurrentOrderResponse.Result) // 到达站
     fun updateOverCountDown(minutes: Long) //倒计时ms
+    fun clearCountDown() //清除倒计时
     fun updateReturnCarStatus(returnSuccess: Boolean)
 }
\ No newline at end of file
diff --git a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/fragment/DriverM1Fragment.kt b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/fragment/DriverM1Fragment.kt
index 08cf7824a9..8ad297cf23 100644
--- a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/fragment/DriverM1Fragment.kt
+++ b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/fragment/DriverM1Fragment.kt
@@ -186,7 +186,7 @@ class DriverM1Fragment : CharterBaseFragment<DriverM1Fragment?, DriverM1Presente
         }.start()
     }
 
-    private fun clearCountDownTimer() {
+    fun clearCountDownTimer() {
         if (countDownTimer != null){
             countDownTimer?.cancel()
             countDownTimer = null
diff --git a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt
index 329eb1953f..2748b32e18 100644
--- a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt
+++ b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt
@@ -517,6 +517,7 @@ class DriverM1Model {
             DriverM1LooperManager.starCountDownLoop()
         }else{
             DriverM1LooperManager.stopCountDownLoop()
+            mOrderCallback?.clearCountDown()
         }
     }
 
diff --git a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/presenter/DriverM1Presenter.kt b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/presenter/DriverM1Presenter.kt
index f40d8a9e05..176e8236c7 100644
--- a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/presenter/DriverM1Presenter.kt
+++ b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/presenter/DriverM1Presenter.kt
@@ -105,6 +105,10 @@ class DriverM1Presenter(view: DriverM1Fragment?) :
         mView?.updateCountDown(minutes)
     }
 
+    override fun clearCountDown() {
+        mView?.clearCountDownTimer()
+    }
+
     override fun updateReturnCarStatus(returnSuccess: Boolean) {
         mView?.updateReturnCarStatus(returnSuccess)
     }