[6.3.0]

[taxi 页面修改]

OCH/charter/passenger/src/main/res/layout/charter_p_music_playing.xml

@@ -81,7 +81,6 @@
         android:progress="50"
         android:id="@+id/sb_musuc_progess"
         android:splitTrack="false"
-        android:background="@null"
         android:thumb="@drawable/charter_p_music_seekbar_thumb"
         android:duplicateParentState="true"
         app:layout_constraintStart_toStartOf="parent"

OCH/taxi/passenger/src/main/res/layout/taxi_p_bottom_bar.xml

@@ -41,6 +41,7 @@
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/actv_precisionmap_press"
         android:visibility="gone"
+        android:layout_marginTop="@dimen/dp_2"
         android:src="@drawable/taxi_p_bottom_bar_select_bg"
         app:layout_constraintStart_toStartOf="@+id/actv_precisionmap"
         app:layout_constraintEnd_toEndOf="@+id/actv_precisionmap"
@@ -70,6 +71,7 @@
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/actv_overmap_press"
         android:visibility="gone"
+        android:layout_marginTop="@dimen/dp_2"
         android:src="@drawable/taxi_p_bottom_bar_select_bg"
         app:layout_constraintStart_toStartOf="@+id/actv_overmap"
         app:layout_constraintEnd_toEndOf="@+id/actv_overmap"
@@ -99,6 +101,7 @@
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/actv_video_press"
         android:visibility="gone"
+        android:layout_marginTop="@dimen/dp_2"
         android:src="@drawable/taxi_p_bottom_bar_select_bg"
         app:layout_constraintStart_toStartOf="@+id/actv_video"
         app:layout_constraintEnd_toEndOf="@+id/actv_video"

OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/bar/LeftBarView.kt

@@ -8,6 +8,7 @@ import androidx.constraintlayout.widget.ConstraintLayout
 import com.mogo.eagle.core.utilcode.kotlin.onClick
 import com.mogo.och.taxi.passenger.common.R
 import kotlinx.android.synthetic.main.taxi_p_leftbar.view.iv_center_location
+import kotlinx.android.synthetic.main.taxi_p_leftbar.view.iv_center_location_bg
 
 
 class LeftBarView : ConstraintLayout {
@@ -30,7 +31,7 @@ class LeftBarView : ConstraintLayout {
     private fun initView() {
         LayoutInflater.from(context).inflate(R.layout.taxi_p_leftbar, this, true)
 
-        iv_center_location.onClick {
+        iv_center_location_bg.onClick {
             this.rightBarCallback?.setGo2CenterClick()
         }
     }

OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/bar/RightBarView.kt

@@ -14,7 +14,6 @@ import com.bumptech.glide.request.RequestOptions
 import com.bumptech.glide.request.target.SimpleTarget
 import com.bumptech.glide.request.transition.Transition
 import com.elegant.utils.UiThreadHandler
-import com.mogo.eagle.core.utilcode.kotlin.onClick
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.och.common.module.manager.auditionmanager.AuditionManager
 import com.mogo.och.common.module.manager.auditionmanager.MusicData

OCH/taxi/pcommon/src/main/res/drawable/taxi_p_music_list_bottom.xml

@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <gradient android:startColor="@color/taxi_cp_80FFFFFF" android:endColor="@android:color/transparent" android:angle="90"/>
-    <corners android:bottomLeftRadius="@dimen/dp_30" android:bottomRightRadius="@dimen/dp_30"/>
+    <corners android:bottomLeftRadius="@dimen/dp_36" android:bottomRightRadius="@dimen/dp_36"/>
 </shape>

OCH/taxi/pcommon/src/main/res/layout/taxi_p_music_playing.xml

@@ -69,6 +69,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/tv_tag"
         android:layout_marginTop="@dimen/dp_41"
+        android:duplicateParentState="true"
         android:progressDrawable="@drawable/taxt_p_music_seekbar_style"
         android:paddingTop="@dimen/dp_16"
         android:paddingBottom="@dimen/dp_16"

OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_bottom_bar.xml

@@ -41,6 +41,7 @@
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/actv_precisionmap_press"
         android:visibility="gone"
+        android:layout_marginTop="@dimen/dp_2"
         android:src="@drawable/taxt_u_p_bottom_bar_select_bg"
         app:layout_constraintStart_toStartOf="@+id/actv_precisionmap"
         app:layout_constraintEnd_toEndOf="@+id/actv_precisionmap"
@@ -70,6 +71,7 @@
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/actv_overmap_press"
         android:visibility="gone"
+        android:layout_marginTop="@dimen/dp_2"
         android:src="@drawable/taxt_u_p_bottom_bar_select_bg"
         app:layout_constraintStart_toStartOf="@+id/actv_overmap"
         app:layout_constraintEnd_toEndOf="@+id/actv_overmap"
@@ -99,6 +101,7 @@
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/actv_video_press"
         android:visibility="gone"
+        android:layout_marginTop="@dimen/dp_2"
         android:src="@drawable/taxt_u_p_bottom_bar_select_bg"
         app:layout_constraintStart_toStartOf="@+id/actv_video"
         app:layout_constraintEnd_toEndOf="@+id/actv_video"