diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/music/list/MusicListItemAdapter.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/music/list/MusicListItemAdapter.kt
index 570ef5f028..deea92b6c6 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/music/list/MusicListItemAdapter.kt
+++ b/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) {
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/music/playing/MusicPlayingViewModel.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/music/playing/MusicPlayingViewModel.kt
index aded9fbd34..f43e922495 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/music/playing/MusicPlayingViewModel.kt
+++ b/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)
}
}
}
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_music_split.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_music_split.png
new file mode 100644
index 0000000000..155676614e
Binary files /dev/null and b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_music_split.png differ
diff --git a/OCH/charter/passenger/src/main/res/drawable/charter_p_music_list_bottom.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_music_list_bottom.xml
new file mode 100644
index 0000000000..5eff764421
--- /dev/null
+++ b/OCH/charter/passenger/src/main/res/drawable/charter_p_music_list_bottom.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/layout/charter_p_bottom_bar.xml b/OCH/charter/passenger/src/main/res/layout/charter_p_bottom_bar.xml
index ccbbfda691..e6e33a09fc 100644
--- a/OCH/charter/passenger/src/main/res/layout/charter_p_bottom_bar.xml
+++ b/OCH/charter/passenger/src/main/res/layout/charter_p_bottom_bar.xml
@@ -43,6 +43,7 @@
@@ -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"
diff --git a/OCH/charter/passenger/src/main/res/layout/charter_p_bottom_stop_site.xml b/OCH/charter/passenger/src/main/res/layout/charter_p_bottom_stop_site.xml
index e933597fd0..14a4d229a1 100644
--- a/OCH/charter/passenger/src/main/res/layout/charter_p_bottom_stop_site.xml
+++ b/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"
diff --git a/OCH/charter/passenger/src/main/res/layout/charter_p_music.xml b/OCH/charter/passenger/src/main/res/layout/charter_p_music.xml
index d659532f59..b40f4965a9 100644
--- a/OCH/charter/passenger/src/main/res/layout/charter_p_music.xml
+++ b/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"/>
-
+ android:src="@drawable/charter_p_music_split"
+ android:layout_width="2dp"
+ android:layout_height="@dimen/dp_439"/>
diff --git a/OCH/charter/passenger/src/main/res/layout/charter_p_music_list.xml b/OCH/charter/passenger/src/main/res/layout/charter_p_music_list.xml
index 5691db52b9..682b1807bb 100644
--- a/OCH/charter/passenger/src/main/res/layout/charter_p_music_list.xml
+++ b/OCH/charter/passenger/src/main/res/layout/charter_p_music_list.xml
@@ -21,10 +21,10 @@
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/layout/charter_p_music_playing.xml b/OCH/charter/passenger/src/main/res/layout/charter_p_music_playing.xml
index 6e750eede6..d484782591 100644
--- a/OCH/charter/passenger/src/main/res/layout/charter_p_music_playing.xml
+++ b/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"
diff --git a/OCH/charter/passenger/src/main/res/values/color.xml b/OCH/charter/passenger/src/main/res/values/color.xml
index aae988baa5..f3b456cb7b 100644
--- a/OCH/charter/passenger/src/main/res/values/color.xml
+++ b/OCH/charter/passenger/src/main/res/values/color.xml
@@ -65,5 +65,6 @@
#598CFF
#4D6A83A5
#6A83A5
+ #80FFFFFF
\ No newline at end of file
diff --git a/OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxt_p_location_center_checked.png b/OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxt_p_location_center_checked.png
old mode 100755
new mode 100644
index 1467d91e06..6ef5c257e9
Binary files a/OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxt_p_location_center_checked.png and b/OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxt_p_location_center_checked.png differ