From de81e91acb19b9bd00a135e9b9d80c2cc5552132 Mon Sep 17 00:00:00 2001 From: xinfengkun Date: Tue, 28 Oct 2025 19:10:58 +0800 Subject: [PATCH] =?UTF-8?q?[8.2.6][=E4=B9=98=E5=AE=A2=E5=B1=8F]=20?= =?UTF-8?q?=E7=8F=A0=E6=B5=B7LOGO=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=AD=A4?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=B9LOGO=E6=8D=A2=E8=82=A4=E6=97=B6?= =?UTF-8?q?=E4=B8=8D=E7=94=9F=E6=95=88=20=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../passenger/ui/statusbar/M2StatusBarView.kt | 29 ++++++++++--------- .../layout/shuttle_p_m2_view_status_bar.xml | 2 -- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/statusbar/M2StatusBarView.kt b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/statusbar/M2StatusBarView.kt index 730b8dfdad..7f3901dc65 100644 --- a/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/statusbar/M2StatusBarView.kt +++ b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/statusbar/M2StatusBarView.kt @@ -93,27 +93,28 @@ class M2StatusBarView @JvmOverloads constructor( updateZhuhaiLogoState() } + @Synchronized private fun updateZhuhaiLogoState(){ val zhuhaiLogoParams = iv_zhuhai_logo.layoutParams val zhuhaiLogoOtherParams = iv_zhuhai_logo_other.layoutParams - var logonId = R.dimen.dp_201 - var logonOtherId = R.dimen.dp_274 - var logonImgId = R.drawable.shuttle_p_m2_status_bar_logo_zhuhai_mogox - var logonOtherImgId = R.drawable.shuttle_p_m2_status_bar_logo_zhuhai_noma_autonoma if (isHaveTask) { - logonId = R.dimen.dp_62 - logonOtherId = R.dimen.dp_98 - logonImgId = R.drawable.shuttle_p_m2_status_bar_logo_zhuhai - logonOtherImgId = R.drawable.shuttle_p_m2_status_bar_logo_zhuhai_noma + zhuhaiLogoParams.width = resources.getDimensionPixelSize(R.dimen.dp_62) + iv_zhuhai_logo.layoutParams = zhuhaiLogoParams + iv_zhuhai_logo.setImageResource(R.drawable.shuttle_p_m2_status_bar_logo_zhuhai) + + zhuhaiLogoOtherParams.width = resources.getDimensionPixelSize(R.dimen.dp_98) + iv_zhuhai_logo_other.layoutParams = zhuhaiLogoOtherParams + iv_zhuhai_logo_other.setImageResource(R.drawable.shuttle_p_m2_status_bar_logo_zhuhai_noma) } else { tv_status_line_name.text = "" + zhuhaiLogoParams.width = resources.getDimensionPixelSize( R.dimen.dp_201) + iv_zhuhai_logo.layoutParams = zhuhaiLogoParams + iv_zhuhai_logo.setImageResource(R.drawable.shuttle_p_m2_status_bar_logo_zhuhai_mogox) + + zhuhaiLogoOtherParams.width = resources.getDimensionPixelSize(R.dimen.dp_274) + iv_zhuhai_logo_other.layoutParams = zhuhaiLogoOtherParams + iv_zhuhai_logo_other.setImageResource(R.drawable.shuttle_p_m2_status_bar_logo_zhuhai_noma_autonoma) } - zhuhaiLogoParams.width = resources.getDimensionPixelSize(logonId) - iv_zhuhai_logo.layoutParams = zhuhaiLogoParams - zhuhaiLogoOtherParams.width = resources.getDimensionPixelSize(logonOtherId) - iv_zhuhai_logo_other.layoutParams = zhuhaiLogoOtherParams - iv_zhuhai_logo.setImageResource(logonImgId) - iv_zhuhai_logo_other.setImageResource(logonOtherImgId) } override fun onAutopilotCarConfig(carConfigResp: MessagePad.CarConfigResp) { diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/shuttle_p_m2_view_status_bar.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/shuttle_p_m2_view_status_bar.xml index 53635c8749..8ab2dc9cfc 100644 --- a/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/shuttle_p_m2_view_status_bar.xml +++ b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/shuttle_p_m2_view_status_bar.xml @@ -35,7 +35,6 @@ android:id="@+id/iv_zhuhai_logo" android:layout_width="@dimen/dp_201" android:layout_height="@dimen/dp_58" - android:src="@drawable/shuttle_p_m2_status_bar_logo_zhuhai_mogox" app:isUseSkin="true" />