From 0acd05999b95470265e1cb0a3605d3fa4c2ca548 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Thu, 17 Apr 2025 19:43:50 +0800 Subject: [PATCH] [8.0.0] [fea] [light setting] --- .../passenger/ui/setting/LightSetting.kt | 37 +++++++++++++++---- 1 file changed, 30 insertions(+), 7 deletions(-) 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 89209ef848..5dc84eb39b 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 @@ -6,6 +6,7 @@ import android.provider.Settings import android.util.AttributeSet import android.view.LayoutInflater import android.view.MotionEvent +import android.view.View import android.widget.ImageView import androidx.constraintlayout.widget.ConstraintLayout import androidx.constraintlayout.widget.ConstraintSet @@ -19,6 +20,7 @@ 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 kotlinx.android.synthetic.main.taxi_p_setting_view.view.sb_light_bar import kotlin.properties.Delegates @@ -45,10 +47,7 @@ class LightSetting @JvmOverloads constructor( 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}" + } } @@ -56,7 +55,10 @@ class LightSetting @JvmOverloads constructor( draggableButton = findViewById(R.id.aciv_voice_thum) marginTop = draggableButton.marginTop marginBottom = draggableButton.marginBottom - + post { + maxHeight = height-marginBottom-marginTop-draggableButton.height + initLightAndVoice() + } } @@ -135,9 +137,30 @@ class LightSetting @JvmOverloads constructor( * */ private fun initLightAndVoice(){ - val currentLight = (BrightnessUtils.getBrightness().toFloat() / 255 * maxHeight).toFloat() + CallerLogger.d(TAG,"最大值${maxHeight}---height:${height}---marginBottom:${marginBottom}---marginTop:${marginTop}-----draggableButton.height:${draggableButton.height}") + val currentLight = BrightnessUtils.getBrightness().toFloat() / 255 * maxHeight CallerLogger.d(TAG,"当前的亮度:${currentLight}") - draggableButton.translationY = currentLight + ObjectAnimator.ofFloat( + draggableButton, "translationY", draggableButton.translationY, + currentLight + ).apply { + duration = 500 + }.start() + tv_current_value.text = "${(BrightnessUtils.getBrightness() * 100) / 255}" + } + + override fun onWindowVisibilityChanged(visibility: Int) { + super.onWindowVisibilityChanged(visibility) + if (visibility == View.VISIBLE) { + initLightAndVoice() + } + } + + override fun onWindowFocusChanged(hasWindowFocus: Boolean) { + super.onWindowFocusChanged(hasWindowFocus) + if (hasWindowFocus) { + initLightAndVoice() + } } } \ No newline at end of file