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

[Taxi无人化] refactor: 优化司机 DebugView日志打印；

Browse Source
This commit is contained in:
aibingbing
2023-09-06 11:25:49 +08:00
committed by zhongchao
parent c456d4f188
commit a4cb9f8bdd
1 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -422,7 +422,7 @@ object TaxiTaskModel {
startFailedCode: String,
startFailedMessage: String
) {
DebugView.printInfoMsg("[启自驾回调] 执行失败，code=$startFailedCode, msg=$startFailedMessage")
DebugView.printInfoMsg("[启自驾] 执行失败，code=$startFailedCode, msg=$startFailedMessage")
TaxiAnalyticsManager.getInstance()
.triggerStartAutopilotFailureEventByAdas(startFailedCode, startFailedMessage)
if (mADASStatusCallback != null && !FunctionBuildConfig.isDemoMode) {
@@ -568,8 +568,10 @@ object TaxiTaskModel {
* @siteId : 站点id
* @isArriveAtEndSite: true 终点, false 起点
*/
fun submitArriveSite(siteId: Long, isArriveAtEndSite: Boolean,
isArrivedNearestStation : Boolean = false) {
fun submitArriveSite(
siteId: Long, isArriveAtEndSite: Boolean,
isArrivedNearestStation: Boolean = false
) {
DebugView.printInfoMsg("[上报ArriveSite] siteId=$siteId, isArriveAtEndSite=$isArriveAtEndSite")
i(TAG, message = "submitArriveSite: siteId=$siteId isArriveAtEndSite=$isArriveAtEndSite")
TaxiTaskWithOrderServiceManager.arriveSite(
@@ -581,7 +583,7 @@ object TaxiTaskModel {
DebugView.printInfoMsg("[上报ArriveSite] success siteId=$siteId, isArriveAtEndSite=$isArriveAtEndSite")
d(TAG, "submitArriveSite-onSuccess data=" + GsonUtil.jsonFromObject(data))
mDriveToNearestStationTask = null
if (isArrivedNearestStation){// 播报提醒
if (isArrivedNearestStation) {// 播报提醒
VoiceNotice.showNotice("已到达出车点")
}
@@ -594,10 +596,12 @@ object TaxiTaskModel {
override fun onError() {
super.onError()
if (!NetworkUtils.isConnected(mContext)){ // 网络异常,接口重试
if (!NetworkUtils.isConnected(mContext)) { // 网络异常,接口重试
ToastUtils.showShort("网络出现异常,请稍后重试")
}else{
DebugView.printErrorMsg("[上报ArriveSite] 网络出现异常,请稍后重试")
} else {
ToastUtils.showShort("到站接口请求出现异常,请稍后重试")
DebugView.printErrorMsg("[上报ArriveSite] 到站接口请求出现异常,请稍后重试")
}
}
@@ -869,30 +873,32 @@ object TaxiTaskModel {
}
fun startTask(lineId: Long) {
DebugView.printInfoMsg("[开始任务] 准备发送请求")
DebugView.printInfoMsg("[开始任务] 准备发送请求，lindId=$lineId")
TaxiTaskWithOrderServiceManager.startTask(
mContext,
lineId,
object : OchCommonServiceCallback<BaseData> {
override fun onSuccess(data: BaseData?) {
DebugView.printInfoMsg("[开始任务] 请求success")
DebugView.printInfoMsg("[开始任务] 请求success，lindId=$lineId")
startAutoPilot() //自驾开启
d(TAG, "startTask onSuccess: data=${GsonUtil.jsonFromObject(data)}")
}
override fun onError() {
super.onError()
if (!NetworkUtils.isConnected(mContext)){ // 网络异常,接口重试
if (!NetworkUtils.isConnected(mContext)) { // 网络异常,接口重试
ToastUtils.showShort("网络出现异常,请稍后重试")
}else{
DebugView.printErrorMsg("[开始任务] 网络出现异常,请稍后重试")
} else {
ToastUtils.showShort("开始任务请求出现异常,请稍后重试")
DebugView.printErrorMsg("[开始任务] 开始任务请求出现异常,请稍后重试")
}
}
override fun onFail(code: Int, msg: String?) {
DebugView.printErrorMsg("[开始任务] 请求fail, code=$code, msg=$msg")
DebugView.printErrorMsg("[开始任务] 请求fail, code=$code, msg=$msg, lindId=$lineId")
d(TAG, "startTask onFail: code=$code, msg=$msg")
ToastUtils.showShort("开始任务请求出现异常,请稍后重试,code=$code, msg=$msg")
ToastUtils.showShort("开始任务请求出现异常,请稍后重试,code=$code, msg=$msg, lindId=$lineId")
}
})
}
@@ -939,12 +945,15 @@ object TaxiTaskModel {
val listener = it.value
listener.onStartPrepareTask120s(true)
}
DebugView.printInfoMsg("[PrepareNextTask] 倒计时${TaxiUnmannedConst.TIMER_PREPARE_TASK_INTERVAL_120S/1000}秒后prepareNextTask, siteId=$siteId")
UiThreadHandler.postDelayed(mPrepareTaskDelay120SRunnable, TaxiUnmannedConst.TIMER_PREPARE_TASK_INTERVAL_120S)
DebugView.printInfoMsg("[PrepareNextTask] 倒计时${TaxiUnmannedConst.TIMER_PREPARE_TASK_INTERVAL_120S / 1000}秒后prepareNextTask, siteId=$siteId")
UiThreadHandler.postDelayed(
mPrepareTaskDelay120SRunnable,
TaxiUnmannedConst.TIMER_PREPARE_TASK_INTERVAL_120S
)
}
fun removePrepareTaskDelay120S() {
if (mPrepareTaskDelay120SRunnable != null){
if (mPrepareTaskDelay120SRunnable != null) {
DebugView.printInfoMsg("[PrepareNextTask] removeCallbacks, 取消prepareNextTask倒计时")
UiThreadHandler.removeCallbacks(mPrepareTaskDelay120SRunnable)
mTaxiTaskWithOrderCallbackMap.forEach {
@@ -1117,8 +1126,7 @@ object TaxiTaskModel {
}
//在订单状态还没流转成功时, 点击了开启自驾按钮, 先去做状态流转成功再启动自驾
if (mCurrentTaskWithOrder!!.currentStatus == TaskStatusEnum.GetTask.code){
DebugView.printInfoMsg("[启自驾] startTask ${mCurrentTaskWithOrder!!.lineId}")
if (mCurrentTaskWithOrder!!.currentStatus == TaskStatusEnum.GetTask.code) {
startTask(mCurrentTaskWithOrder!!.lineId)
return
}