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

[gradle]

Browse Source 
[3.2.0]
[速度修改为平均速度、启动自动驾驶失败后弹的吐司]
This commit is contained in:
yangyakun
2023-05-22 11:14:29 +08:00
parent cd1b64726f
commit afc7f020e0
2 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt
View File

@@ -687,7 +687,7 @@ object CharterPassengerModel {
)
}
val lastTime: Double = lastSumLength / it.gnssSpeed * 3.6 //秒
val lastTime: Double = lastSumLength / CharterPassengerConst.Charter_AVERAGE_SPEED * 3.6 //秒
CallerLogger.d(M_BUS_P + "calculateDistance",
"---lastSumLength: " + lastSumLength + "----lastTime : " + lastTime

26
OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/bottom/impl/GoViewWithArrive.kt
View File

@@ -82,10 +82,7 @@ class GoViewWithArrive @JvmOverloads constructor(
ToastUtils.showShort("设备未就绪请稍等")
}
IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE -> {//
CallerAutoPilotControlManager.sendPlanningCmd(2)
CharterPassengerModel.startAutopilot()
onceRegisterAutoStatus()
CharterPassengerModel.sendTripInfo()
}
IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING -> {
// 重新起步
@@ -102,14 +99,13 @@ class GoViewWithArrive @JvmOverloads constructor(
override fun onDetachedFromWindow() {
super.onDetachedFromWindow()
startAutoTimeOut?.let {
if (!it.isDisposed) {
it.dispose()
}
}
RxUtils.disposeSubscribe(startAutoTimeOut)
}
private fun onceRegisterAutoStatus() {
CallerAutoPilotControlManager.sendPlanningCmd(2)
CharterPassengerModel.startAutopilot()
CharterPassengerModel.sendTripInfo()
CharterPassengerModel.setAutoStatusCallback(TAG,null)
CharterPassengerModel.setAutoStatusCallback(TAG,object :ICharterPassengerAutoStatusChangeCallback{
override fun onAutoStatusChange(newState: Int) {
@@ -119,15 +115,13 @@ class GoViewWithArrive @JvmOverloads constructor(
CharterPassengerModel.setAutoStatusCallback(TAG,null)
}
})
startAutoTimeOut?.let {
if (!it.isDisposed) {
it.dispose()
}
}
RxUtils.disposeSubscribe(startAutoTimeOut)
startAutoTimeOut = RxUtils.createSubscribe(20_000) {
val string = AbsMogoApplication.getApp().getString(R.string.m1_start_auto_fail)
ToastUtils.showLong(string)
CharterPassengerModel.setAutoStatusCallback(TAG,null)
if (CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().state != IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING) {
val string = AbsMogoApplication.getApp().getString(R.string.m1_start_auto_fail)
ToastUtils.showLong(string)
}
CharterPassengerModel.setAutoStatusCallback(TAG, null)
}
}
}