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

[Taxi无人化] refactor: 乘客屏 拉取数据后 过滤 非送驾任务；

Browse Source
This commit is contained in:
aibingbing
2023-08-17 17:22:44 +08:00
parent 48e498d309
commit 950be3fcea
3 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/constant/TaxiPassengerConst.kt
View File

@@ -19,6 +19,7 @@ class TaxiPassengerConst {
// 埋点key：接管后点击'自动驾驶'按钮启动 // 埋点key：接管后点击'自动驾驶'按钮启动
const val EVENT_KEY_RESTART_AUTOPILOT = "event_key_och_taxi_restart_autopilot" const val EVENT_KEY_RESTART_AUTOPILOT = "event_key_och_taxi_restart_autopilot"
// 埋点key：开始服务开启自动驾驶（成功/失败） // 埋点key：开始服务开启自动驾驶（成功/失败）
const val EVENT_KEY_START_SERVICE = "event_key_och_taxi_start_service" const val EVENT_KEY_START_SERVICE = "event_key_och_taxi_start_service"
const val EVENT_PARAM_SN = "sn" const val EVENT_PARAM_SN = "sn"
@@ -34,6 +35,11 @@ class TaxiPassengerConst {
// 埋点key：开启自动驾驶前已识别的异常，会导致无法开启自驾 // 埋点key：开启自动驾驶前已识别的异常，会导致无法开启自驾
const val EVENT_KEY_AP_UNABLE_START_REASON = "event_key_och_taxi_ap_unable_start_reason" const val EVENT_KEY_AP_UNABLE_START_REASON = "event_key_och_taxi_ap_unable_start_reason"
const val EVENT_PARAM_UNABLE_START_REASON = "unable_start_reason"; const val EVENT_PARAM_UNABLE_START_REASON = "unable_start_reason"
//任务类型
const val TaskType_VIRTUAL = 1 // 虚拟任务
const val TaskType_DRIVE_TO_START = 2 // 接驾任务
const val TaskType_DRIVE_TO_END = 3 //送驾任务
} }
} }

6
OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.kt
View File

@@ -33,6 +33,7 @@ import com.mogo.och.taxi.passenger.bean.TaxiPassengerOrderQueryRespBean
import com.mogo.och.taxi.passenger.bean.TaxiPassengerOrdersInServiceQueryRespBean import com.mogo.och.taxi.passenger.bean.TaxiPassengerOrdersInServiceQueryRespBean
import com.mogo.och.taxi.passenger.callback.IOCHTaxiPassengerOrderStatusCallback import com.mogo.och.taxi.passenger.callback.IOCHTaxiPassengerOrderStatusCallback
import com.mogo.och.taxi.passenger.constant.TaxiPassengerConst import com.mogo.och.taxi.passenger.constant.TaxiPassengerConst
import com.mogo.och.taxi.passenger.constant.TaxiPassengerConst.Companion.TaskType_DRIVE_TO_END
import com.mogo.och.taxi.passenger.constant.TaxiPassengerOrderStatusEnum import com.mogo.och.taxi.passenger.constant.TaxiPassengerOrderStatusEnum
import com.mogo.och.taxi.passenger.constant.TaxiPassengerOrderStatusEnum.Companion.valueOf import com.mogo.och.taxi.passenger.constant.TaxiPassengerOrderStatusEnum.Companion.valueOf
import com.mogo.och.taxi.passenger.network.TaxiPassengerServiceManager import com.mogo.och.taxi.passenger.network.TaxiPassengerServiceManager
@@ -158,6 +159,11 @@ object TaxiPassengerModel {
} }
return return
} }
//目前后端将一个订单拆分成了多个任务，乘客屏只关心 送驾 类型的任务，这里过滤其他任务避免干扰
if (data.data.taskType != TaskType_DRIVE_TO_END) {
d(M_TAXI_P + TAG, "queryInAndWaitOrders data.taskType=${data.data.taskType}, discard data")
return
}
//1. 处理进行中订单 //1. 处理进行中订单
if (data.data != null && data.data.order != null) { if (data.data != null && data.data.order != null) {
// 1.1. 当存在进行中单时：对本地currentOrder进行更新 // 1.1. 当存在进行中单时：对本地currentOrder进行更新

4
OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/check/ChekViewModel.kt
View File

@@ -27,8 +27,8 @@ class ChekViewModel : ViewModel(), IOCHTaxiPassengerOrderStatusCallback {
private fun setOrderInfo() { private fun setOrderInfo() {
val currentOCHOrder = TaxiPassengerModel.currentOCHOrder val currentOCHOrder = TaxiPassengerModel.currentOCHOrder
currentOCHOrder?.let { order -> currentOCHOrder?.let { order ->
viewCallback?.setOrderInfo(order.orderStartSite.siteName, viewCallback?.setOrderInfo(order.orderStartSite?.siteName,
order.orderEndSite.siteName, "${order.passengerSize}", order.bookingUserPhone) order.orderEndSite?.siteName, "${order.passengerSize}", order.bookingUserPhone)
} }
} }