Merge remote-tracking branch 'origin/dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0' into dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0

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}"

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()

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(