[8.0.0]

[fea]
[bottom bar + light setting]

OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/TaxiPassengerBaseFragment.kt

@@ -27,7 +27,6 @@ import com.mogo.och.unmanned.taxi.passenger.R
 import com.mogo.och.unmanned.passenger.presenter.BaseTaxiPassengerPresenter
 import com.mogo.och.unmanned.passenger.ui.arrived.ArrivedView
 import com.mogo.och.unmanned.passenger.ui.bar.LeftBarView
-import com.mogo.och.unmanned.passenger.ui.bar.RightBarView
 import com.mogo.och.unmanned.passenger.ui.bottom.BottomBar
 import com.mogo.och.unmanned.passenger.ui.checkstartautopilot.ChekAndStartAutopilotView
 import com.mogo.och.unmanned.passenger.ui.debug.DebugCallback
@@ -36,8 +35,6 @@ import io.reactivex.disposables.Disposable
 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.clSettingView
-import kotlinx.android.synthetic.main.taxt_u_p_base_fragment.evaluate
 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.lbv_go2_center
@@ -45,7 +42,6 @@ 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.speedView
@@ -58,7 +54,7 @@ import kotlinx.android.synthetic.main.taxt_u_p_base_fragment.speedView
  *
  * @author tongchenfei
  */
-class TaxiPassengerBaseFragment() :
+class TaxiPassengerBaseFragment :
     MvpFragment<TaxiPassengerBaseFragment?, BaseTaxiPassengerPresenter?>(), IMogoMapListener,
     TaxiPassengerTaxiView, DebugCallback {
 
@@ -84,7 +80,7 @@ class TaxiPassengerBaseFragment() :
         overMapView.onCreateView(savedInstanceState)
         //overMapView.hideResetView()
 
-        val commonService = ARouter.getInstance().build(OchCommonConst.TAXI_UNMANNED_PASSENGER).navigation();
+        val commonService = ARouter.getInstance().build(OchCommonConst.TAXI_UNMANNED_PASSENGER).navigation()
         if(commonService is CommonService){
             context?.let {
                 val statusView = commonService.getStatusBarView(it)
@@ -97,13 +93,6 @@ 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
-            }
-
-        })
         lbv_go2_center.setOrderIdCallback(object : LeftBarView.LeftBarCallback{
             override fun setGo2CenterClick() {
                 when (bottom.getCurrentPage()) {
@@ -143,12 +132,12 @@ class TaxiPassengerBaseFragment() :
                             romaPView.updateVisible(false)
                             romaDistanceView.visibility = View.GONE
                         }
-                        rbv_setting_music.setShowOnlySetting(0)
                         lbv_go2_center.visibility = View.VISIBLE
                         lbv_go2_center.showAngle()
                         pcnActionView.visibility = View.VISIBLE
                         CallerHmiManager.showTrafficLightView()
                         infoVideoView.visibility = View.GONE
+                        mv_music_info.visibility = View.GONE
                         CallerHmiManager.showTurnLightView()
                     }
                     BottomBar.SelectView.OVERMAPVIEW -> {
@@ -159,12 +148,12 @@ class TaxiPassengerBaseFragment() :
                         speedView.visibility = View.VISIBLE
                         romaPView.updateVisible(false)
                         romaDistanceView.visibility = View.GONE
-                        rbv_setting_music.setShowOnlySetting(0)
                         lbv_go2_center.visibility = View.GONE
                         //lbv_go2_center.showOnlyCenter()
                         pcnActionView.visibility = View.VISIBLE
                         CallerHmiManager.showTrafficLightView()
                         infoVideoView.visibility = View.GONE
+                        mv_music_info.visibility = View.GONE
                         CallerHmiManager.showTurnLightView()
                     }
                     BottomBar.SelectView.VIDEO -> {
@@ -173,13 +162,28 @@ class TaxiPassengerBaseFragment() :
                         mapBizView.visibility = View.GONE
                         presenter?.setItineraryVisibility()
                         speedView.visibility = View.GONE
-                        rbv_setting_music.setShowOnlySetting(1)
                         lbv_go2_center.visibility = View.GONE
                         romaPView.updateVisible(false)
                         romaDistanceView.visibility = View.GONE
                         pcnActionView.visibility = View.GONE
                         CallerHmiManager.hideTrafficLightView()
                         infoVideoView.visibility = View.VISIBLE
+                        mv_music_info.visibility = View.GONE
+                        CallerHmiManager.hideTurnLightView()
+                    }
+                    BottomBar.SelectView.MUSIC -> {
+                        CallerHmiViewControlListenerManager.invokeMainPageViewVisible(View.GONE)
+                        overMapView.visibility = View.GONE
+                        mapBizView.visibility = View.GONE
+                        presenter?.setItineraryVisibility()
+                        speedView.visibility = View.GONE
+                        lbv_go2_center.visibility = View.GONE
+                        romaPView.updateVisible(false)
+                        romaDistanceView.visibility = View.GONE
+                        pcnActionView.visibility = View.GONE
+                        CallerHmiManager.hideTrafficLightView()
+                        infoVideoView.visibility = View.GONE
+                        mv_music_info.visibility = View.VISIBLE
                         CallerHmiManager.hideTurnLightView()
                     }
 
@@ -265,7 +269,7 @@ class TaxiPassengerBaseFragment() :
                     }
                 }
             }
