diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt
index 0a8eb1e3fd..6972bef09d 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt
@@ -69,6 +69,7 @@ class TaxiPassengerBaseFragment() :
super.initViews(savedInstanceState)
mapBizView!!.onCreate(savedInstanceState)
overMapView.onCreateView(savedInstanceState)
+ overMapView.hideResetView()
}
private fun initListener() {
@@ -235,6 +236,7 @@ class TaxiPassengerBaseFragment() :
*/
fun showOrHideStartAutopilotView(isShow: Boolean) {
if (isShow) {
+ exitFullVideoScreen()
if (mStartAutopilotView == null || mStartAutopilotView!!.get() == null) {
mStartAutopilotView = WeakReference(StartAutopilotView(requireContext()))
}
@@ -259,6 +261,7 @@ class TaxiPassengerBaseFragment() :
*/
fun showOrHideArrivedEndLayout(isShow: Boolean) {
if (isShow) {
+ exitFullVideoScreen()
if (mArrivedEndView == null || mArrivedEndView!!.get() == null) {
mArrivedEndView = WeakReference(ArrivedView(context))
}
@@ -276,6 +279,10 @@ class TaxiPassengerBaseFragment() :
}
}
+ private fun exitFullVideoScreen(){
+ infoVideoView.exitFullScreenMode()
+ }
+
fun showOrHideOverMapView(){
overMapView?.clearV2XMarkers()
overMapView?.clearCustomPolyline()
@@ -297,6 +304,7 @@ class TaxiPassengerBaseFragment() :
) {
try {
if (isShow) {
+ exitFullVideoScreen()
if (mArrivedCheckView == null || mArrivedCheckView!!.get() == null) {
initCheckView()
}
diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/debug/DebugView.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/debug/DebugView.kt
index 6a05cb281d..125e245b99 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/debug/DebugView.kt
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/debug/DebugView.kt
@@ -63,7 +63,7 @@ class DebugView @JvmOverloads constructor(
fragment?.showOrHideArrivedEndLayout(true)
}
tv_show_phone_check.onClick {
- fragment?.showOrHidePressengerCheckPager(isShow = true)
+ fragment?.showOrHidePressengerCheckPager(isShow = true,"13号路口终(鹰眼专用)","13号路口终(鹰眼专用)","2","2","18811539480")
}
tv_show_start_autopilot.onClick {
fragment?.showOrHideStartAutopilotView(true)
diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/orderinfo/ItineraryView.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/orderinfo/ItineraryView.kt
index 4287077e4b..3eb347961b 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/orderinfo/ItineraryView.kt
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/orderinfo/ItineraryView.kt
@@ -60,7 +60,7 @@ class ItineraryView : ConstraintLayout, OrderInfoViewModel.ItineraryViewCallback
val setondColor = ContextCompat.getColor(context, R.color.taxi_p_44C8FF)
val thirdColor = ContextCompat.getColor(context, R.color.taxi_p_8AE4ED)
val fourceColor = ContextCompat.getColor(context, R.color.taxi_p_C8F3F4)
- val bottomColor = ContextCompat.getColor(context, R.color.taxi_p_476FBE)
+ val bottomColor = ContextCompat.getColor(context, R.color.taxi_p_66476FBE)
gradientDrawable.colors = intArrayOf(firstColor, setondColor, thirdColor, fourceColor)
gradientDrawable.orientation = GradientDrawable.Orientation.LEFT_RIGHT
diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotView.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotView.kt
index a33a565770..b3534ce4c1 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotView.kt
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotView.kt
@@ -61,17 +61,7 @@ class StartAutopilotView : WindowRelativeLayout, StartAutopilotViewModel.StartAu
R.drawable.image_00022, R.drawable.image_00023, R.drawable.image_00024, R.drawable.image_00025,
R.drawable.image_00026, R.drawable.image_00027, R.drawable.image_00028, R.drawable.image_00029,
R.drawable.image_00030, R.drawable.image_00031, R.drawable.image_00032, R.drawable.image_00033,
- R.drawable.image_00034, R.drawable.image_00035, R.drawable.image_00036, R.drawable.image_00037,
- R.drawable.image_00038, R.drawable.image_00039, R.drawable.image_00040, R.drawable.image_00041,
- R.drawable.image_00042, R.drawable.image_00043, R.drawable.image_00044, R.drawable.image_00045,
- R.drawable.image_00046, R.drawable.image_00047, R.drawable.image_00048, R.drawable.image_00049,
- R.drawable.image_00050, R.drawable.image_00051, R.drawable.image_00052, R.drawable.image_00053,
- R.drawable.image_00054, R.drawable.image_00055, R.drawable.image_00056, R.drawable.image_00057,
- R.drawable.image_00058, R.drawable.image_00059, R.drawable.image_00060, R.drawable.image_00061,
- R.drawable.image_00062, R.drawable.image_00063, R.drawable.image_00064, R.drawable.image_00065,
- R.drawable.image_00066, R.drawable.image_00067, R.drawable.image_00068, R.drawable.image_00069,
- R.drawable.image_00070, R.drawable.image_00071, R.drawable.image_00072, R.drawable.image_00073,
- R.drawable.image_00074
+ R.drawable.image_00034
)
init {
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/anmi_flow.xml b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/anmi_flow.xml
index e9a68b40b3..f061a263fd 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/anmi_flow.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/anmi_flow.xml
@@ -1,231 +1,40 @@
-
-