From 59c43d901b2ad38c0ecd18ef91d023c3ac0c2a19 Mon Sep 17 00:00:00 2001 From: renwj Date: Wed, 16 Mar 2022 17:09:12 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[BadCase]=E4=BF=AE=E6=AD=A3UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo_core_function_devatools/badcase/mvp/BadCaseView.kt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/mvp/BadCaseView.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/mvp/BadCaseView.kt index 435605a055..5b1520531d 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/mvp/BadCaseView.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/mvp/BadCaseView.kt @@ -20,6 +20,7 @@ import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.mogo.eagle.core.data.autopilot.AutoPilotRecordResult import com.mogo.eagle.core.utilcode.kotlin.* +import com.mogo.eagle.core.utilcode.rv.divider.CommonDividerItemDecoration import com.zhjt.mogo_core_function_devatools.R import com.zhjt.mogo_core_function_devatools.badcase.api.entity.BadCaseResponse.Reason import com.zhjt.mogo_core_function_devatools.badcase.repository.db.entity.AutoPilotRecord @@ -97,6 +98,11 @@ internal class BadCaseView: ConstraintLayout { cases = causes rv_take_over?.let { it.layoutManager = LinearLayoutManager(it.context, LinearLayoutManager.VERTICAL, false) + it.addItemDecoration( + CommonDividerItemDecoration + .Builder() + .verticalInnerSpace(50.toPixels().toInt()) + .build()) it.adapter = object : RecyclerView.Adapter() { override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BadCaseViewHolder = BadCaseViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.layout_badcase_item, parent, false)) override fun onBindViewHolder(holder: BadCaseViewHolder, position: Int) { From ffe754afe36b60b5e80d7ea85e0dfae8924886dd Mon Sep 17 00:00:00 2001 From: pangfan Date: Wed, 16 Mar 2022 17:22:06 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[Taxi=20Passenger=20v1.1.0]=E4=B9=98?= =?UTF-8?q?=E5=AE=A2=E7=AB=AFV2X=E9=A2=84=E8=AD=A6=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E5=91=88=E7=8E=B0=E3=80=81=E9=9A=90=E8=97=8F=E7=9B=91=E6=8E=A7?= =?UTF-8?q?icon?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/TaxiPassengerBaseFragment.java | 3 + .../ui/TaxiPassengerV2XNotificationView.java | 90 +++++++++++++++++++ .../bg_taxi_p_v2x_notification_view.xml | 7 ++ .../layout/taxi_p_v2x_notification_view.xml | 32 +++++++ .../src/main/res/values-sw320dp/dimens.xml | 8 ++ .../res/values-xhdpi-2560x1440/dimens.xml | 8 ++ .../src/main/res/values/colors.xml | 2 + .../src/main/res/values/dimens.xml | 8 ++ .../com/mogo/launcher/MogoApplication.java | 2 + 9 files changed, 160 insertions(+) create mode 100644 OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerV2XNotificationView.java create mode 100644 OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_v2x_notification_view.xml create mode 100644 OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_v2x_notification_view.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java index 6059ccdf03..78a415ef47 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java @@ -39,6 +39,7 @@ public class TaxiPassengerBaseFragment extends MvpFragment { + mV2XNotificationIcon.setImageResource(warningIcon); + }); + } + + @Override + public void setWarningIcon(@Nullable Drawable drawable) { + super.setWarningIcon(drawable); + UiThreadHandler.post(() -> { + mV2XNotificationIcon.setImageDrawable(drawable); + }); + } + + @Override + public void setWarningContent(@Nullable CharSequence warningContent) { + super.setWarningContent(warningContent); + UiThreadHandler.post(() -> { + mV2XNotificationText.setText(warningContent); + }); + } + + @Override + public void setWarningContent(int warningContentId) { + super.setWarningContent(warningContentId); + UiThreadHandler.post(() -> { + mV2XNotificationText.setText(warningContentId); + }); + } +} diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_v2x_notification_view.xml b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_v2x_notification_view.xml new file mode 100644 index 0000000000..c354474ee2 --- /dev/null +++ b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_v2x_notification_view.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_v2x_notification_view.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_v2x_notification_view.xml new file mode 100644 index 0000000000..573f199065 --- /dev/null +++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_v2x_notification_view.xml @@ -0,0 +1,32 @@ + + + + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/values-sw320dp/dimens.xml b/OCH/mogo-och-taxi-passenger/src/main/res/values-sw320dp/dimens.xml index c160630cf4..21b397b8fa 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/values-sw320dp/dimens.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/values-sw320dp/dimens.xml @@ -39,4 +39,12 @@ 154px 127px 60px + + 31px + 110px + 10px + 70px + 120px + 39px + 20px \ No newline at end of file diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/values-xhdpi-2560x1440/dimens.xml b/OCH/mogo-och-taxi-passenger/src/main/res/values-xhdpi-2560x1440/dimens.xml index 1dc9f73763..84694a1e19 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/values-xhdpi-2560x1440/dimens.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/values-xhdpi-2560x1440/dimens.xml @@ -102,4 +102,12 @@ 154px 127px 60px + + 31px + 110px + 10px + 70px + 120px + 39px + 20px \ No newline at end of file diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/values/colors.xml b/OCH/mogo-och-taxi-passenger/src/main/res/values/colors.xml index 3d8d1d88f4..351f21c4f7 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/values/colors.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/values/colors.xml @@ -23,4 +23,6 @@ #006D43 #FFE198 #FF9B00 + + #80000000 \ No newline at end of file diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/values/dimens.xml b/OCH/mogo-och-taxi-passenger/src/main/res/values/dimens.xml index 679981a15f..957abe6b50 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/values/dimens.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/values/dimens.xml @@ -100,4 +100,12 @@ 154px 127px 60px + + 31px + 110px + 10px + 70px + 120px + 39px + 20px \ No newline at end of file diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index 46711ea231..5f46c6850c 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -112,6 +112,8 @@ public class MogoApplication extends MainMoGoApplication { HmiBuildConfig.isShowLimitingVelocityView = false; //是否显示 红绿等 HmiBuildConfig.isShowTrafficLightView = false; + //是否显示 路侧监控 + HmiBuildConfig.isShowCameraView = false; } //och模块 MogoModulePaths.addModuleFunction(new MogoModule("/och/api", "IMoGoFunctionProvider"));