diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/impl/MusicCheckView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/impl/MusicCheckView.kt
index 1c996c0931..398fbf271f 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/impl/MusicCheckView.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/impl/MusicCheckView.kt
@@ -20,6 +20,7 @@ import com.mogo.och.common.module.manager.auditionmanager.PlayState
import kotlinx.android.synthetic.main.charter_p_bottom_music.view.aciv_center_image
import kotlinx.android.synthetic.main.charter_p_bottom_music.view.actv_title
import kotlinx.android.synthetic.main.charter_p_bottom_music.view.aciv_playing
+import kotlinx.android.synthetic.main.charter_p_bottom_music.view.aciv_playing_bg
import kotlinx.android.synthetic.main.charter_p_bottom_music.view.default_info
open class MusicCheckView @JvmOverloads constructor(
@@ -77,6 +78,7 @@ open class MusicCheckView @JvmOverloads constructor(
if (isCheck) {
default_info.visibility = View.VISIBLE
aciv_playing.visibility = View.GONE
+ aciv_playing_bg.visibility = View.GONE
backageView?.visibility = View.VISIBLE
aciv_center_image.setImageResource(selectedDrawable)
actv_title.setTextColor(context.getColor(android.R.color.white))
@@ -89,6 +91,7 @@ open class MusicCheckView @JvmOverloads constructor(
if(AuditionManager.isPlaying()){
default_info.visibility = View.GONE
aciv_playing.visibility = View.VISIBLE
+ aciv_playing_bg.visibility = View.VISIBLE
AuditionManager.musicDataPlaying?.let {
Glide.with(context)
.load(it.coverHeadImageUrl)
@@ -106,6 +109,7 @@ open class MusicCheckView @JvmOverloads constructor(
}else{
default_info.visibility = View.VISIBLE
aciv_playing.visibility = View.GONE
+ aciv_playing_bg.visibility = View.GONE
endAnimal()
}
}
@@ -165,6 +169,7 @@ open class MusicCheckView @JvmOverloads constructor(
}else{
default_info.visibility = View.VISIBLE
aciv_playing.visibility = View.GONE
+ aciv_playing_bg.visibility = View.GONE
endAnimal()
}
}
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/music/playing/MusicPlayingView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/music/playing/MusicPlayingView.kt
index 17b959847c..b40641a452 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/music/playing/MusicPlayingView.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/music/playing/MusicPlayingView.kt
@@ -67,7 +67,6 @@ class MusicPlayingView : ConstraintLayout, MusicPlayingViewModel.IMusicPlayingVi
iv_show_next.setOnClickListener {
viewModel?.showNextMusic()
}
- sb_musuc_progess.thumb.mutate().alpha = 0
sb_musuc_progess.setOnSeekBarChangeListener(object : SeekBar.OnSeekBarChangeListener{
var seekToProgress = 0
override fun onProgressChanged(seekBar: SeekBar?, progress: Int, fromUser: Boolean) {
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_light_check_select.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_light_check_select.png
index f94ff34044..5e94c3bba3 100644
Binary files a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_light_check_select.png and b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_light_check_select.png differ
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_light_check_selected.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_light_check_selected.png
index 99868fe176..dde52557b7 100644
Binary files a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_light_check_selected.png and b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_light_check_selected.png differ
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_music_bg_relax_head.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_music_bg_relax_head.png
index cb0afed17d..7bf877cbf0 100755
Binary files a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_music_bg_relax_head.png and b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_music_bg_relax_head.png differ
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_music_thumb.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_music_thumb.png
new file mode 100644
index 0000000000..f1d02be917
Binary files /dev/null and b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_music_thumb.png differ
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_play_music_bg.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_play_music_bg.png
new file mode 100644
index 0000000000..9617c881d0
Binary files /dev/null and b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_play_music_bg.png differ
diff --git a/OCH/charter/passenger/src/main/res/drawable/charter_p_function_switch_left_select.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_switch_left_select.xml
index 6ab724d159..e1d5ea42c2 100644
--- a/OCH/charter/passenger/src/main/res/drawable/charter_p_function_switch_left_select.xml
+++ b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_switch_left_select.xml
@@ -4,6 +4,6 @@
android:drawable="@drawable/charter_p_function_light_check_select" android:gravity="center"
android:left="@dimen/dp_31"
android:top="@dimen/dp_2"
- android:width="@dimen/dp_28"
- android:height="@dimen/dp_28"/>
+ android:width="@dimen/dp_36"
+ android:height="@dimen/dp_36"/>
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/drawable/charter_p_function_switch_left_selected.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_switch_left_selected.xml
index e39743dbb2..f39445a901 100644
--- a/OCH/charter/passenger/src/main/res/drawable/charter_p_function_switch_left_selected.xml
+++ b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_switch_left_selected.xml
@@ -4,6 +4,6 @@
android:drawable="@drawable/charter_p_function_light_check_selected"
android:left="@dimen/dp_31"
android:top="@dimen/dp_2"
- android:width="@dimen/dp_28"
- android:height="@dimen/dp_28"/>
+ android:width="@dimen/dp_36"
+ android:height="@dimen/dp_36"/>
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/drawable/charter_p_music_seekbar_thumb.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_music_seekbar_thumb.xml
index 6ba4b229f3..94e13d3c40 100644
--- a/OCH/charter/passenger/src/main/res/drawable/charter_p_music_seekbar_thumb.xml
+++ b/OCH/charter/passenger/src/main/res/drawable/charter_p_music_seekbar_thumb.xml
@@ -1,3 +1,13 @@
-
-
-
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/layout/charter_p_bottom_music.xml b/OCH/charter/passenger/src/main/res/layout/charter_p_bottom_music.xml
index 941d0c3643..bfae94a3a4 100644
--- a/OCH/charter/passenger/src/main/res/layout/charter_p_bottom_music.xml
+++ b/OCH/charter/passenger/src/main/res/layout/charter_p_bottom_music.xml
@@ -34,6 +34,17 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
+
+
+
+
-
-
@@ -67,6 +67,9 @@
app:layout_constraintStart_toEndOf="@+id/tv_author"
app:layout_constraintEnd_toEndOf="parent"
android:textSize="@dimen/dp_16"
+ android:paddingStart="@dimen/dp_10"
+ android:paddingEnd="@dimen/dp_10"
+ android:background="@drawable/charter_p_music_list_tag_bg"
app:layout_constraintBaseline_toBaselineOf="@+id/tv_author"
android:textColor="@color/charter_p_576887"
tools:text="轻柔"
@@ -76,22 +79,20 @@
+ android:layout_height="@dimen/dp_34"/>
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/OCH/taxi/pcommon/src/main/res/layout/taxi_p_music_playing.xml b/OCH/taxi/pcommon/src/main/res/layout/taxi_p_music_playing.xml
index 487aa69cbf..7e50a82b04 100644
--- a/OCH/taxi/pcommon/src/main/res/layout/taxi_p_music_playing.xml
+++ b/OCH/taxi/pcommon/src/main/res/layout/taxi_p_music_playing.xml
@@ -30,8 +30,8 @@
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginTop="@dimen/dp_127"
android:src="@drawable/taxt_p_music_bg_relax_head"
- android:layout_width="@dimen/dp_310"
- android:layout_height="@dimen/dp_310"/>
+ android:layout_width="@dimen/dp_292"
+ android:layout_height="@dimen/dp_292"/>
+ android:layout_height="@dimen/dp_36"/>
+