[3.4.0]

[UI调整]

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()
                 }

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)

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
 

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 {

OCH/mogo-och-taxi-passenger/src/main/res/drawable/anmi_flow.xml

@@ -1,231 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <animation-list xmlns:android="http://schemas.android.com/apk/res/android"
     android:oneshot="false">
-    <item
-        android:drawable="@drawable/image_00000"
-        android:duration="30"></item>
-    <item
-        android:drawable="@drawable/image_00001"
-        android:duration="30"></item>
-    <item
-        android:drawable="@drawable/image_00002"
-        android:duration="30"></item>
-    <item
-        android:drawable="@drawable/image_00003"
-        android:duration="30"></item>
-    <item
-        android:drawable="@drawable/image_00004"
-        android:duration="30"></item>
-    <item
-        android:drawable="@drawable/image_00005"
-        android:duration="30"></item>
-    <item
-        android:drawable="@drawable/image_00006"
-        android:duration="30"></item>
-    <item
-        android:drawable="@drawable/image_00007"
-        android:duration="30"></item>
-    <item
-        android:drawable="@drawable/image_00008"
-        android:duration="30"></item>
-    <item
-        android:drawable="@drawable/image_00009"
-        android:duration="30"></item>
-    <item
-        android:drawable="@drawable/image_00010"
-        android:duration="30"></item>
-    <item
-        android:drawable="@drawable/image_00011"
-        android:duration="30"></item>
-    <item
-        android:drawable="@drawable/image_00012"
-        android:duration="30"></item>
-    <item
-        android:drawable="@drawable/image_00013"
-        android:duration="30"></item>
-    <item
-        android:drawable="@drawable/image_00014"
-        android:duration="30"></item>
-    <item
-        android:drawable="@drawable/image_00015"
-        android:duration="30"></item>
-    <item
-        android:drawable="@drawable/image_00016"
-        android:duration="30"></item>
-    <item
-        android:drawable="@drawable/image_00017"
-        android:duration="30"></item>
-    <item
-        android:drawable="@drawable/image_00018"
-        android:duration="30"></item>
-    <item
-        android:drawable="@drawable/image_00019"
-        android:duration="30"></item>
-    <item
-        android:drawable="@drawable/image_00020"
-        android:duration="30"></item>
-    <item
-        android:drawable="@drawable/image_00021"
-        android:duration="30"></item>
-    <item
-        android:drawable="@drawable/image_00022"
-        android:duration="30"></item>
-    <item
-        android:drawable="@drawable/image_00023"
-        android:duration="30"></item>
-    <item
-        android:drawable="@drawable/image_00024"
-        android:duration="30"></item>
-    <item
-        android:drawable="@drawable/image_00025"
-        android:duration="30"></item>
-    <item
-        android:drawable="@drawable/image_00026"
-        android:duration="30"></item>
-    <item
-        android:drawable="@drawable/image_00027"
-        android:duration="30"></item>
-    <item
-        android:drawable="@drawable/image_00028"
-        android:duration="30"></item>
-    <item
-        android:drawable="@drawable/image_00029"
-        android:duration="30"></item>
-    <item
-        android:drawable="@drawable/image_00030"
-        android:duration="30"></item>
-    <item
-        android:drawable="@drawable/image_00031"
-        android:duration="30"></item>
-    <item
-        android:drawable="@drawable/image_00032"
-        android:duration="30"></item>
-    <item
-        android:drawable="@drawable/image_00033"
-        android:duration="30"></item>
-    <item
-        android:drawable="@drawable/image_00034"
-        android:duration="30"></item>
-    <item
-        android:drawable="@drawable/image_00035"
-        android:duration="30"></item>
-    <item
-        android:drawable="@drawable/image_00036"
-        android:duration="30"></item>
-    <item
-        android:drawable="@drawable/image_00037"
-        android:duration="30"></item>
-    <item
-        android:drawable="@drawable/image_00038"
-        android:duration="30"></item>
-    <item
-        android:drawable="@drawable/image_00039"
-        android:duration="30"></item>
-    <item
-        android:drawable="@drawable/image_00040"
-        android:duration="30"></item>
-    <item
-        android:drawable="@drawable/image_00041"
-        android:duration="30"></item>
-    <item
-        android:drawable="@drawable/image_00042"
-        android:duration="30"></item>
-    <item
-        android:drawable="@drawable/image_00043"
-        android:duration="30"></item>
-    <item
-        android:drawable="@drawable/image_00044"
-        android:duration="30"></item>
-    <item
-        android:drawable="@drawable/image_00045"
-        android:duration="30"></item>
-    <item
-        android:drawable="@drawable/image_00046"
-        android:duration="30"></item>
-    <item
-        android:drawable="@drawable/image_00047"
-        android:duration="30"></item>
-    <item
-        android:drawable="@drawable/image_00048"
-        android:duration="30"></item>
-    <item
-        android:drawable="@drawable/image_00049"
-        android:duration="30"></item>
-    <item
-        android:drawable="@drawable/image_00050"
-        android:duration="30"></item>
-    <item
-        android:drawable="@drawable/image_00051"
-        android:duration="30"></item>
-    <item
-        android:drawable="@drawable/image_00052"
-        android:duration="30"></item>
-    <item
-        android:drawable="@drawable/image_00053"
-        android:duration="30"></item>
-    <item
-        android:drawable="@drawable/image_00054"
-        android:duration="30"></item>
-    <item
-        android:drawable="@drawable/image_00055"
-        android:duration="30"></item>
-    <item
-        android:drawable="@drawable/image_00056"
-        android:duration="30"></item>
-    <item
-        android:drawable="@drawable/image_00057"
-        android:duration="30"></item>
-    <item
-        android:drawable="@drawable/image_00058"
-        android:duration="30"></item>
-    <item
-        android:drawable="@drawable/image_00059"
-        android:duration="30"></item>
-    <item
-        android:drawable="@drawable/image_00060"
-        android:duration="30"></item>
-    <item
-        android:drawable="@drawable/image_00061"
-        android:duration="30"></item>
-    <item
-        android:drawable="@drawable/image_00062"
-        android:duration="30"></item>
-    <item
-        android:drawable="@drawable/image_00063"
-        android:duration="30"></item>
-    <item
-        android:drawable="@drawable/image_00064"
-        android:duration="30"></item>
-    <item
-        android:drawable="@drawable/image_00065"
-        android:duration="30"></item>
-    <item
-        android:drawable="@drawable/image_00066"
-        android:duration="30"></item>
-    <item
-        android:drawable="@drawable/image_00067"
-        android:duration="30"></item>
-    <item
-        android:drawable="@drawable/image_00068"
-        android:duration="30"></item>
-    <item
-        android:drawable="@drawable/image_00069"
-        android:duration="30"></item>
-    <item
-        android:drawable="@drawable/image_00070"
-        android:duration="30"></item>
-    <item
-        android:drawable="@drawable/image_00071"
-        android:duration="30"></item>
-    <item
-        android:drawable="@drawable/image_00072"
-        android:duration="30"></item>
-    <item
-        android:drawable="@drawable/image_00073"
-        android:duration="30"></item>
-    <item
-        android:drawable="@drawable/image_00074"
-        android:duration="30"></item>
-    
+    <item android:drawable="@drawable/image_00000" android:duration="30"/>
+    <item android:drawable="@drawable/image_00001" android:duration="30"/>
+    <item android:drawable="@drawable/image_00002" android:duration="30"/>
+    <item android:drawable="@drawable/image_00003" android:duration="30"/>
+    <item android:drawable="@drawable/image_00004" android:duration="30"/>
+    <item android:drawable="@drawable/image_00005" android:duration="30"/>
+    <item android:drawable="@drawable/image_00006" android:duration="30"/>
+    <item android:drawable="@drawable/image_00007" android:duration="30"/>
+    <item android:drawable="@drawable/image_00008" android:duration="30"/>
+    <item android:drawable="@drawable/image_00009" android:duration="30"/>
+    <item android:drawable="@drawable/image_00010" android:duration="30"/>
+    <item android:drawable="@drawable/image_00011" android:duration="30"/>
+    <item android:drawable="@drawable/image_00012" android:duration="30"/>
+    <item android:drawable="@drawable/image_00013" android:duration="30"/>
+    <item android:drawable="@drawable/image_00014" android:duration="30"/>
+    <item android:drawable="@drawable/image_00015" android:duration="30"/>
+    <item android:drawable="@drawable/image_00016" android:duration="30"/>
+    <item android:drawable="@drawable/image_00017" android:duration="30"/>
+    <item android:drawable="@drawable/image_00018" android:duration="30"/>
+    <item android:drawable="@drawable/image_00019" android:duration="30"/>
+    <item android:drawable="@drawable/image_00020" android:duration="30"/>
+    <item android:drawable="@drawable/image_00021" android:duration="30"/>
+    <item android:drawable="@drawable/image_00022" android:duration="30"/>
+    <item android:drawable="@drawable/image_00023" android:duration="30"/>
+    <item android:drawable="@drawable/image_00024" android:duration="30"/>
+    <item android:drawable="@drawable/image_00025" android:duration="30"/>
+    <item android:drawable="@drawable/image_00026" android:duration="30"/>
+    <item android:drawable="@drawable/image_00027" android:duration="30"/>
+    <item android:drawable="@drawable/image_00028" android:duration="30"/>
+    <item android:drawable="@drawable/image_00029" android:duration="30"/>
+    <item android:drawable="@drawable/image_00030" android:duration="30"/>
+    <item android:drawable="@drawable/image_00031" android:duration="30"/>
+    <item android:drawable="@drawable/image_00032" android:duration="30"/>
+    <item android:drawable="@drawable/image_00033" android:duration="30"/>
+    <item android:drawable="@drawable/image_00034" android:duration="30"/>
+
 </animation-list>