diff --git a/OCH/taxi/taxi-unmanned-passenger/src/main/assets/style.data b/OCH/taxi/taxi-unmanned-passenger/src/main/assets/style.data index a41c36c308..134c469f17 100755 Binary files a/OCH/taxi/taxi-unmanned-passenger/src/main/assets/style.data and b/OCH/taxi/taxi-unmanned-passenger/src/main/assets/style.data differ diff --git a/OCH/taxi/taxi-unmanned-passenger/src/main/assets/style_extra.data b/OCH/taxi/taxi-unmanned-passenger/src/main/assets/style_extra.data index ca0eb5456f..ace8199ee0 100755 Binary files a/OCH/taxi/taxi-unmanned-passenger/src/main/assets/style_extra.data and b/OCH/taxi/taxi-unmanned-passenger/src/main/assets/style_extra.data differ diff --git a/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/ConsultVideoPlayer.kt b/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/ConsultVideoPlayer.kt index 170afc5e88..ab1ae3cb54 100644 --- a/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/ConsultVideoPlayer.kt +++ b/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/ConsultVideoPlayer.kt @@ -153,9 +153,11 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer { override fun onWindowFocusChanged(hasWindowFocus: Boolean) { super.onWindowFocusChanged(hasWindowFocus) if(isIfCurrentIsFullscreen&&smalllPlayer!=null){ - if(hasWindowFocus){//获取焦点 - //onVideoResume() - }else{ + if (hasWindowFocus) {//获取焦点 + if (isInPlayingState && smalllPlayer!!.mCurrentState != CURRENT_STATE_PAUSE) { + onVideoResume() + } + } else { onVideoPause() } } diff --git a/OCH/taxi/taxi-unmanned-passenger/src/main/res/drawable-xhdpi/taxi_overmap_arrived.png b/OCH/taxi/taxi-unmanned-passenger/src/main/res/drawable-xhdpi/taxi_overmap_arrived.png new file mode 100644 index 0000000000..45614012e3 Binary files /dev/null and b/OCH/taxi/taxi-unmanned-passenger/src/main/res/drawable-xhdpi/taxi_overmap_arrived.png differ diff --git a/OCH/taxi/taxi-unmanned-passenger/src/main/res/drawable-xhdpi/taxi_overmap_arriving.png b/OCH/taxi/taxi-unmanned-passenger/src/main/res/drawable-xhdpi/taxi_overmap_arriving.png new file mode 100644 index 0000000000..1cac7d83b0 Binary files /dev/null and b/OCH/taxi/taxi-unmanned-passenger/src/main/res/drawable-xhdpi/taxi_overmap_arriving.png differ diff --git a/OCH/taxi/taxi-unmanned-passenger/src/main/res/layout/taxi_p_base_fragment.xml b/OCH/taxi/taxi-unmanned-passenger/src/main/res/layout/taxi_p_base_fragment.xml index 21f27aa6b7..673385f981 100644 --- a/OCH/taxi/taxi-unmanned-passenger/src/main/res/layout/taxi_p_base_fragment.xml +++ b/OCH/taxi/taxi-unmanned-passenger/src/main/res/layout/taxi_p_base_fragment.xml @@ -14,6 +14,8 @@ app:endPointDrawable="@drawable/taxi_p_map_view_dir_end" app:carDrawable="@drawable/taxi_p_map_car" app:compassDrawable="@drawable/taxi_p_map_car_light" + app:arrivedDrawable="@drawable/taxi_overmap_arrived" + app:unArrivedDrawable="@drawable/taxi_overmap_arriving" app:mapStyleExtraPath="style_extra.data" app:mapStylePath="style.data" app:leftPadding="800"