diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/music/MusicView.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/music/MusicView.kt
index 856ece399f..23f9e39b05 100644
--- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/music/MusicView.kt
+++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/music/MusicView.kt
@@ -7,12 +7,9 @@ import android.view.View
import androidx.constraintlayout.widget.ConstraintLayout
import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.findViewTreeViewModelStoreOwner
-import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
-import com.mogo.och.common.module.manager.audition.AuditionManager
import com.mogo.och.common.module.manager.audition.MusicData
import com.mogo.och.unmanned.passenger.ui.music.list.MusicListView
import com.mogo.och.unmanned.taxi.passenger.R
-import kotlinx.android.synthetic.main.taxi_p_music.view.iv_toggle_list_playing
import kotlinx.android.synthetic.main.taxi_p_music.view.mlv_list
import kotlinx.android.synthetic.main.taxi_p_music.view.mpv_playing
@@ -39,27 +36,11 @@ class MusicView : ConstraintLayout, MusicViewModel.IMusicViewCallback, MusicList
private fun initView() {
LayoutInflater.from(context).inflate(R.layout.taxi_p_music, this, true)
- setBackgroundResource(R.drawable.taxt_p_music_bg)
setListener()
}
private fun setListener() {
- iv_toggle_list_playing.setOnClickListener {
- if (mpv_playing.visibility == VISIBLE && mlv_list.visibility == GONE) {
- showMusicList()
- } else if (mpv_playing.visibility == GONE && mlv_list.visibility == VISIBLE) {
- if (!AuditionManager.isPlaying()) {
- CallerLogger.i(TAG, "当前无播放音乐,不能切到MusicPlayingView")
- return@setOnClickListener
- }
- showMusicPlaying()
- mpv_playing.setData(null)
- }else{
- showMusicPlaying()
- mpv_playing.setData(null)
- }
- }
mlv_list.setCheckItemListener(this)
}
@@ -82,21 +63,9 @@ class MusicView : ConstraintLayout, MusicViewModel.IMusicViewCallback, MusicList
}
}
- private fun showMusicList(){
- mpv_playing.visibility = GONE
- mlv_list.visibility = View.VISIBLE
- iv_toggle_list_playing.setImageResource(R.drawable.taxt_p_go2_playing)
- }
- private fun showMusicPlaying(){
- mpv_playing.visibility = VISIBLE
- mlv_list.visibility = GONE
- iv_toggle_list_playing.setImageResource(R.drawable.taxt_p_go2_list)
- }
override fun checkItem(musicData: MusicData) {
mpv_playing.setDatafromCheck(musicData)
- // 详情页显示歌曲
- showMusicPlaying()
}
diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/music/list/MusicListItemAdapter.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/music/list/MusicListItemAdapter.kt
index b5cadfbe94..5b82d6ad88 100644
--- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/music/list/MusicListItemAdapter.kt
+++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/music/list/MusicListItemAdapter.kt
@@ -34,7 +34,7 @@ class MusicListItemAdapter(
it.orientation = GradientDrawable.Orientation.LEFT_RIGHT
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
it.setColors(intArrayOf(firstColor, setondColor, thirdColor, fourceColor,fifthColor),
- floatArrayOf(0.0f,0.3f,0.6f,0.9f,1f)
+ floatArrayOf(0.0f,0.1f,0.3f,0.6f,1f)
)
}else{
it.colors = intArrayOf(firstColor, setondColor, thirdColor, fourceColor)
diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/music/playing/MusicPlayingView.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/music/playing/MusicPlayingView.kt
index 3331d5ec32..7b1d741b34 100644
--- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/music/playing/MusicPlayingView.kt
+++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/music/playing/MusicPlayingView.kt
@@ -50,7 +50,7 @@ class MusicPlayingView : ConstraintLayout, MusicPlayingViewModel.IMusicPlayingVi
private var isSeekBarTouch = false
- private val centerWidth = AutoSizeUtils.dp2px(context,146f)
+// private val centerWidth = AutoSizeUtils.dp2px(context,146f)
private fun initView() {
LayoutInflater.from(context).inflate(R.layout.taxi_p_music_playing, this, true)
@@ -130,14 +130,14 @@ class MusicPlayingView : ConstraintLayout, MusicPlayingViewModel.IMusicPlayingVi
sb_musuc_progess.progress=0.toInt()
}
- Glide.with(context)
- .load(musicData.coverHeadImageUrl)
- .apply(RequestOptions().placeholder(R.drawable.taxt_p_music_bg_relax_head))
- .into(iv_music_cover)
- Glide.with(context)
- .load(musicData.coverBottomImageUrl)
- .apply(RequestOptions().placeholder(R.drawable.taxt_p_music_bg_relax_bottom))
- .into(iv_music_cover_bg)
+// Glide.with(context)
+// .load(musicData.coverHeadImageUrl)
+// .apply(RequestOptions().placeholder(R.drawable.taxt_p_music_bg_relax_head))
+// .into(iv_music_cover)
+// Glide.with(context)
+// .load(musicData.coverBottomImageUrl)
+// .apply(RequestOptions().placeholder(R.drawable.taxt_p_music_bg_relax_bottom))
+// .into(iv_music_cover_bg)
}
private fun startAnimal(){
@@ -146,8 +146,8 @@ class MusicPlayingView : ConstraintLayout, MusicPlayingViewModel.IMusicPlayingVi
animator = null
}
animator = ObjectAnimator.ofFloat(iv_music_cover, "rotation", 0f, 360f)
- iv_music_cover.pivotX = (centerWidth).toFloat()
- iv_music_cover.pivotY = (centerWidth).toFloat()
+// iv_music_cover.pivotX = (centerWidth).toFloat()
+// iv_music_cover.pivotY = (centerWidth).toFloat()
animator?.duration = 3000
animator?.repeatCount = -1
animator?.repeatMode = ValueAnimator.RESTART
diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_p_music_next.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_p_music_next.png
index 8610c57bfc..3a310984b7 100644
Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_p_music_next.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_p_music_next.png differ
diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_p_music_pause.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_p_music_pause.png
index af55d1099e..bd73245ddb 100644
Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_p_music_pause.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_p_music_pause.png differ
diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_p_music_play.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_p_music_play.png
index 32db628355..8e379e9397 100644
Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_p_music_play.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_p_music_play.png differ
diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_p_music_pre.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_p_music_pre.png
index 97f630aecd..6cb67fb738 100644
Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_p_music_pre.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_p_music_pre.png differ
diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_p_music_bg_middle.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_p_music_bg_middle.png
index c88126dfbd..35e3f8cd63 100644
Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_p_music_bg_middle.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_p_music_bg_middle.png differ
diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_p_music_bg_relax_head.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_p_music_bg_relax_head.png
index 7bf877cbf0..c0af6fd403 100644
Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_p_music_bg_relax_head.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_p_music_bg_relax_head.png differ
diff --git a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_music.xml b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_music.xml
index 2be3fd0516..9f053ad87e 100644
--- a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_music.xml
+++ b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_music.xml
@@ -2,40 +2,27 @@
+ android:layout_marginStart="@dimen/dp_193"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"/>
-
-
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintStart_toEndOf="@+id/mpv_playing"
+ android:layout_marginStart="-146dp"
+ android:layout_width="1197dp"
+ android:layout_height="0dp"/>
\ No newline at end of file
diff --git a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_music_list.xml b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_music_list.xml
index 4a43d0676c..7a13c11293 100644
--- a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_music_list.xml
+++ b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_music_list.xml
@@ -2,22 +2,10 @@
-
-
-
-
+ android:layout_marginBottom="@dimen/dp_200"
+ app:layout_constraintTop_toTopOf="parent"
+ android:layout_height="wrap_content"/>
\ No newline at end of file
diff --git a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_music_list_item.xml b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_music_list_item.xml
index 833d2494f3..f1b42f37cb 100644
--- a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_music_list_item.xml
+++ b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_music_list_item.xml
@@ -12,7 +12,7 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
android:textColor="@color/taxi_cp_303C52"
- android:layout_marginStart="@dimen/dp_55"
+ android:layout_marginStart="@dimen/dp_187"
android:text="音乐名称"
android:textSize="@dimen/dp_32"
android:layout_width="wrap_content"
@@ -22,16 +22,18 @@
android:id="@+id/iv_music_playing"
app:layout_constraintTop_toTopOf="@+id/tv_song_name"
app:layout_constraintBottom_toBottomOf="@+id/tv_song_name"
- app:layout_constraintStart_toEndOf="@+id/tv_song_name"
- android:layout_marginStart="@dimen/dp_28"
+ app:layout_constraintEnd_toStartOf="@+id/tv_song_name"
+ android:layout_marginEnd="@dimen/dp_25"
android:src="@drawable/taxi_p_music_list_playing"
android:visibility="gone"
+ tools:visibility="visible"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
+ android:src="@drawable/taxi_p_music_bg"
+ android:layout_width="@dimen/dp_734"
+ android:layout_height="@dimen/dp_734"/>
+
+ android:layout_width="@dimen/dp_734"
+ android:layout_height="@dimen/dp_734"/>
+ android:layout_width="@dimen/dp_352"
+ android:layout_height="@dimen/dp_352"/>
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
\ No newline at end of file