-            BottomBar.SelectView.VIDEO, BottomBar.SelectView.NONE -> {
+            BottomBar.SelectView.VIDEO,BottomBar.SelectView.MUSIC, BottomBar.SelectView.NONE -> {
                 if(itinerary.visibility!=View.GONE) {
                     itinerary.visibility = View.GONE
                 }
@@ -319,7 +323,7 @@ class TaxiPassengerBaseFragment() :
         showOrHide(true,"Debug 按钮")
     }
     override fun setEvaluateView(){
-        evaluate.visibility = View.VISIBLE
+
     }
 
     /**
@@ -333,7 +337,6 @@ class TaxiPassengerBaseFragment() :
      */
     override fun showOrHideArrivedEndLayout(isShow: Boolean) {
         //chekAndStartAutopilotView.visibility = View.GONE
-        evaluate.visibility = View.GONE
         if (isShow) {
             exitFullVideoScreen(true)
             arrivedView.aniArrived(true)

OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/bottom/BottomBar.kt

@@ -5,6 +5,7 @@ import android.util.AttributeSet
 import android.view.LayoutInflater
 import androidx.constraintlayout.widget.ConstraintLayout
 import com.mogo.och.unmanned.taxi.passenger.R
+import kotlinx.android.synthetic.main.taxt_p_bottom_bar.view.actv_music
 import kotlinx.android.synthetic.main.taxt_p_bottom_bar.view.actv_overmap
 import kotlinx.android.synthetic.main.taxt_p_bottom_bar.view.actv_precisionmap
 import kotlinx.android.synthetic.main.taxt_p_bottom_bar.view.actv_video
@@ -31,6 +32,10 @@ class BottomBar @JvmOverloads constructor(
         actv_video.setOnClickListener {
             setCheckIndex(SelectView.VIDEO)
         }
+        actv_music.setOnClickListener {
+            setCheckIndex(SelectView.MUSIC)
+        }
+
     }
 
     fun getCurrentPage(): SelectView {
@@ -57,6 +62,9 @@ class BottomBar @JvmOverloads constructor(
             SelectView.VIDEO -> {
                 actv_video.setBagVisable(visibility)
             }
+            SelectView.MUSIC -> {
+                actv_music.setBagVisable(visibility)
+            }
 
             else -> {}
         }
@@ -74,20 +82,28 @@ class BottomBar @JvmOverloads constructor(
         }else{
             actv_overmap.setCheckItem(false)
         }
+
         if(checkIndex == SelectView.VIDEO){
             actv_video.setCheckItem(true)
         }else{
             actv_video.setCheckItem(false)
         }
+
         if(checkIndex == SelectView.PRECISIONMAP){
             actv_precisionmap.setCheckItem(true)
         }else{
             actv_precisionmap.setCheckItem(false)
         }
+
+        if(checkIndex == SelectView.MUSIC){
+            actv_music.setCheckItem(true)
+        }else{
+            actv_music.setCheckItem(false)
+        }
     }
 
     enum class SelectView{
-        NONE,PRECISIONMAP,OVERMAPVIEW,VIDEO
+        NONE,PRECISIONMAP,OVERMAPVIEW,VIDEO,MUSIC
     }
 
     interface ApplyClickLintener{

OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/bottom/BottomCheckView.kt

@@ -81,7 +81,7 @@ open class BottomCheckView @JvmOverloads constructor(
             actv_title.setTextColor(bottomTitleCheckedColor)
             setBagVisable(GONE)
         } else {
-            backageView?.visibility = View.GONE
+            backageView?.visibility = View.INVISIBLE
             aciv_center_image.setImageResource(normalDrawable)
             actv_title.setTextColor(bottomTitleNormalColor)
         }

OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/setting/LightSetting.kt

@@ -0,0 +1,143 @@
+package com.mogo.och.unmanned.passenger.ui.setting
+
+import android.animation.ObjectAnimator
+import android.content.Context
+import android.provider.Settings
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.view.MotionEvent
+import android.widget.ImageView
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.constraintlayout.widget.ConstraintSet
+import androidx.core.view.marginBottom
+import androidx.core.view.marginTop
+import com.mogo.eagle.core.function.call.setting.CallerRequestActivityHandleManager
+import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
+import com.mogo.eagle.core.utilcode.util.BrightnessUtils
+import com.mogo.och.common.module.utils.RxUtils
+import com.mogo.och.common.module.wigets.map.switchvisual.VisualViewModel
+import com.mogo.och.unmanned.passenger.ui.setting.TaxiPSettingView.Companion
+import com.mogo.och.unmanned.taxi.passenger.R
+import kotlinx.android.synthetic.main.taxi_p_setting_light_view.view.tv_current_value
+import kotlin.properties.Delegates
+
+
+class LightSetting  @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0
+) : ConstraintLayout(context, attrs, defStyleAttr) {
+
+    private lateinit var draggableButton: ImageView
+    private var marginTop:Int = 0
+    private var marginBottom:Int = 0
+    private var maxHeight = 0
+
+    private val TAG = "LightSetting"
+
+
+    init {
+        LayoutInflater.from(context).inflate(R.layout.taxi_p_setting_light_view, this, true)
+        background = resources.getDrawable(R.drawable.taxi_p_voice_bg)
+        initView()
+    }
+
+    override fun onVisibilityAggregated(isVisible: Boolean) {
+        super.onVisibilityAggregated(isVisible)
+        if(isVisible){
+            maxHeight =  height-marginBottom-marginTop-draggableButton.height
+            CallerLogger.d(TAG,"最大值${maxHeight}---height:${height}---marginBottom:${marginBottom}---marginTop:${marginTop}-----draggableButton.height:${draggableButton.height}")
+            initLightAndVoice()
+            tv_current_value.text = "${(BrightnessUtils.getBrightness() * 100) / 255}"
+        }
+    }
+
+    private fun initView() {
+        draggableButton = findViewById(R.id.aciv_voice_thum)
+        marginTop = draggableButton.marginTop
+        marginBottom = draggableButton.marginBottom
+
+    }
+
+
+
+
+    private var initialX = 0f
+    private var initialY = 0f
+    private val tempSet = ConstraintSet()
+
+    /**
+     * 为该组件的触碰事件重写事件处理方法
+     */
+    override fun onTouchEvent(event: MotionEvent?): Boolean {
+        when (event?.action) {
+            MotionEvent.ACTION_DOWN -> {
+                initialX = event.rawX;
+                initialY = event.rawY;
+            }
+            MotionEvent.ACTION_MOVE -> {
+
+                if(draggableButton.translationY<0){
+                    draggableButton.translationY = 0f
+                    return true
+                }else if (draggableButton.translationY+marginTop>(height)){
+                    tempSet.clone(this)
+                    tempSet.setTranslationY(draggableButton.id,(height-marginTop).toFloat())
+                    tempSet.applyTo(this)
+                    return true
+                }
+
+                val dx = event.rawX - initialX;
+                val dy = event.rawY - initialY;
+                initialX = event.rawX;
+                initialY = event.rawY;
+                if(draggableButton.translationY+dy<0){
+                    return true
+                }
+                if(draggableButton.translationY+dy+marginBottom+marginTop+draggableButton.height>height){
+                    return true
+                }
+                CallerLogger.d(TAG,"旧的dy:${draggableButton.translationY}")
+
+                tempSet.clone(this)
+                tempSet.setTranslationY(draggableButton.id,draggableButton.translationY+dy)
+                tempSet.applyTo(this)
+                CallerLogger.d(TAG,"新的dy:${draggableButton.translationY}")
+
+
+                upDateLight()
+
+            }
+            MotionEvent.ACTION_UP -> {
+
+            }
+            else -> {}
+        }
+        return true
+    }
+
+    private fun upDateLight() {
+        if (!Settings.System.canWrite(context)) {
+            CallerRequestActivityHandleManager.requestPermission(
+                TaxiPSettingView.TAG,
+                Settings.ACTION_MANAGE_WRITE_SETTINGS
+            )
+            return
+        }
+        if (BrightnessUtils.isAutoBrightnessEnabled()) {
+            BrightnessUtils.setBrightness((draggableButton.translationY/maxHeight*255).toInt())
+        } else {
+            BrightnessUtils.setAutoBrightnessEnabled(true)
+        }
+    }
+
+    /**
+     *
+     */
+    private fun initLightAndVoice(){
+        val currentLight = (BrightnessUtils.getBrightness().toFloat() / 255 * maxHeight).toFloat()
+        CallerLogger.d(TAG,"当前的亮度:${currentLight}")
+        draggableButton.translationY = currentLight
+    }
+
+}

OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/setting/SettingGradientDrawable.kt

@@ -0,0 +1,94 @@
+package com.mogo.och.unmanned.passenger.ui.setting
+
+import android.graphics.*
+import android.graphics.drawable.Drawable
+import androidx.core.graphics.toRectF
+
+/**
+ * 进度条drawable
+ */
+class SettingGradientDrawable(colorStart: Int = Color.BLUE, colorEnd:Int = Color.RED, height:Int) : Drawable() {
+
+    private var mPaint: Paint = Paint(Paint.ANTI_ALIAS_FLAG)
+
+    private var colorStart:Int = Color.BLUE
+    private var colorEnd:Int = Color.RED
+
+    private var colorWith = 4f
+    private var transparentWidth = 4f
+
+    private var index = doubleArrayOf(0.53,0.76,0.92)
+    private var tartHeight = 0
+
+    private var heightDex = 0
+
+    private var currendDex = mutableListOf<Double>()
+
+    init {
+        this.colorStart = colorStart
+        this.colorEnd = colorEnd
+        this.tartHeight = height
+        mPaint.isAntiAlias = true
+        index.forEachIndexed { _, d ->
+            currendDex += (1-d)/2
+        }
+    }
+
+    override fun draw(canvas: Canvas) {
+        val rect = bounds
+        mPaint.shader = LinearGradient(0f, 0f, rect.right.toFloat(), rect.bottom.toFloat(), intArrayOf(colorStart,colorEnd), floatArrayOf(0f,1f), Shader.TileMode.CLAMP)
+        var size = (rect.width() / (colorWith + transparentWidth)).toInt()
+        if((colorWith+transparentWidth)*size+colorWith>rect.right){
+            size -= 1
+        }
+        if(rect.height()>tartHeight){
+            //实际高度大于目标高度 上增加高度差 下减去高度差
+            heightDex = (rect.height() - tartHeight) / 2
+        }
+
+        var countstep = 0
+        while (true){
+            val rectF = rect.toRectF()
+            val height: Float = if(rect.height()>tartHeight){
+                tartHeight.toFloat()
+            }else{
+                rectF.bottom - rectF.top
+            }
+            // 计算前几个和后几个特殊高度递增和递减
+            var dex = 0f
+            if(countstep<currendDex.size){
+                dex = (height * currendDex[countstep]).toFloat()
+            }
+            if(size>currendDex.size) {
+                if (size >= countstep && (size - countstep) < currendDex.size) {
+                    dex = (height * currendDex[size - countstep]).toFloat()
+                }
+            }
+            rectF.top = dex+heightDex
+            rectF.bottom = rectF.bottom-dex-heightDex
+            rectF.left = (colorWith+transparentWidth)*countstep
+            rectF.right = colorWith+(colorWith+transparentWidth)*countstep
+            if(rectF.right>= rect.right){
+                break
+            }
+            countstep++
+            canvas.drawRoundRect(rectF,48f,48f,mPaint)
+        }
+    }
+
+    override fun setAlpha(alpha: Int) {
+        mPaint.alpha = alpha
+        invalidateSelf()
+    }
+
+    override fun setColorFilter(colorFilter: ColorFilter?) {
+        mPaint.colorFilter = colorFilter
+        invalidateSelf()
+    }
+
+    override fun getOpacity(): Int {
+        return PixelFormat.TRANSLUCENT
+    }
+
+
+}

OCH/taxi/unmanned-passenger/src/main/res/drawable/taxt_u_p_setting_light_selector.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android" tools:ignore="MissingDefaultResource">
+    <item android:drawable="@drawable/taxi_p_setting_light_selected" android:state_focused="true" android:state_pressed="true" />
+    <item android:drawable="@drawable/taxi_p_setting_light_selected" android:state_focused="false" android:state_pressed="true" />
+    <item android:drawable="@drawable/taxi_p_setting_light_selected" android:state_checked="true" />
+    <item android:drawable="@drawable/taxi_p_setting_light_normal" android:state_checked="false" />
+    <item android:drawable="@drawable/taxi_p_setting_light_selected" android:state_selected="true" />
+    <item android:drawable="@drawable/taxi_p_setting_light_selected" android:state_focused="true" />
+    <item android:drawable="@drawable/taxi_p_setting_light_normal" />
+</selector>

OCH/taxi/unmanned-passenger/src/main/res/drawable/taxt_u_p_setting_voice_selector.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android" tools:ignore="MissingDefaultResource">
+    <item android:drawable="@drawable/taxi_p_setting_voice_selected" android:state_focused="true" android:state_pressed="true" />
+    <item android:drawable="@drawable/taxi_p_setting_voice_selected" android:state_focused="false" android:state_pressed="true" />
+    <item android:drawable="@drawable/taxi_p_setting_voice_selected" android:state_checked="true" />
+    <item android:drawable="@drawable/taxi_p_setting_voice_normal" android:state_checked="false" />
+    <item android:drawable="@drawable/taxi_p_setting_voice_selected" android:state_selected="true" />
+    <item android:drawable="@drawable/taxi_p_setting_voice_selected" android:state_focused="true" />
+    <item android:drawable="@drawable/taxi_p_setting_voice_normal" />
+</selector>

OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_setting_light_view.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="@dimen/dp_160"
+    android:layout_height="@dimen/dp_440"
+    tools:background="@drawable/taxi_p_voice_bg"
+    tools:ignore="MissingDefaultResource"
+    tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
+
+    <TextView
+        android:id="@+id/tv_current_value"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:text="26"
+        android:textSize="@dimen/dp_40"
+        android:layout_marginTop="@dimen/dp_23"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/aciv_voice_thum"
+        android:src="@drawable/taxi_p_light_voice_thum"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:layout_marginTop="@dimen/dp_80"
+        android:layout_marginBottom="@dimen/dp_44"
+        android:layout_width="@dimen/dp_150"
+        android:layout_height="@dimen/dp_85"/>
+
+</merge>

OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_p_bottom_bar.xml

@@ -1,131 +1,143 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/dp_160"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_height="@dimen/dp_150"
     tools:background="@drawable/taxt_p_bottom_bar_bg"
-    tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout"
-    tools:ignore="MissingDefaultResource">
-
-    <TextClock
-        android:id="@+id/cl_order_time"
-        android:format12Hour="M月d日 "
-        android:format24Hour="M月d日 "
-        android:gravity="center"
-        android:fontFamily="@font/taxt_u_p_din"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        android:textColor="@color/taxi_cp_111D2F"
-        android:textSize="@dimen/dp_52"
-        android:layout_marginStart="@dimen/dp_92"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"/>
-
-    <TextClock
-        android:id="@+id/cl_order_time_hhmm"
-        android:format12Hour="HH:mm"
-        android:format24Hour="HH:mm"
-        android:gravity="center"
-        android:fontFamily="@font/taxt_u_p_din"
-        app:layout_constraintStart_toEndOf="@+id/cl_order_time"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        android:textColor="@color/taxi_cp_111D2F"
-        android:letterSpacing="0.1"
-        android:textSize="@dimen/dp_52"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"/>
+    tools:ignore="MissingDefaultResource"
+    tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/actv_precisionmap_press"
-        android:visibility="gone"
-        android:layout_marginTop="@dimen/dp_2"
+        android:layout_width="@dimen/dp_220"
+        android:layout_height="@dimen/dp_150"
         android:src="@drawable/taxt_p_bottom_bar_select_bg"
-        app:layout_constraintStart_toStartOf="@+id/actv_precisionmap"
-        app:layout_constraintEnd_toEndOf="@+id/actv_precisionmap"
-        android:layout_width="@dimen/dp_420"
-        android:layout_height="@dimen/dp_160"/>
+        android:visibility="invisible"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        tools:visibility="visible" />
 
     <com.mogo.och.unmanned.passenger.ui.bottom.BottomCheckView
         android:id="@+id/actv_precisionmap"
-        app:backageViewId="@+id/actv_precisionmap_press"
-        app:layout_constraintHorizontal_chainStyle="packed"
-        app:selectedDrawable="@drawable/taxt_p_bottom_precisionmap_press"
-        app:normalDrawable="@drawable/taxt_p_bottom_precisionmap_normal"
-        android:layout_marginEnd="@dimen/dp_107"
-        app:bottomTitle="行车实况"
-        app:bottomTitleCheckedColor="@color/white"
-        app:bottomTitleNormalColor="@color/taxi_cp_41444D"
-        app:layout_constraintEnd_toStartOf="@+id/actv_overmap"
-        app:layout_constraintStart_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:bottomShowIcon = "false"
-        app:layout_constraintBottom_toBottomOf="parent"
         android:layout_width="wrap_content"
-        android:layout_height="match_parent"/>
-
-
+        android:layout_height="match_parent"
+        app:backageViewId="@+id/actv_precisionmap_press"
+        app:bottomShowIcon="false"
+        app:bottomTitle="首页"
+        app:bottomTitleCheckedColor="@color/taxi_cp_41444D"
+        app:bottomTitleNormalColor="@color/taxi_cp_41444D"
+        app:layout_constraintStart_toStartOf="@+id/actv_precisionmap_press"
+        app:layout_constraintEnd_toEndOf="@+id/actv_precisionmap_press"
+        app:normalDrawable="@drawable/taxt_p_bottom_precisionmap_normal"
+        app:selectedDrawable="@drawable/taxt_p_bottom_precisionmap_normal" />
 
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/actv_overmap_press"
-        android:visibility="gone"
-        android:layout_marginTop="@dimen/dp_2"
+        android:layout_width="@dimen/dp_220"
+        android:layout_height="@dimen/dp_150"
         android:src="@drawable/taxt_p_bottom_bar_select_bg"
-        app:layout_constraintStart_toStartOf="@+id/actv_overmap"
-        app:layout_constraintEnd_toEndOf="@+id/actv_overmap"
-        android:layout_width="@dimen/dp_420"
-        android:layout_height="@dimen/dp_160"/>
+        android:visibility="invisible"
+        app:layout_constraintStart_toEndOf="@+id/actv_precisionmap_press"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        tools:visibility="visible" />
 
     <com.mogo.och.unmanned.passenger.ui.bottom.BottomCheckView
         android:id="@+id/actv_overmap"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
         app:backageViewId="@+id/actv_overmap_press"
-        app:selectedDrawable="@drawable/taxt_p_bottom_overmap_press"
-        app:normalDrawable="@drawable/taxt_p_bottom_overmap_normal"
-        app:bottomTitle="全局概览"
-        app:bottomTitleCheckedColor="@color/white"
-        app:bottomShowIcon = "false"
-        android:layout_marginEnd="@dimen/dp_107"
-        android:layout_marginStart="@dimen/dp_107"
+        app:bottomShowIcon="false"
+        app:bottomTitle="线路"
+        app:bottomTitleCheckedColor="@color/taxi_cp_41444D"
         app:bottomTitleNormalColor="@color/taxi_cp_41444D"
-        app:layout_constraintStart_toEndOf="@+id/actv_precisionmap"
-        app:layout_constraintEnd_toStartOf="@+id/actv_video"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"/>
-
-
+        app:layout_constraintStart_toStartOf="@+id/actv_overmap_press"
+        app:layout_constraintEnd_toEndOf="@+id/actv_overmap_press"
+        app:normalDrawable="@drawable/taxt_p_bottom_overmap_normal"
+        app:selectedDrawable="@drawable/taxt_p_bottom_overmap_normal" />
 
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/actv_video_press"
-        android:visibility="gone"
-        android:layout_marginTop="@dimen/dp_2"
+        android:layout_width="@dimen/dp_220"
+        android:layout_height="@dimen/dp_150"
         android:src="@drawable/taxt_p_bottom_bar_select_bg"
-        app:layout_constraintStart_toStartOf="@+id/actv_video"
-        app:layout_constraintEnd_toEndOf="@+id/actv_video"
-        android:layout_width="@dimen/dp_420"
-        android:layout_height="@dimen/dp_160"/>
+        android:visibility="invisible"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/actv_overmap_press"
+        tools:visibility="visible" />
 
     <com.mogo.och.unmanned.passenger.ui.bottom.BottomCheckView
         android:id="@+id/actv_video"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
         app:backageViewId="@+id/actv_video_press"
-        app:selectedDrawable="@drawable/taxt_p_bottom_video_press"
-        app:normalDrawable="@drawable/taxt_p_bottom_video_normal"
-        app:bottomTitle="@string/actv_video_title"
-        android:layout_marginStart="@dimen/dp_107"
-        app:bottomTitleCheckedColor="@color/white"
+        app:bottomShowIcon="false"
+        app:bottomTitle="资讯"
+        app:bottomTitleCheckedColor="@color/taxi_cp_41444D"
         app:bottomTitleNormalColor="@color/taxi_cp_41444D"
-        app:layout_constraintStart_toEndOf="@+id/actv_overmap"
-        app:layout_constraintEnd_toStartOf="parent"
+        app:isUseSkin="true"
+        app:layout_constraintStart_toStartOf="@+id/actv_video_press"
+        app:layout_constraintEnd_toEndOf="@+id/actv_video_press"
+        app:normalDrawable="@drawable/taxt_p_bottom_video_normal"
+        app:selectedDrawable="@drawable/taxt_p_bottom_video_normal" />
+
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/actv_music_press"
+        android:layout_width="@dimen/dp_220"
+        android:layout_height="@dimen/dp_150"
+        android:src="@drawable/taxt_p_bottom_bar_select_bg"
+        android:visibility="invisible"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:bottomShowIcon = "false"
-        app:isUseSkin="true"
+        app:layout_constraintStart_toEndOf="@+id/actv_video_press"
+        tools:visibility="visible" />
+
+    <com.mogo.och.unmanned.passenger.ui.bottom.BottomCheckView
+        android:id="@+id/actv_music"
         android:layout_width="wrap_content"
-        android:layout_height="match_parent"/>
+        android:layout_height="match_parent"
+        app:backageViewId="@+id/actv_music_press"
+        app:bottomShowIcon="false"
+        app:bottomTitle="娱乐"
+        app:bottomTitleCheckedColor="@color/taxi_cp_41444D"
+        app:bottomTitleNormalColor="@color/taxi_cp_41444D"
+        app:isUseSkin="true"
+        app:layout_constraintStart_toStartOf="@+id/actv_music_press"
+        app:layout_constraintEnd_toEndOf="@+id/actv_music_press"
+        app:normalDrawable="@drawable/taxt_p_bottom_music_normal"
+        app:selectedDrawable="@drawable/taxt_p_bottom_music_normal" />
+
+
+    <CheckBox
+        android:id="@+id/cb_setting_light"
+        android:layout_width="@dimen/dp_70"
+        android:layout_height="@dimen/dp_71"
+        android:background="@drawable/taxt_u_p_setting_light_selector"
+        android:button="@null"
+        android:gravity="center"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_marginEnd="@dimen/dp_86" />
+
+    <CheckBox
+        android:id="@+id/tv_light_top_02"
+        android:layout_width="@dimen/dp_70"
+        android:layout_height="@dimen/dp_71"
+        android:background="@drawable/taxt_u_p_setting_voice_selector"
+        android:button="@null"
+        android:gravity="center"
+        app:layout_constraintEnd_toStartOf="@+id/cb_setting_light"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_marginEnd="@dimen/dp_86" />
 
 </merge>

OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_p_bottom_check.xml

@@ -12,6 +12,7 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
+        android:src="@drawable/taxt_p_bottom_precisionmap_normal"
         android:layout_marginTop="@dimen/dp_16"
         android:layout_width="@dimen/dp_81"
         android:layout_height="@dimen/dp_81"/>
@@ -31,6 +32,7 @@
         android:id="@+id/aciv_bag"
         android:src="@drawable/taxi_p_bottom_overmap"
         android:visibility="gone"
+        tools:visibility="visible"
         app:layout_constraintTop_toTopOf="@+id/aciv_center_image"
         app:layout_constraintStart_toEndOf="@+id/aciv_center_image"
         android:layout_width="@dimen/dp_58"

OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml

@@ -24,6 +24,15 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
+    <com.mogo.och.unmanned.passenger.ui.music.MusicView
+        android:id="@+id/mv_music_info"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:visibility="gone"
+        android:clickable="true"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+
     <!--pnc行为决策-->
     <com.mogo.eagle.core.function.hmi.ui.vehicle.PncActionsView
         android:id="@+id/pcnActionView"
@@ -71,6 +80,14 @@
         app:layout_constraintTop_toTopOf="parent"
         app:roma_change_dis_color="true" />
 
+    <com.mogo.och.unmanned.passenger.ui.setting.LightSetting
+        app:layout_constraintBottom_toTopOf="@+id/bottom"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:layout_marginEnd="@dimen/dp_50"
+        android:layout_marginBottom="@dimen/dp_50"
+        android:layout_width="@dimen/dp_160"
+        android:layout_height="@dimen/dp_440"/>
+
     <!--  红绿灯  -->
     <com.mogo.eagle.core.function.hmi.ui.widget.SingleTrafficLightView
         android:id="@+id/traffic_light_view"
@@ -79,7 +96,7 @@
         android:layout_marginTop="@dimen/dp_93"
         android:layout_marginEnd="@dimen/dp_40"
         android:visibility="gone"
-        app:layout_constraintEnd_toStartOf="@+id/rbv_setting_music"
+        app:layout_constraintEnd_toStartOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:traffic_light_user="traffic_light_taxi_p" />
@@ -110,7 +127,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="@dimen/dp_20"
-        app:layout_constraintBottom_toTopOf="@id/aciv_xiaozhi_normal"
+        app:layout_constraintBottom_toTopOf="parent"
         android:layout_marginBottom="-100dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:explorationUser="passenger"
@@ -132,7 +149,7 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="@dimen/dp_50"
         android:layout_marginBottom="-80dp"
-        app:layout_constraintBottom_toTopOf="@id/aciv_xiaozhi_normal"
+        app:layout_constraintBottom_toTopOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         android:visibility="gone"
         app:promptUser="passenger"
@@ -150,15 +167,6 @@
         app:user="taxi_p" />
 
 
-    <com.mogo.och.unmanned.passenger.ui.bar.RightBarView
-        android:id="@+id/rbv_setting_music"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        android:layout_marginTop="@dimen/dp_110"
-        android:layout_marginEnd="@dimen/dp_40"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
-
     <com.mogo.och.unmanned.passenger.ui.bar.LeftBarView
         android:id="@+id/lbv_go2_center"
         app:layout_constraintStart_toStartOf="parent"
@@ -169,28 +177,6 @@
         android:layout_height="wrap_content"/>
 
 
-    <com.mogo.och.unmanned.passenger.ui.music.MusicView
-        android:id="@+id/mv_music_info"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:layout_marginEnd="@dimen/dp_130"
-        android:layout_marginTop="@dimen/dp_52"
-        android:visibility="gone"
-        android:clickable="true"
-        android:layout_width="@dimen/dp_746"
-        android:layout_height="@dimen/dp_916"/>
-
-    <com.mogo.och.unmanned.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:layout_marginTop="@dimen/dp_60"
-        android:visibility="gone"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"/>
-
-
     <!--  路程信息  -->
     <com.mogo.och.unmanned.passenger.ui.orderinfo.ItineraryView
         android:id="@+id/itinerary"
@@ -227,32 +213,16 @@
         android:visibility="gone"
         android:layout_width="match_parent"
         android:layout_height="match_parent"/>
-    <com.mogo.och.unmanned.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_640"
-        android:layout_height="wrap_content"/>
 
 
 
-    <com.mogo.och.common.module.manager.xiaozhi.ZhiView
-        android:id="@+id/aciv_xiaozhi_normal"
-        android:layout_width="@dimen/dp_360"
-        android:layout_height="@dimen/dp_360"
-        android:layout_marginBottom="@dimen/dp_m_30"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
-
     <!--  事件弹框  -->
     <com.mogo.eagle.core.function.hmi.ui.v2n.RoadV2NEventWindowView
         android:id="@+id/roadV2NEventWindowView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginBottom="-100dp"
-        app:layout_constraintBottom_toTopOf="@+id/aciv_xiaozhi_normal"
+        app:layout_constraintBottom_toTopOf="@+id/bottom"
         app:layout_constraintRight_toRightOf="parent"
         android:visibility="gone"/>
 
@@ -262,7 +232,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="@dimen/dp_50"
-        app:layout_constraintBottom_toTopOf="@id/aciv_xiaozhi_normal"
+        app:layout_constraintBottom_toTopOf="@id/bottom"
         android:layout_marginBottom="-80dp"
         app:layout_constraintEnd_toEndOf="parent" />
 
@@ -271,7 +241,7 @@
         android:layout_height="@dimen/dp_156"
         android:layout_marginEnd="@dimen/dp_30"
         android:layout_marginBottom="-60dp"
-        app:layout_constraintBottom_toTopOf="@id/aciv_xiaozhi_normal"
+        app:layout_constraintBottom_toTopOf="@id/bottom"
         android:visibility="gone"
         app:layout_constraintEnd_toEndOf="parent" />