From ffe754afe36b60b5e80d7ea85e0dfae8924886dd Mon Sep 17 00:00:00 2001
From: pangfan <pangfan@zhidao.com>
Date: Wed, 16 Mar 2022 17:22:06 +0800
Subject: [PATCH] =?UTF-8?q?[Taxi=20Passenger=20v1.1.0]=E4=B9=98=E5=AE=A2?=
 =?UTF-8?q?=E7=AB=AFV2X=E9=A2=84=E8=AD=A6=E6=97=B6=E9=97=B4=E5=91=88?=
 =?UTF-8?q?=E7=8E=B0=E3=80=81=E9=9A=90=E8=97=8F=E7=9B=91=E6=8E=A7icon?=
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<TaxiPassengerBaseFrag
     private ImageView mAutopilotImage;
     private ImageView mMapswitchBtn;
     private TaxiPassengerTrafficLightView mTrafficLightView;
+    private TaxiPassengerV2XNotificationView mV2XNotificationView;
 
     protected TaxiPassengerServingOrderFragment ochServingOrderFragment = null;
 
@@ -64,6 +65,8 @@ public class TaxiPassengerBaseFragment extends MvpFragment<TaxiPassengerBaseFrag
 
         mTrafficLightView = findViewById(R.id.traffic_light_view);
         CallerHmiManager.INSTANCE.setProxyTrafficLightView(mTrafficLightView);
