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 c6771adb7e..8570ef96ec 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 @@ -119,7 +119,7 @@ object MusicModel : CallerBase(), 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(), 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(), 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) } } 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 224825d886..9ed3821924 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 @@ -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()) - } - } + } } 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 60e046d900..4368af86d0 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{ - MusicModel.clickNextMusic(true) + MusicModel.clickNextMusic() } } diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/setting/LightSetting.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/setting/LightSetting.kt index 2500473d54..8e6359b534 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/setting/LightSetting.kt +++ b/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)) } diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/setting/VerticalSeekBar.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/setting/VerticalSeekBar.kt index be5decfff7..c7812e4501 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/setting/VerticalSeekBar.kt +++ b/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 -> {} } diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/setting/VoiceSetting.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/setting/VoiceSetting.kt index 1a10a49a60..744efee0d9 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/setting/VoiceSetting.kt +++ b/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( diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/systemsetting/TaxiPSettingView.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/systemsetting/TaxiPSettingView.kt deleted file mode 100644 index 9b4c47c9cb..0000000000 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/systemsetting/TaxiPSettingView.kt +++ /dev/null @@ -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() - } - } - } - } - -} \ No newline at end of file diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_p_function_voice_humb.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_p_function_voice_humb.png deleted file mode 100644 index 347bb58d46..0000000000 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_p_function_voice_humb.png and /dev/null differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_p_iv_light_increase_set.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_p_iv_light_increase_set.png deleted file mode 100644 index 5ec15568b0..0000000000 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_p_iv_light_increase_set.png and /dev/null differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_p_iv_light_set.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_p_iv_light_set.png deleted file mode 100644 index de1f7f064f..0000000000 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_p_iv_light_set.png and /dev/null differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_p_iv_voice_increase_set.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_p_iv_voice_increase_set.png deleted file mode 100644 index 7e62e77a05..0000000000 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_p_iv_voice_increase_set.png and /dev/null differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_p_iv_voice_set.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_p_iv_voice_set.png deleted file mode 100644 index c0f586f35e..0000000000 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_p_iv_voice_set.png and /dev/null differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_p_setting_view_bg.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_p_setting_view_bg.png deleted file mode 100644 index 2936e90060..0000000000 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_p_setting_view_bg.png and /dev/null differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_function_voice_humb.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_function_voice_humb.png deleted file mode 100644 index 347bb58d46..0000000000 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_function_voice_humb.png and /dev/null differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_iv_light_increase_set.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_iv_light_increase_set.png deleted file mode 100644 index 5ec15568b0..0000000000 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_iv_light_increase_set.png and /dev/null differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_iv_light_set.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_iv_light_set.png deleted file mode 100644 index de1f7f064f..0000000000 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_iv_light_set.png and /dev/null differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_iv_voice_increase_set.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_iv_voice_increase_set.png deleted file mode 100644 index 7e62e77a05..0000000000 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_iv_voice_increase_set.png and /dev/null differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_iv_voice_set.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_iv_voice_set.png deleted file mode 100644 index c0f586f35e..0000000000 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_iv_voice_set.png and /dev/null differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_setting_view_bg.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_setting_view_bg.png deleted file mode 100755 index 2936e90060..0000000000 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_setting_view_bg.png and /dev/null differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/taxi_p_function_voice_right_process_humb.xml b/OCH/taxi/unmanned-passenger/src/main/res/drawable/taxi_p_function_voice_right_process_humb.xml deleted file mode 100644 index 1c98f8cad6..0000000000 --- a/OCH/taxi/unmanned-passenger/src/main/res/drawable/taxi_p_function_voice_right_process_humb.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - \ No newline at end of file diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/taxt_u_p_function_voice_right_process_humb.xml b/OCH/taxi/unmanned-passenger/src/main/res/drawable/taxt_u_p_function_voice_right_process_humb.xml deleted file mode 100644 index a22cae0b5a..0000000000 --- a/OCH/taxi/unmanned-passenger/src/main/res/drawable/taxt_u_p_function_voice_right_process_humb.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - \ No newline at end of file diff --git a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_setting_view.xml b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_setting_view.xml deleted file mode 100644 index 5d5f65f440..0000000000 --- a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_setting_view.xml +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_setting_view.xml b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_setting_view.xml deleted file mode 100644 index 22728eb65d..0000000000 --- a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_setting_view.xml +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_statusview.xml b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_statusview.xml index a42f2af9e3..6435519341 100644 --- a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_statusview.xml +++ b/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" /> 分钟 - 亮度 - 音量 - - 亮度 - 音量 - 蘑菇资讯