[8.0.0]

[fix]
[音乐播放、亮度设置]

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

@@ -119,7 +119,7 @@ object MusicModel : CallerBase<MusicModel.MusicDataListener>(), OrderListener, I
      * 1、更新选中状态
      * 2、如果正在播放 需要开始播放选中音乐
      */
-    fun checkMusic(musicData: MusicData, forkPlaying: Boolean=false){
+    fun checkMusic(musicData: MusicData){
         AuditionManager.musicList.forEach {
             // 上一个选中歌曲
             if (it.select==true) {
@@ -136,9 +136,7 @@ object MusicModel : CallerBase<MusicModel.MusicDataListener>(), OrderListener, I
             }
         }
         notifySelectChange(musicData)
-        if(AuditionManager.isPlaying()||forkPlaying){
-            AuditionManager.play(musicData)
-        }
+        AuditionManager.play(musicData)
     }
 
     private fun notifySelectChange(musicData: MusicData) {
@@ -155,11 +153,11 @@ object MusicModel : CallerBase<MusicModel.MusicDataListener>(), OrderListener, I
         }
     }
 
-    fun clickNextMusic(forkPlaying:Boolean=false){
+    fun clickNextMusic(){
         val checkMusic = getCheckMusic()
         checkMusic?.let {
-            val preMusicData = AuditionManager.getNextMusicData(it)
-            checkMusic(preMusicData,forkPlaying)
+            val nextMusicData = AuditionManager.getNextMusicData(it)
+            checkMusic(nextMusicData)
         }
     }
 

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

@@ -49,11 +49,7 @@ class MusicListView : ConstraintLayout, MusicListViewModel.IMusicListViewCaLillb
     override fun onVisibilityAggregated(isVisible: Boolean) {
         super.onVisibilityAggregated(isVisible)
         if(isVisible){
-            if (MusicModel.getCheckMusic()==null) {
-                if(dataList.isNotEmpty()) {
-                    MusicModel.checkMusic(dataList.first())
-                }
-            }
+
         }
     }
 

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{
-            MusicModel.clickNextMusic(true)
+            MusicModel.clickNextMusic()
         }
     }
 

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

@@ -1,13 +1,10 @@
 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 com.mogo.eagle.core.function.call.setting.CallerRequestActivityHandleManager
+import com.mogo.eagle.core.utilcode.util.ActivityUtils
 import com.mogo.eagle.core.utilcode.util.BrightnessUtils
 import com.mogo.och.common.module.utils.NumberFormatUtil
