diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/music/list/MusicListViewModel.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/music/list/MusicListViewModel.kt index 574920a1af..ae13884abf 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/music/list/MusicListViewModel.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/music/list/MusicListViewModel.kt @@ -51,7 +51,6 @@ class MusicListViewModel : ViewModel(), } override fun onMusicCompletion(musicData: MusicData) { - super.onMusicCompletion(musicData) UiThreadHandler.post({ viewCallback?.updateMusicData(musicData, musicData) }, UiThreadHandler.MODE.QUEUE) 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 f25f9ac8dd..17e3061624 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 @@ -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 diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/homepage/HomeView.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/homepage/HomeView.kt index d77eae7f9d..28dca0c4c9 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/homepage/HomeView.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/homepage/HomeView.kt @@ -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(){ diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/music/MusicModel.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/music/MusicModel.kt index 43f970dad0..c6771adb7e 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/music/MusicModel.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/music/MusicModel.kt @@ -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(), 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(), OrderListener, I } } notifySelectChange(musicData) - if(AuditionManager.isPlaying()){ + if(AuditionManager.isPlaying()||forkPlaying){ AuditionManager.play(musicData) } } @@ -158,11 +155,11 @@ object MusicModel : CallerBase(), OrderListener, I } } - fun clickNextMusic(){ + fun clickNextMusic(forkPlaying:Boolean=false){ val checkMusic = getCheckMusic() checkMusic?.let { val preMusicData = AuditionManager.getNextMusicData(it) - checkMusic(preMusicData) + checkMusic(preMusicData,forkPlaying) } } diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/music/list/MusicListView.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/music/list/MusicListView.kt index 841ab6df03..224825d886 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/music/list/MusicListView.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/music/list/MusicListView.kt @@ -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 diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/music/list/MusicListViewModel.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/music/list/MusicListViewModel.kt index 914dd3aeb9..60e046d900 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/music/list/MusicListViewModel.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/music/list/MusicListViewModel.kt @@ -46,7 +46,7 @@ class MusicListViewModel : ViewModel(), MusicModel.MusicDataListener { override fun onMusicCompletion(musicData: MusicData) { BizLoopManager.runInMainThread{ - viewCallback?.updateStete(musicData) + MusicModel.clickNextMusic(true) } } diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_p_music_shade_bg.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_p_music_shade_bg.png new file mode 100644 index 0000000000..8674ed1c04 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_p_music_shade_bg.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_p_road_video_big_bg.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_p_road_video_big_bg.png new file mode 100644 index 0000000000..e6c92dc1ef Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_p_road_video_big_bg.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_p_vodeo_list_bottom_shade.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_p_vodeo_list_bottom_shade.png new file mode 100644 index 0000000000..53a1cc0ac3 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_p_vodeo_list_bottom_shade.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_p_vodeo_list_top_shade.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_p_vodeo_list_top_shade.png new file mode 100644 index 0000000000..60f6fbf490 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_p_vodeo_list_top_shade.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_home.xml b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_home.xml index 5fb0d77f8b..23b9071c82 100644 --- a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_home.xml +++ b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_home.xml @@ -145,19 +145,5 @@ - - - - + \ No newline at end of file diff --git a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_music_playing.xml b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_music_playing.xml index 53181676bf..2532d5db22 100644 --- a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_music_playing.xml +++ b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_music_playing.xml @@ -7,16 +7,28 @@ tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout"> + + @@ -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"/> diff --git a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_p_ai.xml b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_p_ai.xml index 083c02cd92..00cba95e8e 100644 --- a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_p_ai.xml +++ b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_p_ai.xml @@ -36,15 +36,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content"/> - - + + + + \ No newline at end of file