From 7cd8502b6b640aa7ccf2d31f2dfc181794f98754 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Tue, 28 Jun 2022 19:23:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../taxi/passenger/ui/leftmenu/OverlayLeftViewUtils.kt | 9 +++++++++ .../passenger/ui/video/TaxiPassengerMogoConsultView.kt | 7 ++++--- .../passenger/ui/video/TaxiPassengerMogoMoviesView.kt | 2 +- .../src/main/res/drawable/ic_baseline_arrow_left_24.xml | 5 +++++ .../src/main/res/layout/taxi_p_arrived_mogo_consult.xml | 4 ++-- .../main/res/layout/taxi_p_window_float_interphone.xml | 2 ++ 6 files changed, 23 insertions(+), 6 deletions(-) create mode 100644 OCH/mogo-och-taxi-passenger/src/main/res/drawable/ic_baseline_arrow_left_24.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/leftmenu/OverlayLeftViewUtils.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/leftmenu/OverlayLeftViewUtils.kt index b9df464149..e08b6777ad 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/leftmenu/OverlayLeftViewUtils.kt +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/leftmenu/OverlayLeftViewUtils.kt @@ -8,6 +8,7 @@ import android.graphics.Rect import android.graphics.Region import android.view.* import android.widget.ListView +import androidx.appcompat.widget.AppCompatImageView import androidx.constraintlayout.widget.ConstraintLayout import com.mogo.eagle.core.utilcode.util.OverlayViewUtils import com.mogo.och.taxi.passenger.R @@ -52,6 +53,8 @@ object OverlayLeftViewUtils { private var taxiPassengerMogoConsultView: TaxiPassengerMogoConsultView? = null private var taxiPassengerMogoMoviesView: TaxiPassengerMogoMoviesView? = null + private var acivOpenClose: AppCompatImageView?=null + /** * 添加覆盖View在Activity上面 */ @@ -82,6 +85,7 @@ object OverlayLeftViewUtils { dismissOverlayView() val vDragField = view.findViewById(R.id.v_drag_field) + acivOpenClose = view.findViewById(R.id.aciv_open_close) vDragField.setOnTouchListener(ItemViewTouchListener(params!!, windowManager, ::close, ::open)) vDragField.setOnClickListener { @@ -161,6 +165,7 @@ object OverlayLeftViewUtils { * 打开状态栏 */ private fun open(overlayView: View,windowManager: WindowManager?) { + acivOpenClose?.setImageResource(R.drawable.ic_baseline_arrow_right_24) params?.x = 0 windowManager?.updateViewLayout(overlayView, params) closeByTime(overlayView, windowManager) @@ -188,6 +193,7 @@ object OverlayLeftViewUtils { * 关闭状态栏 */ private fun close(overlayView: View,windowManager: WindowManager?) { + acivOpenClose?.setImageResource(R.drawable.ic_baseline_arrow_left_24) params?.x = DEVIATION_WIDTH windowManager?.updateViewLayout(overlayView, params) } @@ -241,6 +247,9 @@ object OverlayLeftViewUtils { if (overlayView!=null) { overlayView = null } + if (acivOpenClose!=null) { + acivOpenClose = null + } isShowing = false } catch (e: Exception) { e.printStackTrace() diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/TaxiPassengerMogoConsultView.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/TaxiPassengerMogoConsultView.kt index f41aedc586..4b6732a813 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/TaxiPassengerMogoConsultView.kt +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/TaxiPassengerMogoConsultView.kt @@ -71,8 +71,9 @@ class TaxiPassengerMogoConsultView :RelativeLayout { indicatorView.setOrientation(IndicatorOrientation.INDICATOR_HORIZONTAL) indicatorView.setIndicatorStyle(IndicatorStyle.ROUND_RECT) indicatorView.setSliderColor(Color.parseColor("#80FFFFFF"), Color.parseColor("#2972FF")) - indicatorView.setSliderWidth(14f, 90f) - indicatorView.setSliderHeight(14f) + indicatorView.setSliderWidth(16f, 101f) + indicatorView.setSliderHeight(16f) + indicatorView.setSliderGap(30f) rvVideoPlaylist.addOnScrollListener(object: CenterScrollListener() { var prePlayerPosition = 0 override fun pageSelect(recyclerView: RecyclerView?, newState: Int) { @@ -116,7 +117,7 @@ class TaxiPassengerMogoConsultView :RelativeLayout { var currentIndex = currentPosition if(fl>0.5){ if(currentPosition==0){ - currentIndex = rvVideoPlaylist.adapter!!.itemCount + currentIndex = rvVideoPlaylist.adapter!!.itemCount-1 }else { currentIndex -= 1 } diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/TaxiPassengerMogoMoviesView.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/TaxiPassengerMogoMoviesView.kt index becc92a1e2..da3d73b419 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/TaxiPassengerMogoMoviesView.kt +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/TaxiPassengerMogoMoviesView.kt @@ -116,7 +116,7 @@ class TaxiPassengerMogoMoviesView :RelativeLayout { var currentIndex = currentPosition if(fl>0.5){ if(currentPosition==0){ - currentIndex = rvVideoPlaylist.adapter!!.itemCount + currentIndex = rvVideoPlaylist.adapter!!.itemCount-1 }else { currentIndex -= 1 } diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/ic_baseline_arrow_left_24.xml b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/ic_baseline_arrow_left_24.xml new file mode 100644 index 0000000000..2dcafaade8 --- /dev/null +++ b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/ic_baseline_arrow_left_24.xml @@ -0,0 +1,5 @@ + + + diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_mogo_consult.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_mogo_consult.xml index 990d3f197b..e361c06ec8 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_mogo_consult.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_mogo_consult.xml @@ -52,8 +52,8 @@ android:layout_height="wrap_content" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintBottom_toBottomOf="@+id/rv_video_playlist" - android:layout_marginBottom="50px" + app:layout_constraintBottom_toBottomOf="parent" + android:layout_marginBottom="132px" app:vpi_orientation="horizontal" app:vpi_slide_mode="scale" app:vpi_slider_checked_color="@color/taxi_p_traffic_light_red_color_up" diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_window_float_interphone.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_window_float_interphone.xml index b78ed99993..747e1776e8 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_window_float_interphone.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_window_float_interphone.xml @@ -29,6 +29,8 @@ android:layout_width="143px" android:layout_height="408px">