From 6a99016b90451f373b898649fc775480a2688656 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Thu, 9 Mar 2023 10:01:45 +0800 Subject: [PATCH] =?UTF-8?q?[m1]=20[1.1.2]=20[=E5=80=92=E8=AE=A1=E6=97=B6?= =?UTF-8?q?=E5=92=8C=E5=8F=B8=E6=9C=BA=E7=AB=AF=E5=90=8C=E6=AD=A5=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A060s]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/och/bus/passenger/model/CharterPassengerModel.kt | 2 +- .../mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 ac6c34ee37..f6352445b9 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,7 @@ object CharterPassengerModel { } } } - iDistanceTimeCallback?.setOrderTimeCallBack(millisUntilFinished) + 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 e4262c5863..fc273721a1 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,7 +154,7 @@ class BusPassengerPresenter(view: MainFragment?) : } override fun setOrderTimeCallBack(timeInSecond: Long) { - val surplusTime = Math.ceil(timeInSecond.toDouble() / 60f).toInt() + val surplusTime = (timeInSecond / 60).toInt() val beforeTime = Calendar.getInstance() beforeTime.add(Calendar.MINUTE, surplusTime)