+        mV2XNotificationView = new TaxiPassengerV2XNotificationView(getContext());
+        CallerHmiManager.INSTANCE.setProxyNotificationView(mV2XNotificationView);
 
         mMapswitchBtn = findViewById(R.id.module_och_taxi_swich_map_iv);
         mMapswitchBtn.setOnClickListener(new View.OnClickListener() {
diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerV2XNotificationView.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerV2XNotificationView.java
new file mode 100644
index 0000000000..bebbb2625c
--- /dev/null
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerV2XNotificationView.java
@@ -0,0 +1,90 @@
+package com.mogo.och.taxi.passenger.ui;
+
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+import android.util.AttributeSet;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.mogo.eagle.core.data.enums.SidePattern;
+import com.mogo.eagle.core.function.api.hmi.view.IViewNotification;
+import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
+import com.mogo.och.taxi.passenger.R;
+
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * V2X预警事件view：通过FloatWindow呈现，无需加入到自定义layout中
+ *
+ * Created on 2022/3/16
+ */
+public class TaxiPassengerV2XNotificationView extends IViewNotification {
+
+    private ImageView mV2XNotificationIcon;
+    private TextView mV2XNotificationText;
+
+    public TaxiPassengerV2XNotificationView(@Nullable Context context) {
+        this(context, null, 0);
+    }
+
+    public TaxiPassengerV2XNotificationView(@Nullable Context context, @Nullable AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public TaxiPassengerV2XNotificationView(@Nullable Context context, @Nullable AttributeSet attrs,
+                                            int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init(context);
+    }
+
+    private void init(Context context) {
+        LayoutInflater.from(context).inflate(R.layout.taxi_p_v2x_notification_view, this,
+                true);
+
+        mV2XNotificationIcon = findViewById(R.id.taxi_p_v2x_notification_icon_iv);
+        mV2XNotificationText = findViewById(R.id.taxi_p_v2x_notification_text_tv);
+
+        // 设置View的出场位置
+        setSidePattern(SidePattern.LEFT);
+        setLayoutGravity(Gravity.LEFT);
+        // 设置View的停留位置：相对屏幕左上角的位置
+        setOffsetX(getResources().
+                getDimensionPixelSize(R.dimen.taxi_p_v2x_notification_view_margin_left));
+        setOffsetY(getResources().
+                getDimensionPixelSize(R.dimen.taxi_p_v2x_notification_view_margin_top));
+    }
+
+    @Override
+    public void setWarningIcon(int warningIcon) {
+        super.setWarningIcon(warningIcon);
+        UiThreadHandler.post(() -> {
+            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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/taxi_p_v2x_notification_bg_color"/>
+    <corners android:radius="@dimen/taxi_p_v2x_notification_bg_corner"/>
+</shape>
\ 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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:padding="@dimen/taxi_p_v2x_notification_view_padding"
+    android:background="@drawable/bg_taxi_p_v2x_notification_view">
+
+    <ImageView
+        android:id="@+id/taxi_p_v2x_notification_icon_iv"
+        android:layout_width="@dimen/taxi_p_v2x_notification_icon_size"
+        android:layout_height="@dimen/taxi_p_v2x_notification_icon_size"
+        android:src="@drawable/icon_warning_v2x_abnormal_vehicle"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/taxi_p_v2x_notification_text_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/taxi_p_v2x_notification_text_margin_left"
+        android:text="预警信息"
+        android:textColor="#FFFFFF"
+        android:textSize="@dimen/taxi_p_v2x_notification_text_size"
+        app:layout_constraintBottom_toBottomOf="@+id/taxi_p_v2x_notification_icon_iv"
+        app:layout_constraintLeft_toRightOf="@+id/taxi_p_v2x_notification_icon_iv"
+        app:layout_constraintTop_toTopOf="@+id/taxi_p_v2x_notification_icon_iv"
+        tools:text="前车碰撞预警" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ 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 @@
     <dimen name="taxi_p_traffic_light_icon_size">154px</dimen>
     <dimen name="taxi_p_traffic_light_time_view_width">127px</dimen>
     <dimen name="taxi_p_traffic_light_time_size">60px</dimen>
+
+    <dimen name="taxi_p_v2x_notification_view_margin_left">31px</dimen>
+    <dimen name="taxi_p_v2x_notification_view_margin_top">110px</dimen> <!-- 距离Pad顶部 -->
+    <dimen name="taxi_p_v2x_notification_view_padding">10px</dimen>
+    <dimen name="taxi_p_v2x_notification_bg_corner">70px</dimen>
+    <dimen name="taxi_p_v2x_notification_icon_size">120px</dimen>
+    <dimen name="taxi_p_v2x_notification_text_size">39px</dimen>
+    <dimen name="taxi_p_v2x_notification_text_margin_left">20px</dimen>
 </resources>
\ 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 @@
     <dimen name="taxi_p_traffic_light_icon_size">154px</dimen>
     <dimen name="taxi_p_traffic_light_time_view_width">127px</dimen>
     <dimen name="taxi_p_traffic_light_time_size">60px</dimen>
+
+    <dimen name="taxi_p_v2x_notification_view_margin_left">31px</dimen>
+    <dimen name="taxi_p_v2x_notification_view_margin_top">110px</dimen> <!-- 距离Pad顶部 -->
+    <dimen name="taxi_p_v2x_notification_view_padding">10px</dimen>
+    <dimen name="taxi_p_v2x_notification_bg_corner">70px</dimen>
+    <dimen name="taxi_p_v2x_notification_icon_size">120px</dimen>
+    <dimen name="taxi_p_v2x_notification_text_size">39px</dimen>
+    <dimen name="taxi_p_v2x_notification_text_margin_left">20px</dimen>
 </resources>
\ 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 @@
     <color name="taxi_p_traffic_light_green_color_down">#006D43</color>
     <color name="taxi_p_traffic_light_yellow_color_up">#FFE198</color>
     <color name="taxi_p_traffic_light_yellow_color_down">#FF9B00</color>
+
+    <color name="taxi_p_v2x_notification_bg_color">#80000000</color>
 </resources>
\ 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 @@
     <dimen name="taxi_p_traffic_light_icon_size">154px</dimen>
     <dimen name="taxi_p_traffic_light_time_view_width">127px</dimen>
     <dimen name="taxi_p_traffic_light_time_size">60px</dimen>
+
+    <dimen name="taxi_p_v2x_notification_view_margin_left">31px</dimen>
+    <dimen name="taxi_p_v2x_notification_view_margin_top">110px</dimen> <!-- 距离Pad顶部 -->
+    <dimen name="taxi_p_v2x_notification_view_padding">10px</dimen>
+    <dimen name="taxi_p_v2x_notification_bg_corner">70px</dimen>
+    <dimen name="taxi_p_v2x_notification_icon_size">120px</dimen>
+    <dimen name="taxi_p_v2x_notification_text_size">39px</dimen>
+    <dimen name="taxi_p_v2x_notification_text_margin_left">20px</dimen>
 </resources>
\ 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"));