From 2d5d8d84001581c3e6e60b77de7f04c644b48158 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Tue, 12 Apr 2022 14:20:44 +0800
Subject: [PATCH] =?UTF-8?q?[driver=20passenger=20]=201=E3=80=81taxi=20pass?=
 =?UTF-8?q?enger=20=E5=88=B0=E8=BE=BE=E7=9B=AE=E7=9A=84=E5=85=A8=E5=B1=8F?=
 =?UTF-8?q?=E5=B9=95=E8=A6=86=E7=9B=96=E7=8A=B6=E6=80=81=E6=A0=8F=202?=
 =?UTF-8?q?=E3=80=81=E5=9B=9B=E7=AB=AF=E5=8E=BB=E6=8E=89openVrMode?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bus/passenger/MogoOCHBusPassenger.java    |  4 +-
 .../java/com/mogo/och/bus/BusProvider.java    |  4 +-
 .../taxi/passenger/MogoOCHTaxiPassenger.java  |  4 +-
 .../ui/TaxiPassengerBaseFragment.java         | 16 ++++--
 .../res/layout/taxi_p_arrived_end_panel.xml   | 56 +++++++++++++++++++
 .../main/res/layout/taxi_p_base_fragment.xml  | 51 -----------------
 .../java/com/mogo/och/taxi/TaxiProvider.java  |  4 +-
 7 files changed, 75 insertions(+), 64 deletions(-)
 create mode 100644 OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_end_panel.xml

diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java
index 03dd6b1566..9374a22038 100644
--- a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java
+++ b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java
@@ -44,7 +44,7 @@ public class MogoOCHBusPassenger implements IMogoOCH, IMogoStatusChangedListener
         this.mActivity = activity;
         this.mContainerId = containerId;
 
-        UiThreadHandler.postDelayed(() -> stepIntoVrMode(), 5_000L);
+//        UiThreadHandler.postDelayed(() -> stepIntoVrMode(), 5_000L);
         return null;
     }
 
