From 9ebb5c9219d1ea8079dadf02aeead98e29257cdf Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Mon, 22 Jul 2024 20:57:34 +0800 Subject: [PATCH] =?UTF-8?q?[6.5.0]=E8=87=AA=E5=8A=A8=E6=8E=A2=E6=9F=A5?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=97=A5=E5=BF=97=EF=BC=8C=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wigets/rodedata/OchAutomaticExplorationView.kt | 11 +++++++++++ .../ui/notice/exploration/AutomaticExplorationView.kt | 6 +++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/rodedata/OchAutomaticExplorationView.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/rodedata/OchAutomaticExplorationView.kt index 585525deb4..8853435036 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/rodedata/OchAutomaticExplorationView.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/rodedata/OchAutomaticExplorationView.kt @@ -2,6 +2,7 @@ package com.mogo.och.common.module.wigets.rodedata import android.content.Context import android.util.AttributeSet +import android.util.Log import com.mogo.eagle.core.function.hmi.ui.notice.exploration.AutomaticExplorationView import com.mogo.och.data.taxi.BaseOrderBean import com.mogo.och.common.module.biz.order.OrderListener @@ -22,43 +23,53 @@ class OchAutomaticExplorationView @JvmOverloads constructor( if(order==null){ cancelTimer() currentOrderStatus(false) + Log.i(TAG,"onCurrentOrderStatusChanged order 为空") }else { when (order.orderStatus) { TaxiOrderStatusEnum.None.code -> { cancelTimer() currentOrderStatus(false) + Log.i(TAG,"TaxiOrderStatusEnum.None.code") } TaxiOrderStatusEnum.OnTheWayToStart.code -> { startShowTimer() currentOrderStatus(true) + Log.i(TAG,"TaxiOrderStatusEnum.OnTheWayToStart.code") } TaxiOrderStatusEnum.ArriveAtStart.code -> { startShowTimer() currentOrderStatus(true) + Log.i(TAG,"TaxiOrderStatusEnum.ArriveAtStart.code") } TaxiOrderStatusEnum.UserArriveAtStart.code -> { startShowTimer() currentOrderStatus(true) + Log.i(TAG,"TaxiOrderStatusEnum.UserArriveAtStart.code") } TaxiOrderStatusEnum.OnTheWayToEnd.code -> { startShowTimer() currentOrderStatus(true) + Log.i(TAG,"TaxiOrderStatusEnum.OnTheWayToEnd.code") } TaxiOrderStatusEnum.ArriveAtEnd.code -> { startShowTimer() currentOrderStatus(true) + Log.i(TAG,"TaxiOrderStatusEnum.ArriveAtEnd.code") } TaxiOrderStatusEnum.JourneyCompleted.code -> { cancelTimer() currentOrderStatus(false) + Log.i(TAG,"TaxiOrderStatusEnum.JourneyCompleted.code") } TaxiOrderStatusEnum.Cancel.code -> { cancelTimer() currentOrderStatus(false) + Log.i(TAG,"TaxiOrderStatusEnum.Cancel.code") } else -> { cancelTimer() currentOrderStatus(false) + Log.i(TAG,"else") } } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/exploration/AutomaticExplorationView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/exploration/AutomaticExplorationView.kt index 526225a018..74b91d1a30 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/exploration/AutomaticExplorationView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/exploration/AutomaticExplorationView.kt @@ -5,6 +5,7 @@ import android.animation.ValueAnimator import android.content.Context import android.os.CountDownTimer import android.util.AttributeSet +import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.animation.LinearInterpolator @@ -113,7 +114,10 @@ open class AutomaticExplorationView @JvmOverloads constructor( } override fun onFinish() { - showAutoExploration() + Log.i("OchAutomaticExplorationView","onFinish showAutoExploration") + if(hasOrder){ + showAutoExploration() + } isCountingDown = false } }