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

Merge branch 'dev_robotaxi-d_230809_6.0.0' of gitlab.zhidaoauto.com:SCA/L4HA/AndroidApp/MoGoEagleEye into dev_robotaxi-d_230809_6.0.0

Browse Source
This commit is contained in:
aibingbing
2023-09-06 16:26:36 +08:00
parent f8b4332fe9 0333cf5464
commit e7509bb634
4 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/distancemamager/TrajectoryAndDistanceManager.kt
View File

@@ -243,7 +243,7 @@ object TrajectoryAndDistanceManager: IMoGoPlanningRottingListener{
BizLoopManager.setLoopFunction(TAGDISTANCE, LoopInfo(1, ::calculateDistance,
scheduler = Schedulers.computation()
))
d(SceneConstant.M_BUS_P + TAG, "开始路距计算")
d(M_OCHCOMMON + TAG, "开始路距计算")
}
/**
@@ -251,7 +251,7 @@ object TrajectoryAndDistanceManager: IMoGoPlanningRottingListener{
*/
private fun endCalculateDistanceLoop() {
BizLoopManager.removeLoopFunction(TAGDISTANCE)
d(SceneConstant.M_BUS_P + TAG, "结束路距计算")
d(M_OCHCOMMON + TAG, "结束路距计算")
}
@@ -260,7 +260,7 @@ object TrajectoryAndDistanceManager: IMoGoPlanningRottingListener{
location: MogoLocation,
) {
val autoPilotState = CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().state
val locationInfo = "自动驾驶状态:$autoPilotState line信息：${lineId}定位信息:${location.latitude},${location.longitude},${location.heading}"
val locationInfo = "自动驾驶状态:$autoPilotState line信息：${lineId}定位信息:${location.latitude},${location.longitude},${location.heading} 当前速度:${location.gnssSpeed}"
if (mRoutePoints.isNullOrEmpty()) return
// 计算起始站点在轨迹中的信息 这个是一个常量
if (startStationInfo.stationPoint != null

11
OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt
View File

@@ -355,9 +355,6 @@ class TaxiCurrentTaskFragment : BaseFragment(),
if (order != null && currentStatus == TaskStatusEnum.CompleteTask.code) {
handleOrderView(order)
updateOrderUI(order)
if (order.orderStatus <= TaxiOrderStatusEnum.ArriveAtStart.code){
VoiceNotice.showNotice("已为您接到订单")
}
}
}
@@ -379,9 +376,6 @@ class TaxiCurrentTaskFragment : BaseFragment(),
if (order != null && currentStatus == TaskStatusEnum.CompleteTask.code) {
updateOrderUI(order)
if (order.orderStatus <= TaxiOrderStatusEnum.ArriveAtStart.code){
VoiceNotice.showNotice("已为您接到订单")
}
return
}
if (startSite == null || endSite == null) return
@@ -401,11 +395,6 @@ class TaxiCurrentTaskFragment : BaseFragment(),
updatePathwayPoint(taskType,endSite?.siteName)
handleOrderView(it)
updateOrderUI(it)
if (taskType == TaskTypeEnum.ToOrderStartTask.code
&& currentStatus == TaskStatusEnum.CompleteTask.code
&& order.orderStatus == TaxiOrderStatusEnum.ArriveAtStart.code){
VoiceNotice.showNotice("已到达上车地点，等待乘客上车")
}
}
}
}

3
OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskViewModel.kt
View File

@@ -268,7 +268,8 @@ class TaxiCurrentTaskViewModel : BaseViewModel<UnmannedState, TaskUiIntent>(),
currentTaskWithOrder: QueryCurrentTaskRespBean.Result?
) {
if (currentTaskWithOrder?.endSite != null && currentTaskWithOrder.startSite != null
&& currentTaskWithOrder.currentStatus < TaskStatusEnum.CompleteTask.code
&& (currentTaskWithOrder.currentStatus < TaskStatusEnum.CompleteTask.code
||currentTaskWithOrder.order != null)
) {
VoiceNotice.showNotice("暂停接单啦！要完成当前订单哦")
return

12
OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt
View File

@@ -701,8 +701,20 @@ object TaxiTaskModel {
|| !mCurrentTaskWithOrder!!.equals(result)
) {
d(TAG, "queryCurrentTaskOnce: 更新本地数据")
mCurrentTaskWithOrder = result
if (result.order != null && result.currentStatus == TaskStatusEnum.CompleteTask.code
&& result.servingStatus == 1){
if (result.order!!.orderStatus <= TaxiOrderStatusEnum.ArriveAtStart.code) {
VoiceNotice.showNotice("已为您接到订单")
}
if (result.taskType == TaskTypeEnum.ToOrderStartTask.code
&& result.order!!.orderStatus == TaxiOrderStatusEnum.ArriveAtStart.code){
VoiceNotice.showNotice("已到达上车地点，等待乘客上车")
}
}
// 任务为空
if (result.endSite == null && result.order == null) {
d(TAG, "queryCurrentTaskOnce: 任务为空")