diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt index a2486b5d26..6239737409 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt @@ -12,8 +12,6 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.eagle.core.utilcode.util.OverlayViewUtils import com.mogo.och.common.module.utils.RxUtils import com.mogo.och.taxi.passenger.R -import com.mogo.och.taxi.passenger.ui.TaxiPassengerBaseFragment -import com.mogo.och.taxi.passenger.ui.startautopilot.StartAutopilotView import com.mogo.och.taxi.passenger.widget.WindowRelativeLayout import com.mogo.och.taxi.passenger.widget.animutils.AnimationsContainer import com.shuyu.gsyvideoplayer.GSYVideoManager @@ -24,7 +22,7 @@ import kotlinx.android.synthetic.main.taxi_p_arrived_end_panel.view.aciv_close import kotlinx.android.synthetic.main.taxi_p_arrived_end_panel.view.actv_endstation import kotlinx.android.synthetic.main.taxi_p_arrived_end_panel.view.iv_xiaozhi_belt import kotlinx.android.synthetic.main.taxi_p_arrived_end_panel.view.svp_frame -import kotlinx.android.synthetic.main.taxi_p_start_autopilot_view.view.taxi_p_autopilot_starting +import kotlinx.android.synthetic.main.taxi_p_arrived_end_panel.view.v_video_right_rear_view /** @@ -80,6 +78,7 @@ class ArrivedView : WindowRelativeLayout, ArrivedViewModel.ArrivedViewCallback { val viewModel = ViewModelProvider(this).get(ArrivedViewModel::class.java) viewModel.setViewCallback(this) taxiPxiaozhiLove?.start() + v_video_right_rear_view.resetView() } override fun onDetachedFromWindow() { @@ -88,6 +87,7 @@ class ArrivedView : WindowRelativeLayout, ArrivedViewModel.ArrivedViewCallback { svp_frame.onVideoReset() svp_frame.release() taxiPxiaozhiLove?.stop() + v_video_right_rear_view.resetView() super.onDetachedFromWindow() subscribe?.let { diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/RightRearCamView.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/RightRearCamView.kt index b1426decaf..96e0cc9214 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/RightRearCamView.kt +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/RightRearCamView.kt @@ -92,6 +92,11 @@ class RightRearCamView : ConstraintLayout , IMoGoBackCameraVideoListener, } } + fun resetView(){ + actv_cam_position_group.visibility = GONE + v_video_right_rear.setImageResource(R.drawable.taxi_p_right_rear_cam) + } + private fun draw(data: ByteArray) { ThreadUtils.runOnUiThread { if(actv_cam_position_group.visibility == GONE) { diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_blue_tooth_close.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_blue_tooth_close.png index fcedabb20a..f114ddbb67 100644 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_blue_tooth_close.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_blue_tooth_close.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_end_panel.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_end_panel.xml index 17ce3f897d..f7e396c76d 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_end_panel.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_end_panel.xml @@ -50,7 +50,7 @@ android:layout_height="wrap_content"/>