[6.3.0]

[无人化taxi音乐]
2024-03-12 15:43:34 +08:00
parent fcba006453
commit 318ddaf9e0
4 changed files with 72 additions and 58 deletions
--- a/OCH/taxi/passenger/src/main/res/layout/taxi_p_base_fragment.xml
+++ b/OCH/taxi/passenger/src/main/res/layout/taxi_p_base_fragment.xml
@@ -185,6 +185,7 @@

    <com.mogo.och.taxi.passenger.ui.evaluate.EvaluateView
        android:id="@+id/evaluate"
+        android:visibility="gone"
        app:layout_constraintBottom_toTopOf="@+id/pmbb_info"
        app:layout_constraintEnd_toEndOf="@+id/aciv_xiaozhi_normal"
        android:layout_marginEnd="@dimen/dp_50"
--- a/OCH/taxi/unmanned-passenger/build.gradle
+++ b/OCH/taxi/unmanned-passenger/build.gradle
@@ -57,9 +57,10 @@ dependencies {
    implementation rootProject.ext.dependencies.amapnavi3dmap
    implementation rootProject.ext.dependencies.amapsearch

-    implementation project(":OCH:common:common")
+//    implementation project(":OCH:common:common")
    compileOnly project(":libraries:mogo-map")
    implementation project(':core:mogo-core-res')
+    implementation project(':OCH:taxi:pcommon')

 }

--- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt
+++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt
@@ -12,7 +12,6 @@ import com.mogo.commons.voice.AIAssist
 import com.mogo.eagle.core.data.constants.MogoServicePaths
 import com.mogo.eagle.core.function.api.hmi.view.IStatusViewLayout
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
-import com.mogo.eagle.core.utilcode.kotlin.onClick
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_TAXI_P
 import com.mogo.eagle.core.utilcode.util.DeviceUtils
@@ -25,22 +24,22 @@ import com.mogo.och.taxi.passenger.presenter.BaseTaxiPassengerPresenter
 import com.mogo.och.taxi.passenger.ui.arrived.ArrivedView
 import com.mogo.och.taxi.passenger.ui.bottom.BottomBar
 import com.mogo.och.taxi.passenger.ui.checkstartautopilot.ChekAndStartAutopilotView
+import com.mogo.och.taxi.passenger.ui.rightbar.RightBarView
 import com.mogo.och.taxi.passenger.ui.statusview.StatusBarView
 import io.reactivex.disposables.Disposable
-import kotlinx.android.synthetic.main.taxt_u_p_base_fragment.aciv_xiaozhi_normal
 import kotlinx.android.synthetic.main.taxt_u_p_base_fragment.arrivedView
 import kotlinx.android.synthetic.main.taxt_u_p_base_fragment.bottom
 import kotlinx.android.synthetic.main.taxt_u_p_base_fragment.chekAndStartAutopilotView
-import kotlinx.android.synthetic.main.taxt_u_p_base_fragment.ck_setting
 import kotlinx.android.synthetic.main.taxt_u_p_base_fragment.clSettingView
 import kotlinx.android.synthetic.main.taxt_u_p_base_fragment.infoVideoView
 import kotlinx.android.synthetic.main.taxt_u_p_base_fragment.itinerary
 import kotlinx.android.synthetic.main.taxt_u_p_base_fragment.mapBizView
+import kotlinx.android.synthetic.main.taxt_u_p_base_fragment.mv_music_info
 import kotlinx.android.synthetic.main.taxt_u_p_base_fragment.overMapView
 import kotlinx.android.synthetic.main.taxt_u_p_base_fragment.pcnActionView
+import kotlinx.android.synthetic.main.taxt_u_p_base_fragment.rbv_setting_music
 import kotlinx.android.synthetic.main.taxt_u_p_base_fragment.romaDistanceView
 import kotlinx.android.synthetic.main.taxt_u_p_base_fragment.romaPView
