[6.3.0]

[包车UI调整]

OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/music/list/MusicListItemAdapter.kt

@@ -1,6 +1,7 @@
 package com.mogo.och.charter.passenger.ui.music.list
 
 import android.content.Context
+import android.graphics.Typeface
 import android.graphics.drawable.GradientDrawable
 import android.os.Build
 import android.view.LayoutInflater
@@ -76,8 +77,10 @@ class MusicListItemAdapter(
 
         if(musicData.select==true){
             holder.itemView.background = gradientDrawable
+            holder.musicName.setTypeface(null,Typeface.BOLD)
         }else{
             holder.itemView.background = null
+            holder.musicName.setTypeface(null,Typeface.NORMAL)
         }
 
         if (musicData.state==PlayState.Playing) {

OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/music/playing/MusicPlayingViewModel.kt

@@ -41,6 +41,7 @@ class MusicPlayingViewModel : ViewModel(), AuditionManager.MusicDataChangeListen
             if(musicList.size>0){
                 val first = musicList.first()
                 setMusicData(first)
+                viewCallback?.setSelect(first,null)
             }
         }
     }

OCH/charter/passenger/src/main/res/drawable/charter_p_music_list_bottom.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <gradient android:startColor="@color/charter_p_80FFFFFF" android:endColor="@android:color/transparent" android:angle="90"/>
+    <corners android:bottomLeftRadius="@dimen/dp_30" />
+</shape>

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

@@ -43,6 +43,7 @@
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/actv_close_door_press"
         android:visibility="gone"
+        android:layout_marginTop="@dimen/dp_2"
         android:src="@drawable/charter_p_bottom_bar_select_bg"
         app:layout_constraintStart_toStartOf="@+id/actv_close_door"
         app:layout_constraintEnd_toEndOf="@+id/actv_close_door"
@@ -65,6 +66,7 @@
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/actv_open_door_press"
         android:visibility="gone"
+        android:layout_marginTop="@dimen/dp_2"
         android:src="@drawable/charter_p_bottom_bar_select_bg"
         app:layout_constraintStart_toStartOf="@+id/actv_open_door"
         app:layout_constraintEnd_toEndOf="@+id/actv_open_door"
@@ -92,6 +94,7 @@
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/cl_order_time_press"
         android:visibility="gone"
+        android:layout_marginTop="@dimen/dp_2"
         android:src="@drawable/charter_p_bottom_bar_select_bg"
         app:layout_constraintStart_toStartOf="@+id/cl_order_time"
         app:layout_constraintEnd_toEndOf="@+id/cl_order_time"
@@ -110,6 +113,7 @@
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/actv_music_press"
         android:visibility="gone"
+        android:layout_marginTop="@dimen/dp_2"
         android:src="@drawable/charter_p_bottom_bar_select_bg"
         app:layout_constraintStart_toStartOf="@+id/actv_music"
         app:layout_constraintEnd_toEndOf="@+id/actv_music"
@@ -132,6 +136,7 @@
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/actv_setting_press"
         android:visibility="gone"
+        android:layout_marginTop="@dimen/dp_2"
         android:src="@drawable/charter_p_bottom_bar_select_bg"
         app:layout_constraintStart_toStartOf="@+id/actv_setting"
         app:layout_constraintEnd_toEndOf="@+id/actv_setting"
@@ -154,6 +159,7 @@
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/actv_line_press"
         android:visibility="gone"
+        android:layout_marginTop="@dimen/dp_2"
         android:src="@drawable/charter_p_bottom_bar_select_bg"
         app:layout_constraintStart_toStartOf="@+id/actv_line"
         app:layout_constraintEnd_toEndOf="@+id/actv_line"

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

@@ -12,6 +12,7 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
+        android:layout_marginTop="-10dp"
         android:layout_width="@dimen/dp_90"
         android:layout_height="@dimen/dp_90"/>
 
@@ -20,7 +21,7 @@
         app:layout_constraintStart_toStartOf="@+id/aciv_center_image"
         app:layout_constraintEnd_toEndOf="@+id/aciv_center_image"
         app:layout_constraintBottom_toBottomOf="parent"
-        android:layout_marginBottom="@dimen/dp_4_5"
+        android:layout_marginBottom="@dimen/dp_9"
         android:textSize="@dimen/dp_20"
         android:text="靠边停车"
         android:textColor="@color/charter_p_090f28"

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

@@ -12,6 +12,7 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
+        android:layout_marginTop="-10dp"
         android:layout_width="@dimen/dp_90"
         android:layout_height="@dimen/dp_90"/>
 
@@ -20,7 +21,7 @@
         app:layout_constraintStart_toStartOf="@+id/aciv_center_image"
         app:layout_constraintEnd_toEndOf="@+id/aciv_center_image"
         app:layout_constraintBottom_toBottomOf="parent"
-        android:layout_marginBottom="@dimen/dp_4_5"
+        android:layout_marginBottom="@dimen/dp_9"
         android:textSize="@dimen/dp_20"
         android:text="靠边停车"
         android:textColor="@color/charter_p_090f28"

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

@@ -36,11 +36,13 @@
             android:layout_width="@dimen/dp_460"
             android:layout_height="@dimen/dp_440"/>
 
-        <View
+
+        <ImageView
+            app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintStart_toEndOf="@+id/mlv_list"
-            android:background="@drawable/charter_p_music_center_split"
-            android:layout_width="@dimen/dp_1"
-            android:layout_height="match_parent"/>
+            android:src="@drawable/charter_p_music_split"
+            android:layout_width="2dp"
+            android:layout_height="@dimen/dp_439"/>
 
 
     </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -21,10 +21,10 @@
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rv_music_list"
         app:layout_constraintTop_toTopOf="parent"
-        android:layout_marginTop="@dimen/dp_89"
+        android:layout_marginTop="@dimen/dp_74"
+        android:paddingTop="@dimen/dp_15"
         android:layout_width="match_parent"
         app:layout_constraintBottom_toBottomOf="parent"
-        android:layout_marginBottom="@dimen/dp_20"
         android:layout_height="0dp"/>
 
 </merge>

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

@@ -45,6 +45,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         android:layout_marginTop="@dimen/dp_30"
         android:textSize="@dimen/dp_21"
+        android:textStyle="bold"
         tools:text="Current"
         android:textColor="@color/charter_p_303C52"
         android:layout_width="wrap_content"

OCH/charter/passenger/src/main/res/values/color.xml

@@ -65,5 +65,6 @@
     <color name="charter_p_598CFF">#598CFF</color>
     <color name="charter_p_4D6A83A5">#4D6A83A5</color>
     <color name="charter_p_6A83A5">#6A83A5</color>
+    <color name="charter_p_80FFFFFF">#80FFFFFF</color>
 
 </resources>