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 24b5a8cc21..595b23a56f 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
@@ -20,18 +20,36 @@ class OchAutomaticExplorationView @JvmOverloads constructor(
override fun onCurrentOrderStatusChanged(order: BaseOrderBean?) {
if(order==null){
-
+ cancelTimer()
}else {
when (order.orderStatus) {
- TaxiOrderStatusEnum.None.code -> {}
- TaxiOrderStatusEnum.OnTheWayToStart.code -> {}
- TaxiOrderStatusEnum.ArriveAtStart.code -> {}
- TaxiOrderStatusEnum.UserArriveAtStart.code -> {}
- TaxiOrderStatusEnum.OnTheWayToEnd.code -> {}
- TaxiOrderStatusEnum.ArriveAtEnd.code -> {}
- TaxiOrderStatusEnum.JourneyCompleted.code -> {}
- TaxiOrderStatusEnum.Cancel.code -> {}
- else -> {}
+ TaxiOrderStatusEnum.None.code -> {
+ startShowTimer()
+ }
+ TaxiOrderStatusEnum.OnTheWayToStart.code -> {
+ startShowTimer()
+ }
+ TaxiOrderStatusEnum.ArriveAtStart.code -> {
+ startShowTimer()
+ }
+ TaxiOrderStatusEnum.UserArriveAtStart.code -> {
+ startShowTimer()
+ }
+ TaxiOrderStatusEnum.OnTheWayToEnd.code -> {
+ startShowTimer()
+ }
+ TaxiOrderStatusEnum.ArriveAtEnd.code -> {
+ startShowTimer()
+ }
+ TaxiOrderStatusEnum.JourneyCompleted.code -> {
+ startShowTimer()
+ }
+ TaxiOrderStatusEnum.Cancel.code -> {
+ cancelTimer()
+ }
+ else -> {
+ cancelTimer()
+ }
}
}
}
diff --git a/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml b/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml
index 44e48b71d2..5a6ce8e0ec 100644
--- a/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml
+++ b/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml
@@ -160,7 +160,7 @@
app:layout_constraintTop_toTopOf="parent" />
-
-
-
-