-import kotlinx.android.synthetic.main.taxt_u_p_base_fragment.rv_location_center
 import kotlinx.android.synthetic.main.taxt_u_p_base_fragment.speedView

 /**
@@ -88,11 +87,34 @@ class TaxiPassengerBaseFragment() :

    }

+    private fun settingAndMusicListener() {
+        rbv_setting_music.setOrderIdCallback(object : RightBarView.RightBarCallback{
+            override fun setSettingAndMusicShow(settingShow: Boolean, musicShow: Boolean) {
+                clSettingView.visibility = if(settingShow) View.VISIBLE else View.GONE
+                mv_music_info.visibility = if(musicShow) View.VISIBLE else View.GONE
+            }
+
+            override fun setGo2CenterClick() {
+                when (bottom.getCurrentPage()) {
+                    BottomBar.SelectView.PRECISIONMAP -> {
+                        //切换到地图中间
+                        mapBizView.getUI()?.let {
+                            it.changeMapVisualAngle(it.getVrAngleDefaultMode(), null)
+                        }
+                    }
+                    BottomBar.SelectView.OVERMAPVIEW -> {
+                        overMapView.displayCustomOverView()
+                    }
+
+                    else -> {}
+                }
+            }
+
+        })
+    }
+
    private fun initListener() {
-        ck_setting.isChecked = false
-        ck_setting.setOnCheckedChangeListener { _, isChecked ->
-            clSettingView.visibility = if(isChecked) View.VISIBLE else View.GONE
-        }
+        settingAndMusicListener()
        bottom.setOverMapApplyClick(object : BottomBar.ApplyClickLintener{
            override fun onApplyClick(selectItem: BottomBar.SelectView) {
                when (selectItem) {
@@ -101,7 +123,6 @@ class TaxiPassengerBaseFragment() :
                        mapBizView.visibility = View.VISIBLE
                        presenter?.setItineraryVisibility()
                        speedView.visibility = View.VISIBLE
-                        ck_setting.visibility = View.VISIBLE
                        if (DeviceUtils.isLenovoModel() || DeviceUtils.isEB5Model()) {
                            romaPView.updateVisible(true)
                            romaDistanceView.visibility = View.VISIBLE
@@ -109,7 +130,7 @@ class TaxiPassengerBaseFragment() :
                            romaPView.updateVisible(false)
                            romaDistanceView.visibility = View.GONE
                        }
-                        rv_location_center.visibility = View.VISIBLE
+                        rbv_setting_music.setShowOnlySetting(0)
                        pcnActionView.visibility = View.VISIBLE
                        CallerHmiManager.showTrafficLightView()
                        infoVideoView.visibility = View.GONE
@@ -120,10 +141,9 @@ class TaxiPassengerBaseFragment() :
                        mapBizView.visibility = View.GONE
                        presenter?.setItineraryVisibility()
                        speedView.visibility = View.VISIBLE
-                        ck_setting.visibility = View.VISIBLE
                        romaPView.updateVisible(false)
                        romaDistanceView.visibility = View.GONE
-                        rv_location_center.visibility = View.VISIBLE
+                        rbv_setting_music.setShowOnlySetting(0)
                        pcnActionView.visibility = View.VISIBLE
                        CallerHmiManager.showTrafficLightView()
                        infoVideoView.visibility = View.GONE
@@ -134,11 +154,9 @@ class TaxiPassengerBaseFragment() :
                        mapBizView.visibility = View.GONE
                        presenter?.setItineraryVisibility()
                        speedView.visibility = View.GONE
-                        ck_setting.visibility = View.GONE
-                        ck_setting.isChecked = false
                        romaPView.updateVisible(false)
                        romaDistanceView.visibility = View.GONE
-                        rv_location_center.visibility = View.GONE
+                        rbv_setting_music.setShowOnlySetting(1)
                        pcnActionView.visibility = View.GONE
                        CallerHmiManager.hideTrafficLightView()
                        infoVideoView.visibility = View.VISIBLE
@@ -151,21 +169,6 @@ class TaxiPassengerBaseFragment() :
            }
        })

-        rv_location_center.onClick {
-            when (bottom.getCurrentPage()) {
-                BottomBar.SelectView.PRECISIONMAP -> {
-                    mapBizView.getUI()?.let {
-                        it.changeMapVisualAngle(it.getVrAngleDefaultMode(), null)
-                    }
-                }
-                BottomBar.SelectView.OVERMAPVIEW -> {
-                    overMapView.displayCustomOverView()
-                }
-
-                else -> {}
-            }
-
-        }
        arrivedView.arrivedVisilityChangeListenr = object :ArrivedView.ArrivedVisilityChangeListenr{
            override fun isShow(show: Boolean) {
                CallerLogger.d(M_TAXI_P + TAG, "arrived ${show}")
@@ -347,7 +350,6 @@ class TaxiPassengerBaseFragment() :
        allAnimator.addAll(aniSpeedSettingRow(isShow,speedView))
        allAnimator.addAll(aniSpeedSettingRow(isShow,romaPView))
        allAnimator.addAll(aniSpeedSettingRow(isShow,romaDistanceView))
-        allAnimator.addAll(aniSpeedSettingRow(isShow,ck_setting))

        allAnimator.addAll(aniOrderInfo(isShow))
        animatorSet.playTogether(allAnimator)
--- a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml
+++ b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml
@@ -59,25 +59,6 @@
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent" />

-    <CheckBox
-        android:id="@+id/ck_setting"
-        android:layout_width="@dimen/dp_120"
-        android:layout_height="@dimen/dp_120"
-        android:layout_marginStart="@dimen/dp_40"
-        android:layout_marginTop="@dimen/dp_100"
-        android:background="@drawable/taxt_u_p_setting_selector"
-        android:button="@null"
-        app:layout_constraintStart_toEndOf="@+id/speedView"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <com.mogo.och.taxi.passenger.ui.systemsetting.TaxiPSettingView
-        android:id="@+id/clSettingView"
-        android:layout_width="@dimen/dp_858"
-        android:layout_height="@dimen/dp_537"
-        android:layout_marginTop="@dimen/dp_205"
-        android:visibility="gone"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />

    <!--  漫游按钮  -->
    <com.mogo.eagle.core.function.hmi.ui.widget.RomaPassengerView
@@ -87,7 +68,7 @@
        android:layout_marginStart="@dimen/dp_60"
        android:layout_marginTop="100dp"
        android:background="@drawable/taxt_u_p_roma_bg_selector"
-        app:layout_constraintStart_toEndOf="@+id/ck_setting"
+        app:layout_constraintStart_toEndOf="@+id/speedView"
        app:layout_constraintTop_toTopOf="parent"
        app:roma_close="@drawable/taxt_u_p_roma_bg_selector"
        app:roma_open="@drawable/taxt_u_p_roma_checked" />
@@ -103,15 +84,33 @@
        app:layout_constraintTop_toTopOf="parent"
        app:roma_change_dis_color="true" />

-    <TextView
-        android:id="@+id/rv_location_center"
-        android:layout_width="@dimen/dp_96"
-        android:layout_height="@dimen/dp_96"
+    <com.mogo.och.taxi.passenger.ui.rightbar.RightBarView
+        android:id="@+id/rbv_setting_music"
+        app:layout_constraintEnd_toEndOf="parent"
        android:layout_marginEnd="@dimen/dp_40"
-        android:background="@drawable/taxt_u_p_location_center"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"/>
+
+    <com.mogo.och.taxi.passenger.ui.music.MusicView
+        android:id="@+id/mv_music_info"
+        app:layout_constraintTop_toTopOf="parent"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        android:layout_marginEnd="@dimen/dp_130"
+        android:visibility="gone"
+        android:clickable="true"
+        android:layout_width="@dimen/dp_746"
+        android:layout_height="@dimen/dp_916"/>
+
+    <com.mogo.och.taxi.passenger.ui.setting.TaxiPSettingView
+        android:id="@+id/clSettingView"
+        android:layout_width="@dimen/dp_858"
+        android:layout_height="@dimen/dp_537"
+        android:layout_marginEnd="@dimen/dp_130"
+        android:visibility="gone"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"/>

    <!--  红绿灯  -->
    <com.mogo.eagle.core.function.hmi.ui.widget.SingleTrafficLightView
@@ -182,6 +181,7 @@

    <!--气泡态消息盒子-->
    <com.mogo.eagle.core.function.hmi.ui.msgbox.PassengerMsgBoxBubbleView
+        android:id="@+id/pmbb_info"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_marginEnd="@dimen/dp_50"
@@ -189,6 +189,16 @@
        android:layout_marginBottom="-80dp"
        app:layout_constraintEnd_toEndOf="parent" />

+    <com.mogo.och.taxi.passenger.ui.evaluate.EvaluateView
+        android:id="@+id/evaluate"
+        android:visibility="gone"
+        app:layout_constraintBottom_toTopOf="@+id/pmbb_info"
+        app:layout_constraintEnd_toEndOf="@+id/aciv_xiaozhi_normal"
+        android:layout_marginEnd="@dimen/dp_50"
+        android:layout_width="@dimen/dp_621"
+        android:layout_height="wrap_content"/>
+
+
    <com.mogo.och.taxi.passenger.ui.debug.DebugView
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"