From bafceb6c4fea33b9298dd56e1dcd03eab8b1aa0c Mon Sep 17 00:00:00 2001 From: yangyakun Date: Tue, 21 Mar 2023 18:16:11 +0800 Subject: [PATCH] =?UTF-8?q?[m1]=20[=E5=80=92=E8=AE=A1=E6=97=B6]=20[?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=B0=E7=AB=99=E8=AE=B0=E5=BD=95=E9=A1=B9?= =?UTF-8?q?=EF=BC=9A1=E3=80=81=E5=BA=95=E7=9B=98=E4=BC=A0=E9=80=922?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=BD=AE=E8=AE=AD3=E8=B7=9D=E7=A6=BB?= =?UTF-8?q?=E5=B1=95=E7=A4=BA(=E6=96=B0=E5=A2=9E)]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../och/bus/passenger/model/CharterPassengerModel.kt | 3 +++ .../com/mogo/och/bus/passenger/ui/view/LineSiteView.kt | 9 +++++++-- 2 files changed, 10 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 8033d9a606..f0be5f21dc 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 @@ -710,6 +710,9 @@ object CharterPassengerModel { "---lastSumLength: " + lastSumLength + "----lastTime : " + lastTime + " thread = " + Thread.currentThread().name ) + if (lastSumLength < CharterPassengerConst.ARRIVE_AT_START_STATION_DISTANCE) { + arriveDest() + } iDistanceTimeCallback?.setDistancecAndTime(lastSumLength.toLong(), lastTime.toLong()) } } diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/LineSiteView.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/LineSiteView.kt index bc91b24827..d037c0db7e 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/LineSiteView.kt +++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/LineSiteView.kt @@ -255,6 +255,11 @@ class LineSiteView @JvmOverloads constructor( TAGLINELOOP, LoopInfo(3, ::checkServerStatus) ) + RxUtils.disposeSubscribe(subscribeSelectLine) + subscribeSelectLine= RxUtils.createSubscribe(120_000){ + ToastUtils.showShort("请联系安全员确认") + endAni() + } } } tv_site_submit.onClick { @@ -288,8 +293,8 @@ class LineSiteView @JvmOverloads constructor( TAGLINELOOP, LoopInfo(3, ::checkServerStatus) ) - RxUtils.disposeSubscribe(subscribeSelectLine) - subscribeSelectLine= RxUtils.createSubscribe(120_000){ + RxUtils.disposeSubscribe(subscribeSelectSite) + subscribeSelectSite = RxUtils.createSubscribe(120_000){ ToastUtils.showShort("请联系安全员确认") endAni() }