From d2ab86f40c268b05817efbc26b1adb96c80dcb95 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Sun, 24 Dec 2023 21:47:08 +0800 Subject: [PATCH] [6.2.6] [taxi-p] [a litter change] --- .../passenger/ui/TaxiPassengerBaseFragment.kt | 16 ++++++++-------- .../och/taxi/passenger/ui/arrived/ArrivedView.kt | 5 ++++- .../passenger/ui/arrived/ArrivedViewModel.kt | 4 ++++ .../checkstartautopilot/check/ChekViewModel.kt | 2 +- .../main/res/layout/taxi_p_arrived_end_panel.xml | 11 ++++++----- .../passenger/src/main/res/values/colors.xml | 1 + .../och/taxi/passenger/ui/arrived/ArrivedView.kt | 5 ++++- .../passenger/ui/arrived/ArrivedViewModel.kt | 4 ++++ .../res/layout/taxt_u_p_arrived_end_panel.xml | 13 +++++++------ .../src/main/res/values/colors.xml | 1 + 10 files changed, 40 insertions(+), 22 deletions(-) diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt index 34aa93674a..da515511b4 100644 --- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt +++ b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt @@ -158,7 +158,7 @@ class TaxiPassengerBaseFragment() : override fun isShow(show: Boolean) { CallerLogger.d(M_TAXI_P + TAG, "arrived ${show}") if(arrivedView.visibility==View.GONE&&chekAndStartAutopilotView.visibility==View.GONE){ - showOrHide(true) + showOrHide(true,"到达目的地页面隐藏") } } } @@ -166,7 +166,7 @@ class TaxiPassengerBaseFragment() : override fun isShow(show: Boolean) { CallerLogger.d(M_TAXI_P + TAG, "check and startAutopilot ${show}") if(arrivedView.visibility==View.GONE&&chekAndStartAutopilotView.visibility==View.GONE){ - showOrHide(true) + showOrHide(true,"手机号check+startautopilot页面隐藏") } } } @@ -239,19 +239,18 @@ class TaxiPassengerBaseFragment() : when (status) { 0 -> { if(chekAndStartAutopilotView.visibility == View.GONE){ - showOrHide(false) + showOrHide(false,"显示手机号check") } chekAndStartAutopilotView.aniCheckAndStartAutopilot(true,0) } 1 -> { if(chekAndStartAutopilotView.visibility == View.GONE){ - showOrHide(false) + showOrHide(false,"显示启动自动驾驶") } chekAndStartAutopilotView.aniCheckAndStartAutopilot(true,1) } 2 -> { chekAndStartAutopilotView.aniCheckAndStartAutopilot(false,2) - showOrHide(true) chekAndStartAutopilotView.resetCheckView() } else -> {} @@ -282,13 +281,13 @@ class TaxiPassengerBaseFragment() : if (isShow) { exitFullVideoScreen(true) arrivedView.aniArrived(true) - showOrHide(false) + showOrHide(false,"显示到达目的地") RxUtils.createSubscribe(500) { arrivedView.setDataAndStartAnimation() VoiceNotice.showNotice("已到达目的地，带好随身物品，右侧下车更安全！期待下次再见", AIAssist.LEVEL2) } } else { - showOrHide(true) + showOrHide(true,"隐藏到达目的地") arrivedView.aniArrived(false) } } @@ -307,7 +306,8 @@ class TaxiPassengerBaseFragment() : bottom.setCheckIndex(BottomBar.SelectView.OVERMAPVIEW) } - private fun showOrHide(isShow: Boolean){ + private fun showOrHide(isShow: Boolean,type:String){ + CallerLogger.d(M_TAXI_P + TAG, "类型：$type") val animatorSet = AnimatorSet() val allAnimator = mutableListOf() allAnimator.addAll(aniStatusBar(isShow)) diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt index d8c8e0d748..2499b9c642 100644 --- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt +++ b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt @@ -43,6 +43,8 @@ class ArrivedView : WindowRelativeLayout, ArrivedViewModel.ArrivedViewCallback { var arrivedVisilityChangeListenr:ArrivedVisilityChangeListenr?=null + private lateinit var viewModel: ArrivedViewModel + private fun initView() { d(SceneConstant.M_TAXI_P + TAG, "initView") @@ -67,6 +69,7 @@ class ArrivedView : WindowRelativeLayout, ArrivedViewModel.ArrivedViewCallback { taxiPxiaozhiLove = BigFrameAnimatorContainer(R.array.arrived_dest, 31,aciv_bg,isOnce = true) taxiPxiaozhiLove?.start() v_video_right_rear_view.resetView() + viewModel.setEndInfo() } else { v_video_right_rear_view.resetView() taxiPxiaozhiLove = null @@ -77,7 +80,7 @@ class ArrivedView : WindowRelativeLayout, ArrivedViewModel.ArrivedViewCallback { override fun onAttachedToWindow() { super.onAttachedToWindow() - val viewModel = ViewModelProvider(this).get(ArrivedViewModel::class.java) + viewModel = ViewModelProvider(this).get(ArrivedViewModel::class.java) viewModel.setViewCallback(this) } diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedViewModel.kt b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedViewModel.kt index 0181c883ac..bff6927049 100644 --- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedViewModel.kt +++ b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedViewModel.kt @@ -15,6 +15,10 @@ class ArrivedViewModel: ViewModel() { fun setViewCallback(viewCallback: ArrivedViewCallback){ this.viewCallback = viewCallback + + } + + fun setEndInfo(){ TaxiPassengerModel.currentOCHOrder?.endSiteAddr?.let { this.viewCallback?.setEndStation(it) } diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/check/ChekViewModel.kt b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/check/ChekViewModel.kt index 2da6b6dac5..aab57ec5ec 100644 --- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/check/ChekViewModel.kt +++ b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/check/ChekViewModel.kt @@ -26,7 +26,7 @@ class ChekViewModel : ViewModel() { val currentOCHOrder = TaxiPassengerModel.currentOCHOrder currentOCHOrder?.let { order -> viewCallback?.setOrderInfo(order.startSiteAddr, - order.endSiteAddr, order.carNumber, order.passengerPhone) + order.endSiteAddr, order.passengerNum, order.passengerPhone) } } diff --git a/OCH/taxi/passenger/src/main/res/layout/taxi_p_arrived_end_panel.xml b/OCH/taxi/passenger/src/main/res/layout/taxi_p_arrived_end_panel.xml index 57d9c0a2ff..7926677c6f 100644 --- a/OCH/taxi/passenger/src/main/res/layout/taxi_p_arrived_end_panel.xml +++ b/OCH/taxi/passenger/src/main/res/layout/taxi_p_arrived_end_panel.xml @@ -28,9 +28,9 @@ android:id="@+id/actv_arrived_station" app:layout_constraintStart_toStartOf="@+id/actv_endstation" app:layout_constraintBottom_toTopOf="@+id/actv_endstation" - android:layout_marginBottom="@dimen/dp_26" - android:textColor="@android:color/white" - android:textSize="@dimen/dp_64" + android:layout_marginBottom="@dimen/dp_13" + android:textColor="@color/taxi_p_373B46" + android:textSize="@dimen/dp_56" android:text="已到达" android:layout_width="wrap_content" android:layout_height="wrap_content"/> @@ -40,11 +40,12 @@ app:layout_constraintStart_toStartOf="@+id/v_video_right_rear_view" app:layout_constraintBottom_toTopOf="@+id/v_video_right_rear_view" android:layout_marginBottom="@dimen/dp_26" - android:textColor="@android:color/white" + android:textColor="@color/taxi_p_373B46" android:maxLines="2" android:ellipsize="end" android:maxWidth="@dimen/dp_1200" - android:textSize="@dimen/dp_100" + android:textSize="@dimen/dp_88" + android:textStyle="bold" tools:text="环球贸易中心环球贸易中心环球贸易中心环球贸易中心环球贸易中心环球贸易中心环球贸易中心环球贸易中心" android:layout_width="wrap_content" android:layout_height="wrap_content"/> diff --git a/OCH/taxi/passenger/src/main/res/values/colors.xml b/OCH/taxi/passenger/src/main/res/values/colors.xml index aa7d70085f..041a7c892a 100644 --- a/OCH/taxi/passenger/src/main/res/values/colors.xml +++ b/OCH/taxi/passenger/src/main/res/values/colors.xml @@ -50,6 +50,7 @@ #876E788B #333333 + #373B46 \ No newline at end of file diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt index e3d7574f46..507e399bf7 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt @@ -48,6 +48,8 @@ class ArrivedView : WindowRelativeLayout, ArrivedViewModel.ArrivedViewCallback { var arrivedVisilityChangeListenr:ArrivedVisilityChangeListenr?=null + private lateinit var viewModel: ArrivedViewModel + private fun initView() { d(SceneConstant.M_TAXI_P + TAG, "initView") @@ -72,6 +74,7 @@ class ArrivedView : WindowRelativeLayout, ArrivedViewModel.ArrivedViewCallback { taxiPxiaozhiLove = BigFrameAnimatorContainer(R.array.arrived_dest, 31,aciv_bg,isOnce = true) taxiPxiaozhiLove?.start() v_video_right_rear_view.resetView() + viewModel.setEndInfo() } else { v_video_right_rear_view.resetView() taxiPxiaozhiLove = null @@ -82,7 +85,7 @@ class ArrivedView : WindowRelativeLayout, ArrivedViewModel.ArrivedViewCallback { override fun onAttachedToWindow() { super.onAttachedToWindow() - val viewModel = ViewModelProvider(this).get(ArrivedViewModel::class.java) + viewModel = ViewModelProvider(this).get(ArrivedViewModel::class.java) viewModel.setViewCallback(this) } diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedViewModel.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedViewModel.kt index 6fcf776ddc..9b8e5e2dd2 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedViewModel.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedViewModel.kt @@ -15,6 +15,10 @@ class ArrivedViewModel: ViewModel() { fun setViewCallback(viewCallback: ArrivedViewCallback){ this.viewCallback = viewCallback + + } + + fun setEndInfo(){ TaxiPassengerModel.currentOCHOrder?.orderEndSite?.let { this.viewCallback?.setEndStation(it.siteName) } diff --git a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_arrived_end_panel.xml b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_arrived_end_panel.xml index 4743a49e13..33cfd5986a 100644 --- a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_arrived_end_panel.xml +++ b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_arrived_end_panel.xml @@ -28,9 +28,9 @@ android:id="@+id/actv_arrived_station" app:layout_constraintStart_toStartOf="@+id/actv_endstation" app:layout_constraintBottom_toTopOf="@+id/actv_endstation" - android:layout_marginBottom="@dimen/dp_26" - android:textColor="@android:color/white" - android:textSize="@dimen/dp_64" + android:layout_marginBottom="@dimen/dp_13" + android:textColor="@color/taxi_p_373B46" + android:textSize="@dimen/dp_56" android:text="已到达" android:layout_width="wrap_content" android:layout_height="wrap_content"/> @@ -40,15 +40,16 @@ app:layout_constraintStart_toStartOf="@+id/v_video_right_rear_view" app:layout_constraintBottom_toTopOf="@+id/v_video_right_rear_view" android:layout_marginBottom="@dimen/dp_26" - android:textColor="@android:color/white" + android:textColor="@color/taxi_p_373B46" android:maxLines="2" android:ellipsize="end" android:maxWidth="@dimen/dp_1200" - android:textSize="@dimen/dp_100" + android:textSize="@dimen/dp_88" + android:textStyle="bold" tools:text="环球贸易中心环球贸易中心环球贸易中心环球贸易中心环球贸易中心环球贸易中心环球贸易中心环球贸易中心" android:layout_width="wrap_content" android:layout_height="wrap_content"/> - + #333333 #995D6A8C #B37E90BF + #373B46 #876E788B