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"));