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

[6.0.0] 到达出车点语音播报, 拿到新订单语音播报, 取消订单语音播报文案修改

Browse Source
This commit is contained in:
wangmingjun
2023-08-31 11:28:29 +08:00
parent 06ae16037a
commit 1babe62197
3 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,6 +24,7 @@ import com.mogo.eagle.core.utilcode.util.ToastUtils
import com.mogo.eagle.core.utilcode.util.UiThreadHandler
import com.mogo.och.common.module.map.AmapNaviToDestinationModel
import com.mogo.och.common.module.map.ICommonNaviChangedCallback
import com.mogo.och.common.module.voice.VoiceNotice
import com.mogo.och.common.module.wigets.OCHCommitDialog
import com.mogo.och.taxi.R
import com.mogo.och.taxi.bean.OrderDetail
@@ -325,6 +326,7 @@ class TaxiCurrentTaskFragment : BaseFragment(),
TaskTypeEnum.VirtualTask.code -> {// 演练任务
if (order != null && currentStatus == TaskStatusEnum.CompleteTask.code) {
updateOrderUI(order)
VoiceNotice.showNotice("已为您接到订单")
return
}
if (startSite == null || endSite == null) return
@@ -344,8 +346,9 @@ class TaxiCurrentTaskFragment : BaseFragment(),
}
TaskTypeEnum.None.code -> {
if (order != null) {
if (order != null && currentStatus == TaskStatusEnum.CompleteTask.code) {
updateOrderUI(order)
VoiceNotice.showNotice("已为您接到订单")
}
}
}

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

@@ -208,7 +208,7 @@ class TaxiCurrentTaskViewModel : BaseViewModel<UnmannedState, TaskUiIntent>(),
}
override fun onOrderCancel() {
VoiceNotice.showNotice("订单已经取消")
VoiceNotice.showNotice("已取消行程")
// updateTaskAndOrderUi(null)
}

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

@@ -53,6 +53,7 @@ import com.mogo.och.common.module.manager.distancemamager.TrajectoryAndDistanceM
import com.mogo.och.common.module.manager.distancemamager.TrajectoryAndDistanceManager.setStationPoint
import com.mogo.och.common.module.map.AmapNaviToDestinationModel
import com.mogo.och.common.module.utils.CoordinateCalculateRouteUtil.coordinateConverterWgsToGcjLocations
import com.mogo.och.common.module.voice.VoiceNotice
import com.mogo.och.taxi.bean.PrepareTaskRespBean
import com.mogo.och.taxi.bean.QueryCarOrderByNoRespBean
import com.mogo.och.taxi.bean.QueryCurrentTaskRespBean
@@ -523,7 +524,7 @@ object TaxiTaskModel {
"judgeDriveToNearestStationTaskStation() ${virtualTask.siteName} distance = $distance"
)
if (distance <= TaxiUnmannedConst.ARRIVE_AT_START_STATION_DISTANCE) { // 15米内到站
submitArriveSite(virtualTask.siteId, true)
submitArriveSite(virtualTask.siteId, true, isArrivedNearestStation = true)
}
}
@@ -560,7 +561,8 @@ object TaxiTaskModel {
* @siteId : 站点id
* @isArriveAtEndSite: true 终点, false 起点
*/
fun submitArriveSite(siteId: Long, isArriveAtEndSite: Boolean) {
fun submitArriveSite(siteId: Long, isArriveAtEndSite: Boolean,
isArrivedNearestStation : Boolean = false) {
i(TAG, message = "submitArriveSite: siteId=$siteId isArriveAtEndSite=$isArriveAtEndSite")
TaxiTaskWithOrderServiceManager.arriveSite(
mContext,
@@ -570,6 +572,10 @@ object TaxiTaskModel {
if (data == null || data.code != 0) return
d(TAG, "submitArriveSite-onSuccess data=" + GsonUtil.jsonFromObject(data))
mDriveToNearestStationTask = null
if (isArrivedNearestStation){// 播报提醒
VoiceNotice.showNotice("已到达出车点")
}
if (isArriveAtEndSite) {
updateLocalCalculateStation()
//到站后不再调用取消自驾. 原因是取消自驾,D档位会溜车