yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_robobus-d_241202_6.8.4' into dev_robobus-d_241202_6.8.4_autopilot

Browse Source
This commit is contained in:
xyz
2025-01-02 10:12:27 +08:00
parent c1ac33effe e1c0235474
commit a8979fd7df
3 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OCH/common/biz/src/main/java/com/mogo/och/biz/login/LoginProvider.kt
View File

@@ -119,7 +119,7 @@ class LoginProvider : LoginService {
} }
if (loginFragment is ILoginViewCallback) { if (loginFragment is ILoginViewCallback) {
UiThreadHandler.post({ UiThreadHandler.post({
if (loginFragment!!.isAdded) { if (loginFragment?.isAdded==true) {
(loginFragment as ILoginViewCallback).showErrorInfo(businessInfo) (loginFragment as ILoginViewCallback).showErrorInfo(businessInfo)
} }
},UiThreadHandler.MODE.QUEUE) },UiThreadHandler.MODE.QUEUE)
@@ -142,7 +142,7 @@ class LoginProvider : LoginService {
changeStatus(checkAllEnv) changeStatus(checkAllEnv)
UiThreadHandler.post({ UiThreadHandler.post({
changeStatus(checkAllEnv) changeStatus(checkAllEnv)
if (loginFragment!!.isAdded) { if (loginFragment?.isAdded==true) {
(loginFragment as ILoginViewCallback).checkAllEnv(checkAllEnv) (loginFragment as ILoginViewCallback).checkAllEnv(checkAllEnv)
} }
},UiThreadHandler.MODE.QUEUE) },UiThreadHandler.MODE.QUEUE)
@@ -153,7 +153,7 @@ class LoginProvider : LoginService {
} }
override fun changeStatus(currentStatus: String) { override fun changeStatus(currentStatus: String) {
if (loginFragment!!.isAdded) { if (loginFragment?.isAdded==true) {
(loginFragment as ILoginViewCallback).updateStatus(currentStatus) (loginFragment as ILoginViewCallback).updateStatus(currentStatus)
} }
} }

9
OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/LineModel.kt
View File

@@ -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 { fun getTaskTime():String {
return DateTimeUtil.formatLongToString( return DateTimeUtil.formatLongToString(
currentTask?.taskStartTime?:System.currentTimeMillis(), currentTask?.taskStartTime?:System.currentTimeMillis(),

2
OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/ThirdDeviceData.kt
View File

@@ -111,7 +111,7 @@ object ThirdDeviceData {
lineInfo.lineName, lineInfo.lineName,
start.name, start.name,
end.name, end.name,
LineModel.isLastStation() == true LineModel.isLastStation(end)
) )
} }
} }