@@ -84,7 +84,7 @@ public class MogoOCHBusPassenger implements IMogoOCH, IMogoStatusChangedListener
     private void stepIntoVrMode() {
         CallerLogger.INSTANCE.d( M_TAXI_P + TAG, "进入vr模式" );
         MogoMapUIController.getInstance()
-                .openVrMode( false );
+                .stepInVrMode( false );
     }
 
     private void showFragment() {
diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/BusProvider.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/BusProvider.java
index 43e18b13f0..02a9fc3d55 100644
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/BusProvider.java
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/BusProvider.java
@@ -40,7 +40,7 @@ public class BusProvider implements IMogoOCH {
     private void stepIntoVrMode(){
         CallerLogger.INSTANCE.d( M_BUS + TAG, "进入vr模式" );
         MogoMapUIController.getInstance()
-                .openVrMode(false);
+                .stepInVrMode(false);
     }
 
     @Override
@@ -102,7 +102,7 @@ public class BusProvider implements IMogoOCH {
         this.containerId = integer;
         this.activity = fragmentActivity;
 
-        UiThreadHandler.postDelayed(this::stepIntoVrMode, 5_000L );
+//        UiThreadHandler.postDelayed(this::stepIntoVrMode, 5_000L );
         return null;
     }
 
diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/MogoOCHTaxiPassenger.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/MogoOCHTaxiPassenger.java
index 8778a3763e..e633e71bb7 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/MogoOCHTaxiPassenger.java
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/MogoOCHTaxiPassenger.java
@@ -46,7 +46,7 @@ class MogoOCHTaxiPassenger implements IMogoOCH, IMogoStatusChangedListener {
     private void stepIntoVrMode() {
         CallerLogger.INSTANCE.d( M_TAXI_P + TAG, "进入vr模式" );
         MogoMapUIController.getInstance()
-                .openVrMode( false );
+                .stepInVrMode( false );
     }
 
     private void showFragment() {
@@ -94,7 +94,7 @@ class MogoOCHTaxiPassenger implements IMogoOCH, IMogoStatusChangedListener {
         this.mActivity = fragmentActivity;
         this.mContainerId = integer;
 
-        UiThreadHandler.postDelayed(() -> stepIntoVrMode(), 5_000L);
+//        UiThreadHandler.postDelayed(() -> stepIntoVrMode(), 5_000L);
         return null;
     }
 
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 34b3af7cf2..e68dd1af6c 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
@@ -2,6 +2,7 @@ package com.mogo.och.taxi.passenger.ui;
 
 import android.os.Handler;
 import android.os.Looper;
+import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
@@ -17,6 +18,7 @@ import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener;
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager;
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager;
 import com.mogo.eagle.core.function.call.map.CallerSmpManager;
+import com.mogo.eagle.core.utilcode.util.OverlayViewUtils;
 import com.mogo.map.MogoMapUIController;
 import com.mogo.map.MogoMarkerManager;
 import com.mogo.map.listener.IMogoMapListener;
@@ -45,7 +47,8 @@ public class TaxiPassengerBaseFragment extends MvpFragment<TaxiPassengerBaseFrag
     private TaxiPassengerTrafficLightView mTrafficLightView;
     private TaxiPassengerV2XNotificationView mV2XNotificationView;
 
-    private ConstraintLayout mArrivedEndCL;
+//    private ConstraintLayout mArrivedEndCL;
+    private View mArrivedEndView;
     private TextView mArrivedEndStation;
 
     protected TaxiPassengerServingOrderFragment ochServingOrderFragment = null;
@@ -76,8 +79,9 @@ public class TaxiPassengerBaseFragment extends MvpFragment<TaxiPassengerBaseFrag
         mV2XNotificationView = new TaxiPassengerV2XNotificationView(getContext());
         CallerHmiManager.INSTANCE.setProxyNotificationView(mV2XNotificationView);
 
-        mArrivedEndCL = findViewById(R.id.taxi_p_arrive_end_bg);
-        mArrivedEndStation = findViewById(R.id.arrived_end_station);
+//        mArrivedEndCL = findViewById(R.id.taxi_p_arrive_end_bg);
+        mArrivedEndView = LayoutInflater.from(getContext()).inflate(R.layout.taxi_p_arrived_end_panel,null);
+        mArrivedEndStation = mArrivedEndView.findViewById(R.id.arrived_end_station);
 
         mMapswitchBtn = findViewById(R.id.module_och_taxi_swich_map_iv);
         mMapswitchBtn.setOnClickListener(new View.OnClickListener() {
@@ -241,10 +245,12 @@ public class TaxiPassengerBaseFragment extends MvpFragment<TaxiPassengerBaseFrag
      */
     public void showOrHideArrivedEndLayout(boolean isShow, String arrivedEndStation){
         if (isShow){
-            mArrivedEndCL.setVisibility(View.VISIBLE);
+//            mArrivedEndCL.setVisibility(View.VISIBLE);
+            OverlayViewUtils.showOverlayView(getActivity(),mArrivedEndView);
             mArrivedEndStation.setText(arrivedEndStation);
         }else {
-            mArrivedEndCL.setVisibility(View.GONE);
+//            mArrivedEndCL.setVisibility(View.GONE);
+            OverlayViewUtils.dismissOverlayView(mArrivedEndView);
         }
     }
 }
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_end_panel.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_end_panel.xml
new file mode 100644
index 0000000000..94a263bb77
--- /dev/null
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_end_panel.xml
@@ -0,0 +1,56 @@
+<?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="match_parent"
+    android:layout_height="match_parent"
+    android:background="@drawable/taxi_p_arrive_end_panel_bg"
+    tools:ignore="MissingDefaultResource">
+
+    <TextView
+        android:id="@+id/arrived_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/dp_88"
+        android:layout_marginBottom="@dimen/dp_190"
+        android:includeFontPadding="false"
+        android:text="@string/taxi_p_arrived_title"
+        android:textColor="@android:color/white"
+        android:textSize="@dimen/taxi_p_arrived_end_tv_size"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent" />
+
+    <TextView
+        android:id="@+id/arrived_end_station"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/dp_30"
+        android:includeFontPadding="false"
+        android:textColor="@android:color/white"
+        android:textSize="@dimen/taxi_p_arrived_end_tv_size"
+        android:textStyle="bold"
+        app:layout_constraintBottom_toBottomOf="@+id/arrived_title"
+        app:layout_constraintLeft_toRightOf="@+id/arrived_title"
+        app:layout_constraintTop_toTopOf="@+id/arrived_title" />
+
+    <TextView
+        android:id="@+id/arrived_end_tip"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/dp_30"
+        android:includeFontPadding="false"
+        android:text="@string/taxi_p_arrived_end_tips"
+        android:textColor="@color/taxi_p_arrive_end_tip_color"
+        android:textSize="@dimen/taxi_p_arrived_end_tip_size"
+        app:layout_constraintLeft_toLeftOf="@+id/arrived_title"
+        app:layout_constraintTop_toBottomOf="@+id/arrived_title" />
+
+    <View
+        android:layout_width="@dimen/dp_18"
+        android:layout_height="0dp"
+        android:background="@color/taxi_p_arrive_end_bg_line_color"
+        app:layout_constraintBottom_toBottomOf="@+id/arrived_end_tip"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/arrived_title" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml
index 6f464fe16c..6ce6a101f3 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml
@@ -114,55 +114,4 @@
         android:layout_marginTop="@dimen/taxi_p_traffic_light_layout_margin_top"
         android:visibility="gone"/>
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/taxi_p_arrive_end_bg"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:visibility="gone"
-        android:background="@drawable/taxi_p_arrive_end_panel_bg">
-        <TextView
-            android:id="@+id/arrived_title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/dp_190"
-            android:layout_marginLeft="@dimen/dp_88"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            android:includeFontPadding="false"
-            android:text="@string/taxi_p_arrived_title"
-            android:textColor="@android:color/white"
-            android:textSize="@dimen/taxi_p_arrived_end_tv_size"/>
-        <TextView
-            android:id="@+id/arrived_end_station"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@android:color/white"
-            app:layout_constraintTop_toTopOf="@+id/arrived_title"
-            app:layout_constraintBottom_toBottomOf="@+id/arrived_title"
-            app:layout_constraintLeft_toRightOf="@+id/arrived_title"
-            android:layout_marginLeft="@dimen/dp_30"
-            android:textSize="@dimen/taxi_p_arrived_end_tv_size"
-            android:includeFontPadding="false"
-            android:textStyle="bold"/>
-        <TextView
-            android:id="@+id/arrived_end_tip"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:layout_constraintLeft_toLeftOf="@+id/arrived_title"
-            app:layout_constraintTop_toBottomOf="@+id/arrived_title"
-            android:layout_marginTop="@dimen/dp_30"
-            android:textColor="@color/taxi_p_arrive_end_tip_color"
-            android:textSize="@dimen/taxi_p_arrived_end_tip_size"
-            android:includeFontPadding="false"
-            android:text="@string/taxi_p_arrived_end_tips"/>
-        <View
-            android:layout_width="@dimen/dp_18"
-            android:layout_height="0dp"
-            android:background="@color/taxi_p_arrive_end_bg_line_color"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/arrived_title"
-            app:layout_constraintBottom_toBottomOf="@+id/arrived_end_tip"/>
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/TaxiProvider.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/TaxiProvider.java
index c926c94b65..3f2c014cda 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/TaxiProvider.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/TaxiProvider.java
@@ -46,7 +46,7 @@ class TaxiProvider implements IMogoOCH , IMogoStatusChangedListener {
     private void stepIntoVrMode() {
         CallerLogger.INSTANCE.d( M_TAXI + TAG, "进入vr模式" );
         MogoMapUIController.getInstance()
-                .openVrMode( false );
+                .stepInVrMode( false );
     }
 
     private void showFragment() {
@@ -94,7 +94,7 @@ class TaxiProvider implements IMogoOCH , IMogoStatusChangedListener {
         this.mActivity = fragmentActivity;
         this.mContainerId = integer;
 
-        UiThreadHandler.postDelayed(() -> stepIntoVrMode(), 5_000L);
+//        UiThreadHandler.postDelayed(() -> stepIntoVrMode(), 5_000L);
         return null;
     }