From b2d6f3235759282f66518442bbc62887f07bd9d5 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Thu, 9 Mar 2023 19:19:06 +0800
Subject: [PATCH] =?UTF-8?q?[m1]=20[1.1.2]=20[=E5=80=92=E8=AE=A1=E6=97=B6?=
 =?UTF-8?q?=E3=80=81=E7=BB=93=E6=9D=9F=E8=AE=A2=E5=8D=95tts]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../och/bus/passenger/model/CharterPassengerModel.kt | 12 +++++++++++-
 .../bus/passenger/presenter/BusPassengerPresenter.kt |  4 ++++
 .../com/mogo/och/bus/passenger/ui/MainFragment.kt    |  1 +
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt
index f6352445b9..87f5e7edbb 100644
--- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt
+++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt
@@ -535,7 +535,17 @@ object CharterPassengerModel {
                                         }
                                     }
                                 }
-                                iDistanceTimeCallback?.setOrderTimeCallBack(millisUntilFinished+60)
+
+                                if(orderInfo==null){
+                                    subscribeCountDown?.let {
+                                        if (!it.isDisposed) {
+                                            it.dispose()
+                                        }
+                                    }
+                                    iDistanceTimeCallback?.setOrderTimeCallBack(-1)
+                                }else{
+                                    iDistanceTimeCallback?.setOrderTimeCallBack(millisUntilFinished+60)
+                                }
                                 CallerLogger.d(
                                     M_BUS_P + TAG,
                                     "倒计时${millisUntilFinished}"
diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt
index fc273721a1..578c629247 100644
--- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt
+++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt
@@ -154,6 +154,10 @@ class BusPassengerPresenter(view: MainFragment?) :
     }
 
     override fun setOrderTimeCallBack(timeInSecond: Long) {
+        if(timeInSecond<0){
+            setOrderTime("--","--")
+            return
+        }
         val surplusTime = (timeInSecond / 60).toInt()
 
         val beforeTime = Calendar.getInstance()
diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/MainFragment.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/MainFragment.kt
index 3bc696dec9..5eed5ae459 100644
--- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/MainFragment.kt
+++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/MainFragment.kt
@@ -243,6 +243,7 @@ class MainFragment :
             }
             if (ClickUtils.isFastClick()) {
                 m1CarUserNoOrderFragment.show(parentFragmentManager, TAG)
+                VoiceManager.endOrder()
                 CallerLogger.d(SceneConstant.M_BUS_P + TAG, "展示开关门")
             } else {
                 CallerLogger.d(