[tianjin]

[3.1.6]
[添加动画]

OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/fragment/M1OrderLineFragment.kt

@@ -1,6 +1,7 @@
 package com.mogo.och.bus.passenger.ui.dialogfragment.fragment
 
 import android.animation.ObjectAnimator
+import android.graphics.drawable.AnimationDrawable
 import android.os.Bundle
 import android.view.View
 import android.view.animation.LinearInterpolator
@@ -41,15 +42,6 @@ class M1OrderLineFragment :
     val siteList = mutableListOf<SiteInfoResponse.SiteInfo>()
 
 
-
-    private val loadingAni =
-        ObjectAnimator.ofFloat(iv_loading_wait_driver, "rotation", 0f, 90f, 180f, 270f, 360f)
-            .apply {
-                repeatCount = -1
-                interpolator = LinearInterpolator()
-                duration = 1000
-            }
-
     override fun getLayoutId(): Int {
         return R.layout.m1_order_fragment
     }
@@ -62,7 +54,6 @@ class M1OrderLineFragment :
         CallerLogger.d(SceneConstant.M_BUS_P + TAG, "initViews")
         lineAdapter = OrderLineItemAdapter(requireContext(), lineList)
         siteAdapter = OrderSiteItemAdapter(requireContext(), siteList)
-        loadingAni.target = iv_loading_wait_driver
         rlv_line_list.layoutManager =
             LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
         rlv_line_list.addItemDecoration(
@@ -134,15 +125,15 @@ class M1OrderLineFragment :
     fun startAni() {
         g_lines_sites_data.visibility = View.GONE
         g_loading_group.visibility = View.VISIBLE
-        if (!loadingAni.isRunning) {
-            loadingAni.start()
-        }
+        val animationDrawable = iv_loading_wait_driver.drawable as AnimationDrawable
+        animationDrawable.start()
     }
 
     fun endAni() {
         UiThreadHandler.post {
             g_lines_sites_data.visibility = View.VISIBLE
             g_loading_group.visibility = View.GONE
+            val animationDrawable = iv_loading_wait_driver.drawable as AnimationDrawable
         }
     }
 
@@ -181,7 +172,7 @@ class M1OrderLineFragment :
 
     override fun onDestroyView() {
         super.onDestroyView()
-        loadingAni.cancel()
+        //loadingAni.cancel()
         CallerLogger.d(SceneConstant.M_BUS_P + TAG, "onDestroyView")
     }
 

OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_wait_driver_submit_ani.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<animation-list xmlns:android="http://schemas.android.com/apk/res/android" android:visible="true"
+android:oneshot="false">
+    <item android:drawable="@drawable/charter_p_wait_driver_submit01" android:duration="60"/>
+    <item android:drawable="@drawable/charter_p_wait_driver_submit02" android:duration="60"/>
+    <item android:drawable="@drawable/charter_p_wait_driver_submit03" android:duration="60"/>
+    <item android:drawable="@drawable/charter_p_wait_driver_submit04" android:duration="60"/>
+    <item android:drawable="@drawable/charter_p_wait_driver_submit05" android:duration="60"/>
+    <item android:drawable="@drawable/charter_p_wait_driver_submit06" android:duration="60"/>
+    <item android:drawable="@drawable/charter_p_wait_driver_submit07" android:duration="60"/>
+    <item android:drawable="@drawable/charter_p_wait_driver_submit08" android:duration="60"/>
+    <item android:drawable="@drawable/charter_p_wait_driver_submit09" android:duration="60"/>
+    <item android:drawable="@drawable/charter_p_wait_driver_submit10" android:duration="60"/>
+    <item android:drawable="@drawable/charter_p_wait_driver_submit11" android:duration="60"/>
+    <item android:drawable="@drawable/charter_p_wait_driver_submit12" android:duration="60"/>
+    <item android:drawable="@drawable/charter_p_wait_driver_submit13" android:duration="60"/>
+    <item android:drawable="@drawable/charter_p_wait_driver_submit14" android:duration="60"/>
+    <item android:drawable="@drawable/charter_p_wait_driver_submit15" android:duration="60"/>
+    <item android:drawable="@drawable/charter_p_wait_driver_submit16" android:duration="60"/>
+    <item android:drawable="@drawable/charter_p_wait_driver_submit17" android:duration="60"/>
+    <item android:drawable="@drawable/charter_p_wait_driver_submit18" android:duration="60"/>
+    <item android:drawable="@drawable/charter_p_wait_driver_submit19" android:duration="60"/>
+    <item android:drawable="@drawable/charter_p_wait_driver_submit20" android:duration="60"/>
+    <item android:drawable="@drawable/charter_p_wait_driver_submit21" android:duration="60"/>
+    <item android:drawable="@drawable/charter_p_wait_driver_submit22" android:duration="60"/>
+    <item android:drawable="@drawable/charter_p_wait_driver_submit23" android:duration="60"/>
+    <item android:drawable="@drawable/charter_p_wait_driver_submit24" android:duration="60"/>
+    <item android:drawable="@drawable/charter_p_wait_driver_submit25" android:duration="60"/>
+    <item android:drawable="@drawable/charter_p_wait_driver_submit26" android:duration="60"/>
+    <item android:drawable="@drawable/charter_p_wait_driver_submit27" android:duration="60"/>
+    <item android:drawable="@drawable/charter_p_wait_driver_submit28" android:duration="60"/>
+    <item android:drawable="@drawable/charter_p_wait_driver_submit29" android:duration="60"/>
+    <item android:drawable="@drawable/charter_p_wait_driver_submit30" android:duration="60"/>
+
+</animation-list>

OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_fragment.xml

@@ -124,25 +124,23 @@
                 android:id="@+id/g_lines_sites_data"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                app:constraint_referenced_ids="cl_line_list,cl_side_list" />
+                app:constraint_referenced_ids="cl_line_list,cl_side_list,tv_site_submit,tv_site_cancle" />
 
             <ImageView
                 android:id="@+id/iv_loading_wait_driver"
-                android:layout_width="@dimen/dp_71"
-                android:layout_height="@dimen/dp_73"
-                android:src="@drawable/bus_p_loading"
-                app:layout_constraintBottom_toBottomOf="parent"
+                android:layout_width="@dimen/dp_600"
+                android:layout_height="@dimen/dp_300"
+                android:src="@drawable/charter_p_wait_driver_submit_ani"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintVertical_bias="0.372" />
+                app:layout_constraintTop_toTopOf="parent" />
 
             <TextView
                 android:id="@+id/tv_loading_wait_driver_title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="63dp"
-                android:text="等待司机确认信息，请稍候…"
+                android:gravity="center"
+                android:text="稍等，亲\n蘑菇小助手正在为您确认信息…"
                 android:textColor="@color/bus_p_m1_4a5375"
                 android:textSize="@dimen/dp_30"
                 app:layout_constraintEnd_toEndOf="@+id/iv_loading_wait_driver"