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

[8.0.0]

Browse Source 
[fix]
[ui 变更 音乐播放问题]
This commit is contained in:
yangyakun
2025-05-13 17:38:05 +08:00
parent 84f64e8040
commit 31a460b464
14 changed files with 39 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,7 +51,6 @@ class MusicListViewModel : ViewModel(),
}
override fun onMusicCompletion(musicData: MusicData) {
super.onMusicCompletion(musicData)
UiThreadHandler.post({
viewCallback?.updateMusicData(musicData, musicData)
}, UiThreadHandler.MODE.QUEUE)

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

@@ -108,7 +108,6 @@ class MusicPlayingViewModel : ViewModel(), AuditionManager.MusicDataChangeListen
}
override fun onMusicCompletion(musicData: MusicData) {
super.onMusicCompletion(musicData)
checkMusicData?.let {
if(it.id==musicData.id){
it.state = musicData.state

11
OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/homepage/HomeView.kt
View File

@@ -12,20 +12,15 @@ import androidx.constraintlayout.widget.Guideline
import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.findViewTreeViewModelStoreOwner
import com.mogo.eagle.core.data.map.MogoLatLng
import com.mogo.eagle.core.utilcode.kotlin.onClick
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
import com.mogo.och.bridge.autopilot.location.OchLocationManager
import com.mogo.och.unmanned.passenger.ui.bar.LeftBarView
import com.mogo.och.unmanned.taxi.passenger.R
import kotlinx.android.synthetic.main.taxi_p_home.view.decContainer
import kotlinx.android.synthetic.main.taxi_p_home.view.acbtn_show_all
import kotlinx.android.synthetic.main.taxi_p_home.view.acbtn_show_hdmap
import kotlinx.android.synthetic.main.taxi_p_home.view.hdMapView
import kotlinx.android.synthetic.main.taxi_p_home.view.preContainer
import kotlinx.android.synthetic.main.taxi_p_home.view.lbv_go2_center
import kotlinx.android.synthetic.main.taxi_p_home.view.leftContainer
import kotlinx.android.synthetic.main.taxi_p_home.view.leftEndGuideline
import kotlinx.android.synthetic.main.taxi_p_home.view.midContainer
import kotlinx.android.synthetic.main.taxi_p_home.view.midStartGuideline
class HomeView @JvmOverloads constructor(
@@ -65,12 +60,6 @@ class HomeView @JvmOverloads constructor(
})
acbtn_show_hdmap.onClick {
showHdMap()
}
acbtn_show_all.onClick {
showAmapAndHdMap()
}
}
fun showHdMap(){

11
OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/music/MusicModel.kt
View File

@@ -6,10 +6,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
import com.mogo.och.common.module.manager.audition.AuditionManager
import com.mogo.och.bridge.autopilot.autopilot.IOchAutopilotStatusListener
import com.mogo.och.bridge.autopilot.autopilot.OchAutoPilotStatusListenerManager
import com.mogo.och.bridge.autopilot.line.ILineCallback
import com.mogo.och.common.module.manager.audiofocus.AudioFocusManager
import com.mogo.och.common.module.manager.audition.MusicData
import com.mogo.och.common.module.manager.audition.PlayState
import com.mogo.och.common.module.utils.CallerBase
import com.mogo.och.common.module.utils.RxUtils
import com.mogo.och.data.taxi.BaseOrderBean
@@ -122,7 +119,7 @@ object MusicModel : CallerBase<MusicModel.MusicDataListener>(), OrderListener, I
* 1、更新选中状态
* 2、如果正在播放 需要开始播放选中音乐
*/
fun checkMusic(musicData: MusicData){
fun checkMusic(musicData: MusicData, forkPlaying: Boolean=false){
AuditionManager.musicList.forEach {
// 上一个选中歌曲
if (it.select==true) {
@@ -139,7 +136,7 @@ object MusicModel : CallerBase<MusicModel.MusicDataListener>(), OrderListener, I
}
}
notifySelectChange(musicData)
if(AuditionManager.isPlaying()){
if(AuditionManager.isPlaying()||forkPlaying){
AuditionManager.play(musicData)
}
}
@@ -158,11 +155,11 @@ object MusicModel : CallerBase<MusicModel.MusicDataListener>(), OrderListener, I
}
}
fun clickNextMusic(){
fun clickNextMusic(forkPlaying:Boolean=false){
val checkMusic = getCheckMusic()
checkMusic?.let {
val preMusicData = AuditionManager.getNextMusicData(it)
checkMusic(preMusicData)
checkMusic(preMusicData,forkPlaying)
}
}

1
OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/music/list/MusicListView.kt
View File

@@ -8,7 +8,6 @@ import androidx.constraintlayout.widget.ConstraintLayout
import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.findViewTreeViewModelStoreOwner
import androidx.recyclerview.widget.LinearLayoutManager
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
import com.mogo.och.common.module.manager.audition.MusicData
import com.mogo.och.unmanned.passenger.ui.music.MusicModel
import com.mogo.och.unmanned.taxi.passenger.R

2
OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/music/list/MusicListViewModel.kt
View File

@@ -46,7 +46,7 @@ class MusicListViewModel : ViewModel(), MusicModel.MusicDataListener {
override fun onMusicCompletion(musicData: MusicData) {
BizLoopManager.runInMainThread{
viewCallback?.updateStete(musicData)
MusicModel.clickNextMusic(true)
}
}

BIN
OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_p_music_shade_bg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 77 KiB

BIN
OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_p_road_video_big_bg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 399 KiB

BIN
OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_p_vodeo_list_bottom_shade.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.8 KiB

BIN
OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_p_vodeo_list_top_shade.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.4 KiB

16
OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_home.xml
View File

@@ -145,19 +145,5 @@
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.appcompat.widget.AppCompatButton
android:elevation="6dp"
android:id="@+id/acbtn_show_hdmap"
android:text="展示高精"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<androidx.appcompat.widget.AppCompatButton
app:layout_constraintTop_toBottomOf="@+id/acbtn_show_hdmap"
android:id="@+id/acbtn_show_all"
android:elevation="6dp"
android:text="都展示"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</merge>

20
OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_music_playing.xml
View File

@@ -7,16 +7,28 @@
tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
<ImageView
android:id="@+id/iv_music_cover_bg"
android:id="@+id/iv_music_cover_bg_shade"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
android:src="@drawable/taxi_p_music_shade_bg"
android:layout_width="@dimen/dp_794"
android:layout_height="@dimen/dp_794"/>
<ImageView
android:id="@+id/iv_music_cover_bg"
app:layout_constraintTop_toTopOf="@+id/iv_music_cover_bg_shade"
app:layout_constraintBottom_toBottomOf="@+id/iv_music_cover_bg_shade"
app:layout_constraintStart_toStartOf="@+id/iv_music_cover_bg_shade"
app:layout_constraintEnd_toEndOf="@+id/iv_music_cover_bg_shade"
android:src="@drawable/taxi_p_music_bg"
android:layout_width="@dimen/dp_734"
android:layout_height="@dimen/dp_734"/>
<ImageView
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/iv_music_cover_bg"
app:layout_constraintBottom_toBottomOf="@+id/iv_music_cover_bg"
app:layout_constraintStart_toStartOf="@+id/iv_music_cover_bg"
app:layout_constraintEnd_toEndOf="@+id/iv_music_cover_bg"
android:src="@drawable/taxt_p_music_bg_middle"
android:layout_width="@dimen/dp_734"
android:layout_height="@dimen/dp_734"/>
@@ -45,6 +57,8 @@
android:id="@+id/iv_music_point"
android:src="@drawable/taxi_p_music_playing_pointer"
app:layout_constraintStart_toEndOf="@+id/iv_music_cover"
app:layout_constraintTop_toTopOf="parent"
android:layout_marginTop="@dimen/dp_30"
android:layout_width="@dimen/dp_501"
android:layout_height="@dimen/dp_779"/>

9
OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_p_ai.xml
View File

@@ -36,15 +36,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/aciv_top_bg"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:src="@drawable/taxi_p_ai_head"
android:layout_width="@dimen/dp_800"
android:layout_height="@dimen/dp_170"/>
<ImageView
android:id="@+id/ivListening"

16
OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_mogo_video_layout.xml
View File

@@ -50,4 +50,20 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.appcompat.widget.AppCompatImageView
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:layout_marginTop="@dimen/dp_121"
android:src="@drawable/taxi_p_vodeo_list_top_shade"
android:layout_width="@dimen/dp_520"
android:layout_height="@dimen/dp_103"/>
<androidx.appcompat.widget.AppCompatImageView
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_marginBottom="@dimen/dp_160"
android:src="@drawable/taxi_p_vodeo_list_bottom_shade"
android:layout_width="@dimen/dp_520"
android:layout_height="@dimen/dp_103"/>
</androidx.constraintlayout.widget.ConstraintLayout>