From 8b10cb6df1863e3fcf8af3017e494e524d4e9eaa Mon Sep 17 00:00:00 2001 From: yangyakun Date: Tue, 31 Dec 2024 18:07:27 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[6.8.4]=20[fix]=20[bus=E3=80=81shuttle?= =?UTF-8?q?=E3=80=81Scheduled]=20[led=20end=20station]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/mogo/och/weaknet/model/LineModel.kt | 9 +++++++++ .../java/com/mogo/och/weaknet/model/ThirdDeviceData.kt | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/LineModel.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/LineModel.kt index 04a8b118b4..44933b0a36 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/LineModel.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/LineModel.kt @@ -304,6 +304,15 @@ object LineModel { } + fun isLastStation(end: BusStationBean):Boolean{ + return if (stationList.isNullOrEmpty()) { + false + }else{ + val last = stationList?.last() + return last==end + } + } + fun getTaskTime():String { return DateTimeUtil.formatLongToString( currentTask?.taskStartTime?:System.currentTimeMillis(), diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/ThirdDeviceData.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/ThirdDeviceData.kt index 44c56f12bf..c446c75c33 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/ThirdDeviceData.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/ThirdDeviceData.kt @@ -111,7 +111,7 @@ object ThirdDeviceData { lineInfo.lineName, start.name, end.name, - LineModel.isLastStation() == true + LineModel.isLastStation(end) ) } } From e1c023547428956c627f7a3f95b9ce09456b9408 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Tue, 31 Dec 2024 18:10:43 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[6.8.4]=20[fix]=20[login]=20[=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=88=A4=E7=A9=BA=E8=AE=B0=E5=BD=95]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/mogo/och/biz/login/LoginProvider.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/LoginProvider.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/LoginProvider.kt index f689914e4c..591e16019c 100644 --- a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/LoginProvider.kt +++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/LoginProvider.kt @@ -119,7 +119,7 @@ class LoginProvider : LoginService { } if (loginFragment is ILoginViewCallback) { UiThreadHandler.post({ - if (loginFragment!!.isAdded) { + if (loginFragment?.isAdded==true) { (loginFragment as ILoginViewCallback).showErrorInfo(businessInfo) } },UiThreadHandler.MODE.QUEUE) @@ -142,7 +142,7 @@ class LoginProvider : LoginService { changeStatus(checkAllEnv) UiThreadHandler.post({ changeStatus(checkAllEnv) - if (loginFragment!!.isAdded) { + if (loginFragment?.isAdded==true) { (loginFragment as ILoginViewCallback).checkAllEnv(checkAllEnv) } },UiThreadHandler.MODE.QUEUE) @@ -153,7 +153,7 @@ class LoginProvider : LoginService { } override fun changeStatus(currentStatus: String) { - if (loginFragment!!.isAdded) { + if (loginFragment?.isAdded==true) { (loginFragment as ILoginViewCallback).updateStatus(currentStatus) } }