yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[6.3.0]

Browse Source 
[charter 页面修改]
This commit is contained in:
yangyakun
2024-03-22 20:08:28 +08:00
parent e4023f474d
commit d47b272f72
19 changed files with 84 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/impl/MusicCheckView.kt
View File

@@ -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()
}
}

1
OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/music/playing/MusicPlayingView.kt
View File

@@ -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) {

BIN
OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_light_check_select.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_light_check_selected.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 760 B

After

Width:  |  Height:  |  Size: 826 B

BIN
OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_music_bg_relax_head.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 138 KiB

After

Width:  |  Height:  |  Size: 23 KiB

BIN
OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_music_thumb.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1008 B

BIN
OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_play_music_bg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 17 KiB

4
OCH/charter/passenger/src/main/res/drawable/charter_p_function_switch_left_select.xml
View File

@@ -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"/>
</layer-list >

4
OCH/charter/passenger/src/main/res/drawable/charter_p_function_switch_left_selected.xml
View File

@@ -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"/>
</layer-list >

16
OCH/charter/passenger/src/main/res/drawable/charter_p_music_seekbar_thumb.xml
View File

@@ -1,3 +1,13 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@android:color/transparent" />
</shape>
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<!-- 普通无焦点状态 -拖动按钮 -->
<item android:drawable="@drawable/charter_p_music_thumb" android:state_focused="false" android:state_pressed="false"/>
<!-- 有焦点状态 -->
<item android:drawable="@drawable/charter_p_music_thumb" android:state_focused="true" android:state_pressed="false"/>
<!-- 有焦点 -->
<item android:drawable="@drawable/charter_p_music_thumb" android:state_focused="true"/>
<item android:drawable="@drawable/charter_p_music_thumb"/>
</selector>

11
OCH/charter/passenger/src/main/res/layout/charter_p_bottom_music.xml
View File

@@ -34,6 +34,17 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/aciv_playing_bg"
android:visibility="gone"
android:src="@drawable/charter_p_play_music_bg"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:layout_width="@dimen/dp_103"
android:layout_height="@dimen/dp_103"/>
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/aciv_playing"
app:layout_constraintTop_toTopOf="parent"

35
OCH/charter/passenger/src/main/res/layout/charter_p_music_playing.xml
View File

@@ -16,25 +16,25 @@
android:layout_width="@dimen/dp_197"
android:layout_height="@dimen/dp_242"/>
<ImageView
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginTop="@dimen/dp_45"
android:src="@drawable/charter_p_music_bg_middle"
android:layout_width="187dp"
android:layout_height="162dp"/>
<ImageView
android:id="@+id/iv_music_cover"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginTop="@dimen/dp_54"
android:layout_marginTop="53.5dp"
android:src="@drawable/charter_p_music_bg_relax_head"
android:layout_width="@dimen/dp_140_4"
android:layout_height="@dimen/dp_140_4"/>
<ImageView
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginTop="@dimen/dp_43"
android:src="@drawable/charter_p_music_bg_middle"
android:layout_width="@dimen/dp_190"
android:layout_height="@dimen/dp_190"/>
@@ -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 @@
<SeekBar
android:max="100"
android:progress="50"
android:paddingStart="@dimen/dp_0"
android:paddingEnd="@dimen/dp_0"
android:id="@+id/sb_musuc_progess"
android:splitTrack="false"
android:background="@null"
android:thumb="@null"
android:thumb="@drawable/charter_p_music_seekbar_thumb"
android:duplicateParentState="true"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_author"
android:layout_marginTop="@dimen/dp_28"
android:layout_marginTop="@dimen/dp_16"
android:progressDrawable="@drawable/charter_p_music_seekbar_style"
android:paddingTop="3dp"
android:paddingBottom="@dimen/dp_3"
android:paddingTop="@dimen/dp_15"
android:paddingBottom="@dimen/dp_15"
android:layout_width="@dimen/dp_270"
android:layout_height="@dimen/dp_10"/>
android:layout_height="@dimen/dp_34"/>
<TextView
android:id="@+id/tv_playing_time"

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

@@ -20,6 +20,7 @@ import com.mogo.och.common.module.manager.auditionmanager.AuditionManager
import com.mogo.och.common.module.manager.auditionmanager.MusicData
import com.mogo.och.common.module.manager.auditionmanager.PlayState
import com.mogo.och.taxi.passenger.common.R
import kotlinx.android.synthetic.main.taxi_p_rightbar.view.aciv_playing_bg
import kotlinx.android.synthetic.main.taxi_p_rightbar.view.ck_music
import kotlinx.android.synthetic.main.taxi_p_rightbar.view.ck_setting
import kotlinx.android.synthetic.main.taxi_p_rightbar.view.ck_setting_only
@@ -114,6 +115,7 @@ class RightBarView : ConstraintLayout, AuditionManager.MusicDataChangeListener {
animator?.repeatMode = ValueAnimator.RESTART
animator?.interpolator = LinearInterpolator()
animator?.start()
aciv_playing_bg.visibility = View.VISIBLE
}
private fun endAnimal(){
@@ -122,6 +124,7 @@ class RightBarView : ConstraintLayout, AuditionManager.MusicDataChangeListener {
ck_music.rotation = 0f
animator = null
}
aciv_playing_bg.visibility = View.GONE
}
override fun onVisibilityAggregated(isVisible: Boolean) {

BIN
OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxi_p_music_thumb.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxi_p_play_music_bg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 17 KiB

BIN
OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxt_p_music_bg_relax_head.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 138 KiB

After

Width:  |  Height:  |  Size: 23 KiB

13
OCH/taxi/pcommon/src/main/res/drawable/taxi_p_music_seekbar_thumb.xml Normal file
View File

@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<!-- 普通无焦点状态 -拖动按钮 -->
<item android:drawable="@drawable/taxi_p_music_thumb" android:state_focused="false" android:state_pressed="false"/>
<!-- 有焦点状态 -->
<item android:drawable="@drawable/taxi_p_music_thumb" android:state_focused="true" android:state_pressed="false"/>
<!-- 有焦点 -->
<item android:drawable="@drawable/taxi_p_music_thumb" android:state_focused="true"/>
<item android:drawable="@drawable/taxi_p_music_thumb"/>
</selector>

17
OCH/taxi/pcommon/src/main/res/layout/taxi_p_music_playing.xml
View File

@@ -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"/>
<TextView
android:id="@+id/tv_music_name"
@@ -63,20 +63,17 @@
<SeekBar
android:max="100"
android:progress="50"
android:paddingStart="@dimen/dp_0"
android:paddingEnd="@dimen/dp_0"
android:id="@+id/sb_musuc_progess"
android:thumb="@null"
android:background="@null"
android:thumb="@drawable/taxi_p_music_seekbar_thumb"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_tag"
android:layout_marginTop="@dimen/dp_54"
android:layout_marginTop="@dimen/dp_41"
android:progressDrawable="@drawable/taxt_p_music_seekbar_style"
android:paddingTop="3dp"
android:paddingBottom="@dimen/dp_3"
android:paddingTop="@dimen/dp_16"
android:paddingBottom="@dimen/dp_16"
android:layout_width="@dimen/dp_340"
android:layout_height="@dimen/dp_10"/>
android:layout_height="@dimen/dp_36"/>
<TextView
android:id="@+id/tv_playing_time"

10
OCH/taxi/pcommon/src/main/res/layout/taxi_p_rightbar.xml
View File

@@ -27,6 +27,16 @@
app:layout_constraintStart_toStartOf="@+id/iv_setting_music_bg"
app:layout_constraintEnd_toEndOf="@+id/iv_setting_music_bg"
app:layout_constraintTop_toTopOf="@+id/iv_setting_music_bg" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/aciv_playing_bg"
android:visibility="gone"
android:src="@drawable/taxi_p_play_music_bg"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/ck_music"
app:layout_constraintBottom_toBottomOf="@+id/ck_music"
android:layout_width="@dimen/dp_103"
android:layout_height="@dimen/dp_103"/>
<CheckBox
android:id="@+id/ck_music"
android:layout_width="@dimen/dp_76"