diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/InfoVideoView.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/InfoVideoView.kt
index cb6bcc2ea9..69a15e92b9 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/InfoVideoView.kt
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/InfoVideoView.kt
@@ -215,6 +215,18 @@ internal class InfoVideoView @JvmOverloads constructor(
return Pair(centerItemPosition, player)
}
+ override fun onWindowFocusChanged(hasWindowFocus: Boolean) {
+ super.onWindowFocusChanged(hasWindowFocus)
+ val carouselLayoutManager = rvVideoPlaylist?.layoutManager as CarouselLayoutManager
+ val (centerItemPosition: Int, player) = getPlayer(carouselLayoutManager)
+ player?.let {
+ if(it.isInPlayingState&&!it.isIfCurrentIsFullscreen&&!hasWindowFocus){
+ player.onVideoPause()
+ }
+ }
+
+ }
+
override fun onDetachedFromWindow() {
super.onDetachedFromWindow()
}
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 20cf8b4e41..f8d37dbd24 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
@@ -122,6 +122,7 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer {
layoutParams2.height = AutoSizeUtils.dp2px(context,108f)
layoutParams2.width = AutoSizeUtils.dp2px(context,108f)
fullscreenButton.layoutParams = layoutParams2
+ fullscreenButton.visibility = View.VISIBLE
}
}
@@ -152,13 +153,13 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer {
override fun onWindowFocusChanged(hasWindowFocus: Boolean) {
super.onWindowFocusChanged(hasWindowFocus)
-// if(isIfCurrentIsFullscreen&&smalllPlayer!=null){
-// if(hasWindowFocus){//获取焦点
-// onVideoResume()
-// }else{
-// onVideoPause()
-// }
-// }
+ if(isIfCurrentIsFullscreen&&smalllPlayer!=null){
+ if(hasWindowFocus){//获取焦点
+ onVideoResume()
+ }else{
+ onVideoPause()
+ }
+ }
}
override fun touchDoubleUp() {
@@ -167,7 +168,7 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer {
override fun changeUiToNormal() {
super.changeUiToNormal()
- setViewShowState(fullscreenButton, INVISIBLE)
+ //setViewShowState(fullscreenButton, INVISIBLE)
this.statusBarView?.visibility = View.VISIBLE
}
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml
index ba1ddf5be2..af3654e56a 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml
@@ -16,7 +16,7 @@
app:compassDrawable="@drawable/taxi_p_map_car_light"
app:mapStyleExtraPath="style_extra.data"
app:mapStylePath="style.data"
- app:leftPadding="160"
+ app:leftPadding="800"
app:rightPadding="160"
app:topPadding="160"
app:bottomPadding="160"
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_itinerary.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_itinerary.xml
index 852c6b1fb4..a5666659f3 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_itinerary.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_itinerary.xml
@@ -8,6 +8,7 @@
@@ -82,7 +84,8 @@
android:layout_width="0dp"
android:gravity="center"
android:layout_height="wrap_content"
- android:layout_marginTop="@dimen/dp_51"
+ android:layout_marginTop="@dimen/dp_50"
+ android:layout_marginBottom="@dimen/dp_66"
android:layout_marginStart="@dimen/dp_58"
android:textSize="@dimen/dp_61"
android:fontFamily="@font/din"
@@ -90,7 +93,8 @@
android:textColor="@color/taxi_p_081831"
app:layout_constraintEnd_toStartOf="@+id/actv_surplus_time"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/actv_speed_value"
+ app:layout_constraintTop_toTopOf="@+id/v_bottom_bg"
+ app:layout_constraintBottom_toBottomOf="@+id/v_bottom_bg"
android:text="--" />
#004DC4
#293449
#203555
- #5C71AB
+ #B35C71AB
#081831
#112B57
#66476FBE