[5.0.0]

[地图样式]

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()
             }
         }

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"