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 + + + + + + + + + + + \ 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"/> - - - - - - - - \ 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; }