-import kotlinx.android.synthetic.main.taxi_p_setting_light_view.view.tv_current_value
 
 
 class LightSetting  @JvmOverloads constructor(
@@ -19,23 +16,23 @@ class LightSetting  @JvmOverloads constructor(
     private val TAG = "LightSetting"
 
     override fun upDateLight(percentaget: Float) {
-        if (!Settings.System.canWrite(context)) {
-            CallerRequestActivityHandleManager.requestPermission(
-                TAG,
-                Settings.ACTION_MANAGE_WRITE_SETTINGS
-            )
-            return
-        }
+//        if (!Settings.System.canWrite(context)) {
+//            CallerRequestActivityHandleManager.requestPermission(
+//                TAG,
+//                Settings.ACTION_MANAGE_WRITE_SETTINGS
+//            )
+//            return
+//        }
 
-        if (BrightnessUtils.isAutoBrightnessEnabled()) {
-            BrightnessUtils.setBrightness((percentaget*255).toInt())
-        } else {
-            BrightnessUtils.setAutoBrightnessEnabled(true)
-        }
+//        if (BrightnessUtils.isAutoBrightnessEnabled()) {
+            BrightnessUtils.setWindowBrightness(ActivityUtils.getTopActivity().window,(percentaget*255).toInt())
+//        } else {
+//            BrightnessUtils.setAutoBrightnessEnabled(true)
+//        }
     }
 
     override fun initLightAndVoice(){
-        val percentaget = BrightnessUtils.getBrightness().toFloat() / 255
+        val percentaget = BrightnessUtils.getWindowBrightness(ActivityUtils.getTopActivity().window).toFloat() / 255
         setHeightBar(1-percentaget)
         setTextValue(NumberFormatUtil.percentage(percentaget,0))
     }

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

@@ -98,10 +98,11 @@ open class VerticalSeekBar  @JvmOverloads constructor(
                 CallerLogger.d(TAG,"新的dy:${draggableButton.translationY}")
 
                 setTextValue(NumberFormatUtil.percentage(getPercentaget(),0))
+                upDateLight(getPercentaget())
             }
 
             MotionEvent.ACTION_UP -> {
-                upDateLight(getPercentaget())
+
             }
             else -> {}
         }

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

@@ -1,25 +1,9 @@
 package com.mogo.och.unmanned.passenger.ui.setting
 
-import android.animation.ObjectAnimator
 import android.content.Context
-import android.content.Intent
 import android.media.AudioManager
-import android.provider.Settings
-import android.text.TextUtils
 import android.util.AttributeSet
-import androidx.core.view.isVisible
-import com.mogo.commons.module.intent.IMogoIntentListener
-import com.mogo.commons.module.intent.IntentManager
-import com.mogo.commons.module.receiver.MogoReceiver
-import com.mogo.commons.module.receiver.MogoReceiver.ACTION_VOLUME_CHANGE
-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.eagle.core.utilcode.util.ThreadUtils
 import com.mogo.och.common.module.utils.NumberFormatUtil
-import kotlinx.android.synthetic.main.taxi_p_setting_light_view.view.tv_current_value
-import kotlinx.android.synthetic.main.taxi_p_setting_view.view.sb_voice_bar
-import kotlinx.android.synthetic.main.taxi_p_setting_view.view.tvVoicePer
 
 
 class VoiceSetting  @JvmOverloads constructor(

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

@@ -1,183 +0,0 @@
-package com.mogo.och.unmanned.passenger.ui.systemsetting
-
-import android.annotation.SuppressLint
-import android.content.Context
-import android.content.Intent
-import android.graphics.drawable.ClipDrawable
-import android.graphics.drawable.Drawable
-import android.graphics.drawable.LayerDrawable
-import android.media.AudioManager
-import android.provider.Settings
-import android.text.TextUtils
-import android.util.AttributeSet
-import android.view.Gravity
-import android.view.LayoutInflater
-import android.view.View
-import android.widget.SeekBar
-import androidx.constraintlayout.widget.ConstraintLayout
-import androidx.core.content.ContextCompat
-import com.mogo.commons.module.intent.IMogoIntentListener
-import com.mogo.commons.module.intent.IntentManager
-import com.mogo.commons.module.receiver.MogoReceiver
-import com.mogo.commons.module.receiver.MogoReceiver.ACTION_VOLUME_CHANGE
-import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
-import com.mogo.eagle.core.function.call.setting.CallerRequestActivityHandleManager
-import com.mogo.eagle.core.utilcode.util.BrightnessUtils
-import com.mogo.eagle.core.utilcode.util.ThreadUtils
-import com.mogo.och.common.module.wigets.MineGradientDrawable
-import com.mogo.och.unmanned.taxi.passenger.R
-import kotlinx.android.synthetic.main.taxt_u_p_setting_view.view.sb_light_bar
-import kotlinx.android.synthetic.main.taxt_u_p_setting_view.view.sb_voice_bar
-import kotlinx.android.synthetic.main.taxt_u_p_setting_view.view.tvSoundPer
-import kotlinx.android.synthetic.main.taxt_u_p_setting_view.view.tvVoicePer
-import me.jessyan.autosize.utils.AutoSizeUtils
-
-class TaxiPSettingView @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = 0
-) : ConstraintLayout(context, attrs, defStyleAttr), IMoGoAutopilotStatusListener,
-    IMogoIntentListener {
-
-    companion object {
-        const val TAG = "TaxiPSettingView"
-    }
-
-    init {
-        LayoutInflater.from(context).inflate(R.layout.taxt_u_p_setting_view, this, true)
-        initView()
-    }
-
-    private var mAudioManager: AudioManager? = null
-    private var mMaxVolume: Int? = 15
-
-    @SuppressLint("NewApi")
-    private fun initView() {
-        sb_light_bar.setProgressDrawableTiled(getDrawable())
-        sb_light_bar.max = 100
-        sb_light_bar.min = 5
-        sb_light_bar.setOnSeekBarChangeListener(object : SeekBar.OnSeekBarChangeListener {
-            override fun onProgressChanged(seekBar: SeekBar?, progress: Int, fromUser: Boolean) {
-                tvSoundPer.text = "$progress%"
-                if (fromUser) {
-                    if (!Settings.System.canWrite(context)) {
-                        CallerRequestActivityHandleManager.requestPermission(
-                            TAG,
-                            Settings.ACTION_MANAGE_WRITE_SETTINGS
-                        )
-                        return
-                    }
-                    if (BrightnessUtils.isAutoBrightnessEnabled()) {
-                        BrightnessUtils.setBrightness(((progress.toFloat() / 100) * 255).toInt())
-                    } else {
-                        BrightnessUtils.setAutoBrightnessEnabled(true)
-                    }
-                }
-            }
-
-            override fun onStartTrackingTouch(seekBar: SeekBar?) {}
-            override fun onStopTrackingTouch(seekBar: SeekBar?) {}
-        })
-        sb_light_bar.progress = (BrightnessUtils.getBrightness() * 100) / 255
-
-        sb_voice_bar.setProgressDrawableTiled(getDrawable())
-        sb_voice_bar.max = 100
-        sb_voice_bar.min = 5
-        sb_voice_bar.setOnSeekBarChangeListener(object : SeekBar.OnSeekBarChangeListener {
-            override fun onProgressChanged(seekBar: SeekBar?, progress: Int, fromUser: Boolean) {
-                tvVoicePer.text = "$progress%"
-                if (fromUser) {
-                    mMaxVolume?.let {
-                        var currentValue = ((progress.toFloat() / 100) * it).toInt()
-                        if (currentValue <= 0) {
-                            currentValue = 1
-                        }
-                        mAudioManager?.setStreamVolume(
-                            AudioManager.STREAM_MUSIC,
-                            currentValue,
-                            AudioManager.FLAG_REMOVE_SOUND_AND_VIBRATE
-                        )
-                    }
-                }
-            }
-
-            override fun onStartTrackingTouch(seekBar: SeekBar?) {}
-            override fun onStopTrackingTouch(seekBar: SeekBar?) {}
-        })
-
-        context?.let {
-            mAudioManager = it.getSystemService(Context.AUDIO_SERVICE) as AudioManager
-            mMaxVolume = mAudioManager?.getStreamMaxVolume(AudioManager.STREAM_MUSIC)
-            updateVolume()
-        }
-    }
-
-    private fun updateVolume() {
-        val mCurrentVolume = mAudioManager?.getStreamVolume(AudioManager.STREAM_MUSIC)
-        mMaxVolume?.let { max ->
-            mCurrentVolume?.let { current ->
-                if (current == 1) {
-                    sb_voice_bar.progress = 5
-                    tvVoicePer.text = "5%"
-                } else {
-                    val fl = current.toFloat() / max * 100
-                    sb_voice_bar.progress = fl.toInt()
-                    tvVoicePer.text = "${fl.toInt()}%"
-                }
-            }
-        }
-    }
-
-    private fun getDrawable(): Drawable {
-        val dp2px = AutoSizeUtils.dp2px(context, 26f)//进度条高度
-        val color2CBFFC = ContextCompat.getColor(context, R.color.taxi_p_2CBFFC)
-        val color1060FF = ContextCompat.getColor(context, R.color.taxi_p_1060ff)
-        val color96A5C2 = ContextCompat.getColor(context, R.color.taxi_p_96a5c2)
-        val temp03 = MineGradientDrawable(color2CBFFC, color1060FF, dp2px)
-        val clipDrawable3 = ClipDrawable(temp03, Gravity.START, ClipDrawable.HORIZONTAL)
-        val temp01 = MineGradientDrawable(color96A5C2, color96A5C2, dp2px)
-        val arr = arrayOf(temp01, clipDrawable3)
-        val ld = LayerDrawable(arr)
-        ld.setDrawableByLayerId(android.R.id.background, temp01)
-        ld.setDrawableByLayerId(android.R.id.progress, clipDrawable3)
-        return ld
-    }
-
-    override fun onAttachedToWindow() {
-        super.onAttachedToWindow()
-        IntentManager.getInstance().registerIntentListener(ACTION_VOLUME_CHANGE, this)
-    }
-
-    override fun onDetachedFromWindow() {
-        super.onDetachedFromWindow()
-        IntentManager.getInstance().unregisterIntentListener(ACTION_VOLUME_CHANGE, this)
-    }
-
-    override fun onWindowVisibilityChanged(visibility: Int) {
-        super.onWindowVisibilityChanged(visibility)
-        if (visibility == View.VISIBLE) {
-            sb_light_bar.progress = (BrightnessUtils.getBrightness() * 100) / 255
-        }
-    }
-
-    override fun onWindowFocusChanged(hasWindowFocus: Boolean) {
-        super.onWindowFocusChanged(hasWindowFocus)
-        if (hasWindowFocus) {
-            sb_light_bar.progress = (BrightnessUtils.getBrightness() * 100) / 255
-        }
-    }
-
-    override fun onIntentReceived(intentStr: String?, intent: Intent?) {
-        if (TextUtils.equals(ACTION_VOLUME_CHANGE, intentStr)) {
-            if (intent!!.getIntExtra(
-                    MogoReceiver.EXTRA_VOLUME_STREAM_TYPE, -1
-                ) == AudioManager.STREAM_MUSIC
-            ) {
-                ThreadUtils.runOnUiThread {
-                    updateVolume()
-                }
-            }
-        }
-    }
-
-}

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

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item
-        android:drawable="@drawable/taxi_p_function_voice_humb" android:gravity="center"
-        android:top="@dimen/dp_4"
-        android:width="@dimen/dp_46"
-        android:height="@dimen/dp_46"/>
-</layer-list >

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

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item
-        android:drawable="@drawable/taxt_u_p_function_voice_humb" android:gravity="center"
-        android:top="@dimen/dp_4"
-        android:width="@dimen/dp_46"
-        android:height="@dimen/dp_46"/>
-</layer-list >

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

@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:clickable="true"
-    android:background="@drawable/taxi_p_setting_view_bg">
-
-    <TextView
-        android:id="@+id/tvSettingLight"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/dp_95"
-        android:layout_marginTop="@dimen/dp_98"
-        android:text="@string/taxi_cp_setting_light"
-        android:textColor="@color/taxi_cp_374968"
-        android:textSize="@dimen/dp_36"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <ImageView
-        android:layout_width="@dimen/dp_40"
-        android:layout_height="@dimen/dp_40"
-        android:layout_marginStart="@dimen/dp_89"
-        android:layout_marginTop="@dimen/dp_29"
-        android:src="@drawable/taxi_p_iv_light_set"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/tvSettingLight" />
-
-    <SeekBar
-        android:id="@+id/sb_light_bar"
-        android:layout_width="@dimen/dp_380"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/dp_141"
-        android:layout_marginTop="@dimen/dp_24"
-        android:splitTrack="false"
-        android:orientation="vertical"
-        android:thumb="@drawable/taxi_p_function_voice_right_process_humb"
-        android:thumbOffset="@dimen/dp_2"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/tvSettingLight"
-        app:layout_constraintVertical_bias="0.404"
-        app:layout_constraintWidth_percent="0.253" />
-
-    <ImageView
-        android:layout_width="@dimen/dp_40"
-        android:layout_height="@dimen/dp_40"
-        android:layout_marginStart="@dimen/dp_531"
-        android:layout_marginTop="@dimen/dp_28"
-        android:src="@drawable/taxi_p_iv_light_increase_set"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/tvSettingLight" />
-
-    <TextView
-        android:id="@+id/tvSoundPer"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_154"
-        android:layout_marginRight="@dimen/dp_113"
-        android:gravity="right"
-        android:textColor="@color/taxi_cp_303C52"
-        android:textSize="@dimen/dp_56"
-        android:textStyle="bold"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-        android:id="@+id/tvSettingSound"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/dp_95"
-        android:layout_marginTop="@dimen/dp_129"
-        android:text="@string/taxi_cp_setting_sound"
-        android:textColor="@color/taxi_cp_374968"
-        android:textSize="@dimen/dp_36"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/tvSettingLight" />
-
-    <ImageView
-        android:layout_width="@dimen/dp_40"
-        android:layout_height="@dimen/dp_40"
-        android:layout_marginStart="@dimen/dp_89"
-        android:layout_marginTop="@dimen/dp_29"
-        android:src="@drawable/taxi_p_iv_voice_set"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/tvSettingSound" />
-
-    <SeekBar
-        android:id="@+id/sb_voice_bar"
-        android:layout_width="@dimen/dp_380"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/dp_141"
-        android:layout_marginTop="@dimen/dp_24"
-        android:splitTrack="false"
-        android:thumb="@drawable/taxi_p_function_voice_right_process_humb"
-        android:thumbOffset="@dimen/dp_2"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/tvSettingSound"
-        app:layout_constraintVertical_bias="0.404"
-        app:layout_constraintWidth_percent="0.253" />
-
-    <ImageView
-        android:layout_width="@dimen/dp_40"
-        android:layout_height="@dimen/dp_40"
-        android:layout_marginStart="@dimen/dp_531"
-        android:layout_marginTop="@dimen/dp_28"
-        android:src="@drawable/taxi_p_iv_voice_increase_set"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/tvSettingSound" />
-
-    <TextView
-        android:id="@+id/tvVoicePer"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_330"
-        android:layout_marginRight="@dimen/dp_113"
-        android:gravity="right"
-        android:textSize="@dimen/dp_56"
-        android:textStyle="bold"
-        android:textColor="@color/taxi_cp_303C52"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:clickable="true"
-    android:background="@drawable/taxt_u_p_setting_view_bg">
-
-    <TextView
-        android:id="@+id/tvSettingLight"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/dp_95"
-        android:layout_marginTop="@dimen/dp_98"
-        android:text="@string/taxi_p_setting_light"
-        android:textColor="@color/taxi_p_374968"
-        android:textSize="@dimen/dp_36"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <ImageView
-        android:layout_width="@dimen/dp_40"
-        android:layout_height="@dimen/dp_40"
-        android:layout_marginStart="@dimen/dp_89"
-        android:layout_marginTop="@dimen/dp_29"
-        android:src="@drawable/taxt_u_p_iv_light_set"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/tvSettingLight" />
-
-    <SeekBar
-        android:id="@+id/sb_light_bar"
-        android:layout_width="@dimen/dp_380"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/dp_141"
-        android:layout_marginTop="@dimen/dp_24"
-        android:splitTrack="false"
-        android:thumb="@drawable/taxt_u_p_function_voice_right_process_humb"
-        android:thumbOffset="@dimen/dp_2"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/tvSettingLight"
-        app:layout_constraintVertical_bias="0.404"
-        app:layout_constraintWidth_percent="0.253" />
-
-    <ImageView
-        android:layout_width="@dimen/dp_40"
-        android:layout_height="@dimen/dp_40"
-        android:layout_marginStart="@dimen/dp_531"
-        android:layout_marginTop="@dimen/dp_28"
-        android:src="@drawable/taxt_u_p_iv_light_increase_set"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/tvSettingLight" />
-
-    <TextView
-        android:id="@+id/tvSoundPer"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_154"
-        android:layout_marginRight="@dimen/dp_113"
-        android:gravity="right"
-        android:textColor="@color/taxi_p_303C52"
-        android:textSize="@dimen/dp_56"
-        android:textStyle="bold"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-        android:id="@+id/tvSettingSound"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/dp_95"
-        android:layout_marginTop="@dimen/dp_129"
-        android:text="@string/taxi_p_setting_sound"
-        android:textColor="@color/taxi_p_374968"
-        android:textSize="@dimen/dp_36"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/tvSettingLight" />
-
-    <ImageView
-        android:layout_width="@dimen/dp_40"
-        android:layout_height="@dimen/dp_40"
-        android:layout_marginStart="@dimen/dp_89"
-        android:layout_marginTop="@dimen/dp_29"
-        android:src="@drawable/taxt_u_p_iv_voice_set"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/tvSettingSound" />
-
-    <SeekBar
-        android:id="@+id/sb_voice_bar"
-        android:layout_width="@dimen/dp_380"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/dp_141"
-        android:layout_marginTop="@dimen/dp_24"
-        android:splitTrack="false"
-        android:thumb="@drawable/taxt_u_p_function_voice_right_process_humb"
-        android:thumbOffset="@dimen/dp_2"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/tvSettingSound"
-        app:layout_constraintVertical_bias="0.404"
-        app:layout_constraintWidth_percent="0.253" />
-
-    <ImageView
-        android:layout_width="@dimen/dp_40"
-        android:layout_height="@dimen/dp_40"
-        android:layout_marginStart="@dimen/dp_531"
-        android:layout_marginTop="@dimen/dp_28"
-        android:src="@drawable/taxt_u_p_iv_voice_increase_set"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/tvSettingSound" />
-
-    <TextView
-        android:id="@+id/tvVoicePer"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_330"
-        android:layout_marginRight="@dimen/dp_113"
-        android:gravity="right"
-        android:textSize="@dimen/dp_56"
-        android:textStyle="bold"
-        android:textColor="@color/taxi_p_303C52"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -18,10 +18,11 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
         android:gravity="center"
+        android:textColor="#2C2E30"
+        android:textSize="@dimen/dp_30"
+        android:textStyle="bold"
         android:includeFontPadding="false"
-        android:layout_marginStart="@dimen/dp_40"
-        android:textColor="@color/taxi_cp_394047"
-        android:textSize="@dimen/dp_40" />
+        android:layout_marginStart="@dimen/dp_40" />
 
 
     <androidx.appcompat.widget.AppCompatImageView

OCH/taxi/unmanned-passenger/src/main/res/values/strings.xml

@@ -42,12 +42,6 @@
     <string name="taxi_p_surplustime">分钟</string>
 
 
-    <string name="taxi_p_setting_light">亮度</string>
-    <string name="taxi_p_setting_sound">音量</string>
-
-    <string name="taxi_cp_setting_light">亮度</string>
-    <string name="taxi_cp_setting_sound">音量</string>
-
     <string name="actv_video_title">蘑菇资讯</string>