diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java index e3984ffce1..e08d232edb 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java @@ -124,7 +124,7 @@ public class TaxiPassengerBaseFragment extends MvpFragment { - //OverlayLeftViewUtils.INSTANCE.showOverlayView(getActivity()); + OverlayLeftViewUtils.INSTANCE.showOverlayView(getActivity()); //showOrHideArrivedEndLayout(true, "北京北京北京", "1527481606997577728"); //showOrHidePressengerCheckPager(true, "开始站点开", "开始站点开始站点开始", "2", "京A888888", "18811539480"); //OCHFloatWindowManager.getInstance().ShowFloatWindow(getContext()); 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 639adfbce8..b9df464149 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 @@ -224,15 +224,15 @@ object OverlayLeftViewUtils { if (!isShowing) { return } - FullVideoUtils.dismissOverlayView(true) - // 管理的要关闭都得关闭 - closeConsult() - closeMovice() subscribe?.let { if (!it.isDisposed) { it.dispose() } } + FullVideoUtils.dismissOverlayView(true) + // 管理的要关闭都得关闭 + closeConsult() + closeMovice() subscribe = null try { if (windowManager != null && overlayView != null) { 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 086de6047d..2403760fbc 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 @@ -77,8 +77,7 @@ class TaxiPassengerMogoConsultView :RelativeLayout { var prePlayerPosition = 0 override fun pageSelect(recyclerView: RecyclerView?, newState: Int) { //播放视频 - val centerItemPosition: Int = carouselLayoutManager.centerItemPosition - val player = carouselLayoutManager.findViewByPosition(centerItemPosition) + val (centerItemPosition: Int, player) = getPlayer(carouselLayoutManager) indicatorView.onPageSelected(centerItemPosition) if(player is ConsultVideoPlayer){ if(prePlayerPosition!=centerItemPosition) { @@ -86,8 +85,8 @@ class TaxiPassengerMogoConsultView :RelativeLayout { player.onVideoReset() }else{ } - val prePlayer = - carouselLayoutManager.findViewByPosition(prePlayerPosition) + val playerHolder = carouselLayoutManager.findViewByPosition(prePlayerPosition) + val prePlayer = playerHolder?.findViewById(R.id.video_item_player) prePlayer?.let { if(it is ConsultVideoPlayer){ it.onVideoReset() @@ -105,8 +104,7 @@ class TaxiPassengerMogoConsultView :RelativeLayout { } override fun pageStop() { - val centerItemPosition: Int = carouselLayoutManager.getCenterItemPosition() - val player = carouselLayoutManager.findViewByPosition(centerItemPosition) + val (centerItemPosition: Int, player) = getPlayer(carouselLayoutManager) if(player is ConsultVideoPlayer){ player.onVideoPause() } @@ -126,8 +124,7 @@ class TaxiPassengerMogoConsultView :RelativeLayout { indicatorView.onPageScrolled(currentIndex, fl, 0) } recyclerVideoAdapter.setOnThumbImageClilckListener { - val centerItemPosition: Int = carouselLayoutManager.centerItemPosition - val player = carouselLayoutManager.findViewByPosition(centerItemPosition) + val (centerItemPosition: Int, player) = getPlayer(carouselLayoutManager) if(player is ConsultVideoPlayer) { player.onVideoReset() player.thumbImageViewLayout.visibility = View.VISIBLE @@ -200,8 +197,7 @@ class TaxiPassengerMogoConsultView :RelativeLayout { override fun onWindowFocusChanged(hasWindowFocus: Boolean) { super.onWindowFocusChanged(hasWindowFocus) val carouselLayoutManager = rvVideoPlaylist.layoutManager as CarouselLayoutManager - val centerItemPosition: Int = carouselLayoutManager.centerItemPosition - val player = carouselLayoutManager.findViewByPosition(centerItemPosition) + val (centerItemPosition: Int, player) = getPlayer(carouselLayoutManager) player?.let { if (player is ConsultVideoPlayer) { if(hasWindowFocus){// 获取焦点两种情况 @@ -241,11 +237,17 @@ class TaxiPassengerMogoConsultView :RelativeLayout { } + private fun getPlayer(carouselLayoutManager: CarouselLayoutManager): Pair { + val centerItemPosition: Int = carouselLayoutManager.centerItemPosition + val playerHolder = carouselLayoutManager.findViewByPosition(centerItemPosition) + val player = playerHolder?.findViewById(R.id.video_item_player) + return Pair(centerItemPosition, player) + } + override fun onDetachedFromWindow() { val carouselLayoutManager = rvVideoPlaylist.layoutManager as CarouselLayoutManager - val centerItemPosition: Int = carouselLayoutManager.centerItemPosition - val player = carouselLayoutManager.findViewByPosition(centerItemPosition) + val (_: Int, player) = getPlayer(carouselLayoutManager) player?.let { if(player is ConsultVideoPlayer){ player.currentPlayer.release() 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 786d99b9f0..becc92a1e2 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 @@ -77,8 +77,7 @@ class TaxiPassengerMogoMoviesView :RelativeLayout { var prePlayerPosition = 0 override fun pageSelect(recyclerView: RecyclerView?, newState: Int) { //播放视频 - val centerItemPosition: Int = carouselLayoutManager.centerItemPosition - val player = carouselLayoutManager.findViewByPosition(centerItemPosition) + val (centerItemPosition: Int, player) = getPlayer(carouselLayoutManager) indicatorView.onPageSelected(centerItemPosition) if(player is ConsultVideoPlayer){ if(prePlayerPosition!=centerItemPosition) { @@ -86,8 +85,8 @@ class TaxiPassengerMogoMoviesView :RelativeLayout { player.onVideoReset() }else{ } - val prePlayer = - carouselLayoutManager.findViewByPosition(prePlayerPosition) + val playerHolder = carouselLayoutManager.findViewByPosition(prePlayerPosition) + val prePlayer = playerHolder?.findViewById(R.id.video_item_player) prePlayer?.let { if(it is ConsultVideoPlayer){ it.onVideoReset() @@ -105,8 +104,7 @@ class TaxiPassengerMogoMoviesView :RelativeLayout { } override fun pageStop() { - val centerItemPosition: Int = carouselLayoutManager.getCenterItemPosition() - val player = carouselLayoutManager.findViewByPosition(centerItemPosition) + val (centerItemPosition: Int, player) = getPlayer(carouselLayoutManager) if(player is ConsultVideoPlayer){ player.onVideoPause() } @@ -126,8 +124,7 @@ class TaxiPassengerMogoMoviesView :RelativeLayout { indicatorView.onPageScrolled(currentIndex, fl, 0) } recyclerVideoAdapter.setOnThumbImageClilckListener { - val centerItemPosition: Int = carouselLayoutManager.centerItemPosition - val player = carouselLayoutManager.findViewByPosition(centerItemPosition) + val (centerItemPosition: Int, player) = getPlayer(carouselLayoutManager) if(player is ConsultVideoPlayer) { player.onVideoReset() player.thumbImageViewLayout.visibility = View.VISIBLE @@ -200,8 +197,7 @@ class TaxiPassengerMogoMoviesView :RelativeLayout { override fun onWindowFocusChanged(hasWindowFocus: Boolean) { super.onWindowFocusChanged(hasWindowFocus) val carouselLayoutManager = rvVideoPlaylist.layoutManager as CarouselLayoutManager - val centerItemPosition: Int = carouselLayoutManager.centerItemPosition - val player = carouselLayoutManager.findViewByPosition(centerItemPosition) + val (centerItemPosition: Int, player) = getPlayer(carouselLayoutManager) player?.let { if (player is ConsultVideoPlayer) { if(hasWindowFocus){// 获取焦点两种情况 @@ -241,11 +237,17 @@ class TaxiPassengerMogoMoviesView :RelativeLayout { } + private fun getPlayer(carouselLayoutManager: CarouselLayoutManager): Pair { + val centerItemPosition: Int = carouselLayoutManager.centerItemPosition + val playerHolder = carouselLayoutManager.findViewByPosition(centerItemPosition) + val player = playerHolder?.findViewById(R.id.video_item_player) + return Pair(centerItemPosition, player) + } + override fun onDetachedFromWindow() { val carouselLayoutManager = rvVideoPlaylist.layoutManager as CarouselLayoutManager - val centerItemPosition: Int = carouselLayoutManager.centerItemPosition - val player = carouselLayoutManager.findViewByPosition(centerItemPosition) + val (_: Int, player) = getPlayer(carouselLayoutManager) player?.let { if(player is ConsultVideoPlayer){ player.currentPlayer.release() diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/ConsultVideoPlayer.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/ConsultVideoPlayer.kt index c742b59b3a..e5d56e5114 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/ConsultVideoPlayer.kt +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/ConsultVideoPlayer.kt @@ -219,7 +219,7 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer { override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) { super.onSizeChanged(w, h, oldw, oldh) if (!mIfCurrentIsFullscreen) { - this.outlineProvider = TextureVideoViewOutlineProvider(40F) + this.outlineProvider = TextureVideoViewOutlineProvider(50F) this.clipToOutline = true } } diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_video_shadow11.9.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_video_shadow11.9.png new file mode 100644 index 0000000000..11d6bb65cd Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_video_shadow11.9.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_video_bg.xml b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_video_bg.xml index af00303b21..db3705a9ec 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_video_bg.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_video_bg.xml @@ -1,5 +1,6 @@ + \ No newline at end of file diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_comment_select.xml b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_comment_select.xml index 8d229a5867..6d0735382c 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_comment_select.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_comment_select.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_comment_selected.xml b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_comment_selected.xml index 674638b8d0..b5f1cd6a5d 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_comment_selected.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_comment_selected.xml @@ -1,6 +1,6 @@ - - + + \ No newline at end of file diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_comment_submit.xml b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_comment_submit.xml index bf91236244..dd498f390d 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_comment_submit.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_comment_submit.xml @@ -1,6 +1,6 @@ - - + + \ No newline at end of file diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/list_comment_item.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/list_comment_item.xml index d8197e2147..cf40ec6064 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/list_comment_item.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/list_comment_item.xml @@ -4,16 +4,16 @@ android:id="@+id/tv_comment" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="20px" - android:layout_marginBottom="20px" - android:layout_marginStart="10px" - android:layout_marginEnd="10px" + android:layout_marginTop="30px" + android:layout_marginBottom="30px" + android:layout_marginStart="16px" + android:layout_marginEnd="16px" android:background="@drawable/taxi_p_comment_select" android:button="@null" - android:paddingStart="40px" - android:paddingTop="8px" - android:paddingEnd="40px" - android:paddingBottom="8px" + android:paddingStart="45px" + android:paddingTop="15px" + android:paddingEnd="45px" + android:paddingBottom="15px" android:textColor="@color/taxi_order_status_textColor" - android:textSize="40px" + android:textSize="46px" tools:text="非常好" /> diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/list_video_item_normal.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/list_video_item_normal.xml index 0d891e27eb..30c6b68107 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/list_video_item_normal.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/list_video_item_normal.xml @@ -1,5 +1,13 @@ - + + + + + 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 c3963c55ca..7109cf39c2 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 @@ -126,6 +126,7 @@ android:id="@+id/iv_star_first" android:layout_marginTop="@dimen/dp_44" android:layout_marginStart="@dimen/dp_34" + android:layout_marginEnd="3px" app:layout_constraintTop_toBottomOf="@+id/tv_please_score" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toStartOf="@+id/iv_star_second" @@ -135,6 +136,7 @@ @@ -210,10 +216,12 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintBottom_toBottomOf="parent" android:background="@drawable/taxi_p_comment_submit" - android:textSize="@dimen/sp_46" - android:layout_marginTop="60px" - android:layout_width="400px" - android:layout_marginBottom="80px" + android:textSize="@dimen/sp_42" + android:layout_marginTop="66px" + android:layout_marginBottom="109px" + android:paddingTop="31px" + android:paddingBottom="31px" + android:layout_width="450px" android:layout_height="wrap_content"/> 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 a17591b9e1..58df86bd9c 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 @@ -33,9 +33,9 @@