From 1065d717146fb3b762aa0558c3062dc4b3aca26f Mon Sep 17 00:00:00 2001 From: zhongchao Date: Fri, 19 Aug 2022 16:51:07 +0800 Subject: [PATCH] ui --- .../core/function/hmi/ui/pnc/PncActionsView.kt | 10 +++++++++- .../function/hmi/ui/widget/TrafficDataView.java | 4 +++- .../src/main/res/drawable/pnc_actions_bg.png | Bin 0 -> 27568 bytes .../src/main/res/layout/fragment_hmi.xml | 2 +- .../src/main/res/layout/view_pnc_actions.xml | 7 +++++-- .../main/res/values-xhdpi-2560x1440/dimens.xml | 5 ++++- 6 files changed, 22 insertions(+), 6 deletions(-) create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable/pnc_actions_bg.png diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/pnc/PncActionsView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/pnc/PncActionsView.kt index 102955c0fb..591c3e5788 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/pnc/PncActionsView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/pnc/PncActionsView.kt @@ -3,13 +3,17 @@ package com.mogo.eagle.core.function.hmi.ui.pnc 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.data.autopilot.pnc.PncActionsHelper import com.mogo.eagle.core.data.trafficlight.TrafficLightResult import com.mogo.eagle.core.data.trafficlight.currentRoadTrafficLight import com.mogo.eagle.core.data.trafficlight.isRed import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotPlanningActionsListener +import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener.Companion.STATUS_AUTOPILOT_RUNNING import com.mogo.eagle.core.function.api.trafficlight.IMoGoTrafficLightListener +import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager +import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotPlanningActionsListenerManager import com.mogo.eagle.core.function.call.trafficlight.CallerTrafficLightListenerManager import com.mogo.eagle.core.function.hmi.R @@ -68,7 +72,11 @@ class PncActionsView @JvmOverloads constructor( } } // update view - actions?.let { + if(actions.isNullOrEmpty() || getAutoPilotStatusInfo().state != STATUS_AUTOPILOT_RUNNING){ + tvHmiPncActions.background = null + tvHmiPncActions.text = "" + }else{ + tvHmiPncActions.background = AppCompatResources.getDrawable(context, R.drawable.pnc_actions_bg) tvHmiPncActions.text = actions } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/TrafficDataView.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/TrafficDataView.java index f3484daede..dd21592b78 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/TrafficDataView.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/TrafficDataView.java @@ -1,5 +1,7 @@ package com.mogo.eagle.core.function.hmi.ui.widget; +import static com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING; + import android.annotation.SuppressLint; import android.content.Context; import android.os.Handler; @@ -61,7 +63,7 @@ public class TrafficDataView extends ConstraintLayout { accTextView.setText("- " + accStr); } int state = CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo().getState(); - if (state < 2) { + if (state < STATUS_AUTOPILOT_RUNNING) { if (mBrake > 0) { brakeStatus.setImageResource(R.drawable.traffic_data_brake); } else if (mThrottle >= 0 && mBrake == 0) { diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/pnc_actions_bg.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/pnc_actions_bg.png new file mode 100644 index 0000000000000000000000000000000000000000..4d0fc0baa617811bc82ef03a1d4719a248a40d9e GIT binary patch literal 27568 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 diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_pnc_actions.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_pnc_actions.xml index 1c49ca55d1..57f15d1881 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_pnc_actions.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_pnc_actions.xml @@ -7,9 +7,12 @@ 42px 45px 46px + 48px 50px 52px 54px 56px 62px 70px - 80px + 72px + 75px 80px + 96px 100px 140px 150px