yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[bugfix]

Browse Source 
[id 冲突]
This commit is contained in:
yangyakun
2023-07-27 16:32:12 +08:00
parent e54bdb74a2
commit e4823c9f46
4 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt
View File

@@ -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 {

5
OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/RightRearCamView.kt
View File

@@ -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) {

BIN
OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_blue_tooth_close.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

2
OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_end_panel.xml
View File

@@ -50,7 +50,7 @@
android:layout_height="wrap_content"/>
<com.mogo.och.taxi.passenger.ui.arrived.RightRearCamView
android:id="@+id/v_video_right_rear"
android:id="@+id/v_video_right_rear_view"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
android:layout_marginStart="@dimen/dp_90"