diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/BottomOrderInfoView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/BottomOrderInfoView.kt index c934dd9baa..6b74d9e613 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/BottomOrderInfoView.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/BottomOrderInfoView.kt @@ -103,6 +103,7 @@ open class BottomOrderInfoView @JvmOverloads constructor( actv_order_end_time.text = AbsMogoApplication.getApp().getString(R.string.charter_p_bottom_reach_time) leftTime = -1 + notifiBackageView() } OrderStatusEnum.OrderNoLine, @@ -149,10 +150,18 @@ open class BottomOrderInfoView @JvmOverloads constructor( if(leftTime<900){ actv_order_end_time.setTextColor(context.getColor(R.color.charter_p_ff6d2c)) if(leftTime<300){//0-300s - backageView?.visibility = View.VISIBLE - if(viewState!=ViewState.Near300){ - viewState = ViewState.Near300 - updateState() + if(leftTime>0) { + backageView?.visibility = View.VISIBLE + if (viewState != ViewState.Near300) { + viewState = ViewState.Near300 + updateState() + } + }else{ + backageView?.visibility = View.VISIBLE + if (viewState != ViewState.Normal) { + viewState = ViewState.Normal + updateState() + } } }else{//300s-900s backageView?.visibility = View.GONE diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_bottom_bar_select_near300s_bg.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_bottom_bar_select_near300s_bg.png index d6a104beca..771baeba5b 100644 Binary files a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_bottom_bar_select_near300s_bg.png and b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_bottom_bar_select_near300s_bg.png differ diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_bottom_bar_select_near900s_bg.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_bottom_bar_select_near900s_bg.png index 7faf986665..17efd87a33 100644 Binary files a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_bottom_bar_select_near900s_bg.png and b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_bottom_bar_select_near900s_bg.png differ