From dc29c847eb7e32cdf6244a4b00b14e04703324a5 Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Thu, 18 May 2023 18:33:36 +0800 Subject: [PATCH] =?UTF-8?q?[3.2.0]=E8=B0=83=E6=95=B4=E6=BC=AB=E6=B8=B8UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/layout/bus_base_fragment.xml | 12 ++++--- .../main/res/layout/taxi_base_fragment.xml | 13 ++++--- .../core/function/hmi/ui/widget/RomaView.kt | 35 +++++++++++++++++-- .../src/main/res/layout/view_roma_bg.xml | 34 ++++++++---------- .../src/main/res/values/attr.xml | 6 ++++ 5 files changed, 71 insertions(+), 29 deletions(-) diff --git a/OCH/mogo-och-bus/src/main/res/layout/bus_base_fragment.xml b/OCH/mogo-och-bus/src/main/res/layout/bus_base_fragment.xml index 658b15ffa0..931badb5ae 100644 --- a/OCH/mogo-och-bus/src/main/res/layout/bus_base_fragment.xml +++ b/OCH/mogo-och-bus/src/main/res/layout/bus_base_fragment.xml @@ -300,10 +300,14 @@ + android:layout_width="@dimen/dp_172" + android:layout_height="@dimen/dp_172" + app:layout_constraintBottom_toBottomOf="@id/module_mogo_och_badcase_rl" + app:layout_constraintLeft_toRightOf="@id/module_mogo_och_badcase_rl" + app:layout_constraintTop_toTopOf="@id/module_mogo_och_badcase_rl" + app:roma_open_bg="@drawable/bus_operation_status_select_bg" + app:roma_close_bg="@drawable/bus_operation_status_bg" + /> + android:layout_width="@dimen/module_mogo_och_operation_status_bg_height" + android:layout_height="@dimen/module_mogo_och_operation_status_bg_height" + app:layout_constraintBottom_toBottomOf="@id/module_och_taxi_badcase_ll" + app:layout_constraintLeft_toRightOf="@id/module_och_taxi_badcase_ll" + app:layout_constraintTop_toTopOf="@id/module_och_taxi_badcase_ll" + app:roma_open_bg="@drawable/taxi_operation_status_select_bg" + app:roma_close_bg="@drawable/taxi_operation_status_bg" + android:layout_marginStart="40dp" + /> diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RomaView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RomaView.kt index e1ca186a4f..810deabf03 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RomaView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RomaView.kt @@ -3,6 +3,7 @@ package com.mogo.eagle.core.function.hmi.ui.widget import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater +import androidx.appcompat.content.res.AppCompatResources import androidx.constraintlayout.widget.ConstraintLayout import com.mogo.eagle.core.function.api.map.roma.IMoGoRomaListener import com.mogo.eagle.core.function.call.map.CallerMapIdentifyManager.romaTrigger @@ -26,8 +27,30 @@ class RomaView @JvmOverloads constructor( @Volatile private var click = true + private val normalRes: Int + private val openRes: Int + init { LayoutInflater.from(context).inflate(R.layout.view_roma_bg, this, true) + val a = context.obtainStyledAttributes( + attrs, + R.styleable.RomaView, + defStyleAttr, + 0 + ) + normalRes = a.getResourceId( + R.styleable.RomaView_roma_close_bg, + R.drawable.romabg_normal_select + ) + openRes = a.getResourceId( + R.styleable.RomaView_roma_open_bg, + R.drawable.romabg_press_select_bg + ) + a.recycle() + if(normalRes!=0){ + ll_roma_bg.background = AppCompatResources.getDrawable(context, normalRes) + } + setOnClickListener { if(!click){ return@setOnClickListener @@ -44,11 +67,19 @@ class RomaView @JvmOverloads constructor( click = true if (status) { romaMode = true - ll_roma_bg.setBackgroundResource(R.drawable.romabg_press_select_bg) + if(openRes!=0){ + ll_roma_bg.setBackgroundResource(openRes) + }else{ + ll_roma_bg.setBackgroundResource(R.drawable.romabg_press_select_bg) + } ivRomaView.setBackgroundResource(R.drawable.roma_press_select_bg) } else { romaMode = false - ll_roma_bg.setBackgroundResource(R.drawable.roma_bg_selector) + if(normalRes!=0){ + ll_roma_bg.setBackgroundResource(normalRes) + }else{ + ll_roma_bg.setBackgroundResource(R.drawable.roma_bg_selector) + } ivRomaView.setBackgroundResource(R.drawable.romafront_select_bg) } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_roma_bg.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_roma_bg.xml index 30bd940a0f..ec6a9f2a2d 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_roma_bg.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_roma_bg.xml @@ -1,28 +1,24 @@ + android:layout_height="match_parent" + android:background="@drawable/roma_bg_selector" + android:elevation="@dimen/dp_10" + android:gravity="center" + android:orientation="vertical"> - + app:layout_constraintRight_toRightOf="parent" + /> - - \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/values/attr.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/values/attr.xml index 9426bad2a8..71ab960a6e 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/values/attr.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/values/attr.xml @@ -88,4 +88,10 @@ + + + + + + \ No newline at end of file