[6.3.0]

[启动自驾的动画]

OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt

@@ -268,7 +268,6 @@ class TaxiPassengerBaseFragment() :
             }
             2 -> {
                 chekAndStartAutopilotView.aniCheckAndStartAutopilot(false,2)
-                chekAndStartAutopilotView.resetCheckView()
             }
             else -> {}
         }

OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/ChekAndStartAutopilotView.kt

@@ -1,20 +1,29 @@
 package com.mogo.och.taxi.passenger.ui.checkstartautopilot
 
+import android.animation.Animator
+import android.animation.AnimatorListenerAdapter
+import android.animation.AnimatorSet
 import android.animation.ObjectAnimator
+import android.animation.ValueAnimator
 import android.content.Context
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.view.View
+import android.view.animation.LinearInterpolator
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.findViewTreeViewModelStoreOwner
+import com.google.android.material.animation.AnimatorSetCompat
 import com.mogo.eagle.core.utilcode.kotlin.onClick
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
 import com.mogo.och.common.module.manager.xiaozhimanager.ZhiViewmanager
 import com.mogo.och.common.module.utils.BigFrameAnimatorContainer
+import com.mogo.och.common.module.utils.RxUtils
 import com.mogo.och.taxi.passenger.R
 import com.mogo.och.taxi.passenger.widget.WindowRelativeLayout
 import kotlinx.android.synthetic.main.taxt_p_check_startautopilot.view.aciv_check_autopilot
+import kotlinx.android.synthetic.main.taxt_p_check_startautopilot.view.aciv_start_autopilt_success_ani
+import kotlinx.android.synthetic.main.taxt_p_check_startautopilot.view.aciv_start_autopilt_success_bg
 import kotlinx.android.synthetic.main.taxt_p_check_startautopilot.view.checkPhoneNumber
 import kotlinx.android.synthetic.main.taxt_p_check_startautopilot.view.startAutopilotClose
 import kotlinx.android.synthetic.main.taxt_p_check_startautopilot.view.startAutopilotView
@@ -49,6 +58,8 @@ class ChekAndStartAutopilotView : WindowRelativeLayout,
     private var aniCheck2StartAutopilotView: BigFrameAnimatorContainer? = null
 
     var checkAndStartVisilityChangeListenr: CheckAndStartVisilityChangeListenr?=null
+    private var waitCount = 0
+    private var maxWaitCount = 3
 
 
     private fun initView(context: Context) {
@@ -63,6 +74,7 @@ class ChekAndStartAutopilotView : WindowRelativeLayout,
     override fun onVisibilityAggregated(isVisible: Boolean) {
         super.onVisibilityAggregated(isVisible)
         if (isVisible) {
+            waitCount = 0
             aniCheck2StartAutopilotView =
                 BigFrameAnimatorContainer(R.array.check2startautopilt, 39, aciv_check_autopilot, true)
             aniCheck2StartAutopilotView?.mOnAnimationStoppedListener = object : BigFrameAnimatorContainer.OnAnimationStoppedListener{
@@ -104,15 +116,15 @@ class ChekAndStartAutopilotView : WindowRelativeLayout,
     }
 
     override fun dismissWindow() {
-        visibility = View.GONE
-    }
-
-    fun resetCheckView() {
-        checkPhoneNumber.visibility = View.VISIBLE
-        startAutopilotView.visibility = View.GONE
-        startAutopilotClose.visibility = View.GONE
+
     }
 
+    /**
+     * @param show true 展示 false 隐藏
+     * @param status 0 展示手机号验证
+     *               1 展示启动自动驾驶
+     *               2 隐藏页面
+     */
     fun aniCheckAndStartAutopilot(show:Boolean,status:Int){
         val alphaStart: Float
         val alphaEnd: Float
@@ -123,7 +135,7 @@ class ChekAndStartAutopilotView : WindowRelativeLayout,
         }else{
             alphaStart = 1f
             alphaEnd = 0.0f
-            visibility = View.GONE
+            //visibility = View.GONE
         }
         when (status) {
             0 -> {
@@ -141,9 +153,19 @@ class ChekAndStartAutopilotView : WindowRelativeLayout,
                 aniCheck2StartAutopilotView?.start()
             }
             2 -> {
-                checkPhoneNumber.visibility = View.VISIBLE
-                startAutopilotView.visibility = View.GONE
-                startAutopilotClose.visibility = View.GONE
+                if (startAutopilotView.canGonethisView) {// 启动动画已经播放最少1遍
+                    // 启动公司logo动画
+                    startAnimal()
+                }else {
+                    waitCount++
+                    if(waitCount<maxWaitCount) {
+                        RxUtils.createSubscribe(1000) {
+                            aniCheckAndStartAutopilot(false, 2)
+                        }
+                    }else{
+                        waitCount = 0
+                    }
+                }
                 return
             }
             else -> {}
@@ -151,6 +173,38 @@ class ChekAndStartAutopilotView : WindowRelativeLayout,
 
     }
 
+    private fun startAnimal(){
+        val startAutopilotSuccessBgAni = ObjectAnimator.ofFloat(aciv_start_autopilt_success_bg, "alpha", 0f, 1f)
+        val startAutopilotSuccessLogoAni = ObjectAnimator.ofFloat(aciv_start_autopilt_success_ani, "alpha", 0f, 1f)
+        val animatorSetCompat = AnimatorSet()
+        animatorSetCompat.playTogether(startAutopilotSuccessBgAni,startAutopilotSuccessLogoAni)
+        animatorSetCompat.duration=700
+        animatorSetCompat.interpolator = LinearInterpolator()
+        animatorSetCompat.addListener(object :AnimatorListenerAdapter(){
+                override fun onAnimationStart(animation: Animator) {
+                    RxUtils.createSubscribe(350) {
+                        val aniStartAutopilotSuccessAni =
+                            BigFrameAnimatorContainer(R.array.taxi_p_start_autopilot_fail, 20, aciv_start_autopilt_success_ani, true)
+                        aniStartAutopilotSuccessAni.setOnAnimStopListener(object :
+                            BigFrameAnimatorContainer.OnAnimationStoppedListener{
+                            override fun AnimationStopped() {
+                                checkPhoneNumber.visibility = View.VISIBLE
+                                startAutopilotView.visibility = View.GONE
+                                startAutopilotClose.visibility = View.GONE
+                                this@ChekAndStartAutopilotView.animate().alpha(0f).withEndAction {
+                                    this@ChekAndStartAutopilotView.visibility = View.GONE
+                                    aciv_start_autopilt_success_bg.alpha = 0f
+                                    aciv_start_autopilt_success_ani.alpha = 0f
+                                }.duration=1000
+                            }
+                        })
+                        aniStartAutopilotSuccessAni.start()
+                    }
+                }
+            })
+        animatorSetCompat.start()
+    }
+
     interface CheckAndStartVisilityChangeListenr{
         fun isShow(show: Boolean)
     }

OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/startautopilot/StartAutopilotView.kt

@@ -50,6 +50,7 @@ class StartAutopilotView : WindowRelativeLayout, StartAutopilotViewModel.StartAu
     private var taxiPStartAutopilot: FrameAnimatorContainer? = null
     private var taxiPStartAutopilotCar: FrameAnimatorContainer? = null
     private lateinit var viewModel: StartAutopilotViewModel
+    var canGonethisView = false
 
 
     init {
@@ -72,6 +73,11 @@ class StartAutopilotView : WindowRelativeLayout, StartAutopilotViewModel.StartAu
         )
         taxiPStartAutopilot?.setOnAnimStopListener(object :
             FrameAnimatorContainer.OnAnimationStoppedListener {
+            override fun playOnce() {
+                super.playOnce()
+                canGonethisView = false
+            }
+
             override fun AnimationStopped() {
                 CallerLogger.d(SceneConstant.M_TAXI_P + TAG, "可以启动自驾动画暂停")
             }
@@ -167,6 +173,7 @@ class StartAutopilotView : WindowRelativeLayout, StartAutopilotViewModel.StartAu
         viewModel.setStartAutopilotCallback(this)
         taxi_p_start_autopilot.onClick {
             //开启动画和自动驾驶
+            canGonethisView = false
             startAutopiloting()
             viewModel.startAutopilot()
         }

OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/debug/DebugView.kt

@@ -22,6 +22,7 @@ import kotlinx.android.synthetic.main.taxi_p_debug.view.tv_show_arrive
 import kotlinx.android.synthetic.main.taxi_p_debug.view.tv_show_order_info
 import kotlinx.android.synthetic.main.taxi_p_debug.view.tv_show_phone_check
 import kotlinx.android.synthetic.main.taxi_p_debug.view.tv_show_start_autopilot
+import kotlinx.android.synthetic.main.taxi_p_debug.view.tv_show_start_autopilot_success
 import kotlinx.android.synthetic.main.taxi_p_statusview.view.iv_biz_icon
 import me.jessyan.autosize.utils.AutoSizeUtils
 import org.greenrobot.eventbus.EventBus
@@ -69,6 +70,9 @@ class DebugView @JvmOverloads constructor(
         tv_show_start_autopilot.onClick {
             fragment?.showOrHideCheckAndStartAutopilotView(1)
         }
+        tv_show_start_autopilot_success.onClick {
+            fragment?.showOrHideCheckAndStartAutopilotView(2)
+        }
         tv_show_order_info.onClick {
             fragment?.showOrHideServingOrderFragment(true)
             fragment?.preLoadArrivedImages()

OCH/taxi/passenger/src/main/res/layout/taxi_p_debug.xml

@@ -25,6 +25,11 @@
         android:text="启动自驾页面"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
+    <TextView
+        android:id="@+id/tv_show_start_autopilot_success"
+        android:text="启动自驾成功"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
     <TextView
         android:id="@+id/tv_show_order_info"
         android:text="订单信息"

OCH/taxi/passenger/src/main/res/layout/taxt_p_check_startautopilot.xml

@@ -36,6 +36,23 @@
         android:layout_width="@dimen/dp_120"
         android:layout_height="@dimen/dp_120"/>
 
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/aciv_start_autopilt_success_bg"
+        android:src="@drawable/taxt_p_start_auto"
+        android:alpha="0"
+        android:scaleType="center"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
 
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/aciv_start_autopilt_success_ani"
+        android:src="@drawable/taxi_p_start_auto_000"
+        app:layout_constraintTop_toTopOf="parent"
+        android:alpha="0"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:layout_width="@dimen/dp_900"
+        android:layout_height="@dimen/dp_400"/>
 
 </androidx.constraintlayout.widget.ConstraintLayout>

OCH/taxi/passenger/src/main/res/values/arrays.xml

@@ -1,210 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string-array name="taxi_p_start_autopilot">
-        <item>@drawable/image_00000</item>
-        <item>@drawable/image_00001</item>
-        <item>@drawable/image_00002</item>
-        <item>@drawable/image_00003</item>
-        <item>@drawable/image_00004</item>
-        <item>@drawable/image_00005</item>
-        <item>@drawable/image_00006</item>
-        <item>@drawable/image_00007</item>
-        <item>@drawable/image_00008</item>
-        <item>@drawable/image_00009</item>
-        <item>@drawable/image_00010</item>
-        <item>@drawable/image_00011</item>
-        <item>@drawable/image_00012</item>
-        <item>@drawable/image_00013</item>
-        <item>@drawable/image_00014</item>
-        <item>@drawable/image_00015</item>
-        <item>@drawable/image_00016</item>
-        <item>@drawable/image_00017</item>
-        <item>@drawable/image_00018</item>
-        <item>@drawable/image_00019</item>
-        <item>@drawable/image_00020</item>
-        <item>@drawable/image_00021</item>
-        <item>@drawable/image_00022</item>
-        <item>@drawable/image_00023</item>
-        <item>@drawable/image_00024</item>
-        <item>@drawable/image_00025</item>
-        <item>@drawable/image_00026</item>
-        <item>@drawable/image_00027</item>
-        <item>@drawable/image_00028</item>
-        <item>@drawable/image_00029</item>
-        <item>@drawable/image_00030</item>
-        <item>@drawable/image_00031</item>
-        <item>@drawable/image_00032</item>
-        <item>@drawable/image_00033</item>
-        <item>@drawable/image_00034</item>
-    </string-array>
-
-    <string-array name="taxi_p_start_autopilot_car">
-        <item>@drawable/light_00000</item>
-        <item>@drawable/light_00001</item>
-        <item>@drawable/light_00002</item>
-        <item>@drawable/light_00003</item>
-        <item>@drawable/light_00004</item>
-        <item>@drawable/light_00005</item>
-        <item>@drawable/light_00006</item>
-        <item>@drawable/light_00007</item>
-        <item>@drawable/light_00008</item>
-        <item>@drawable/light_00009</item>
-        <item>@drawable/light_00010</item>
-        <item>@drawable/light_00011</item>
-        <item>@drawable/light_00012</item>
-        <item>@drawable/light_00013</item>
-        <item>@drawable/light_00014</item>
-        <item>@drawable/light_00015</item>
-        <item>@drawable/light_00016</item>
-        <item>@drawable/light_00017</item>
-    </string-array>
-
-
-
-
-
-
-    <string-array name="arrived_dest">
-<!--        <item>@drawable/arrive_dest_000</item>-->
-        <item>@drawable/arrive_dest_001</item>
-        <item>@drawable/arrive_dest_002</item>
-        <item>@drawable/arrive_dest_003</item>
-        <item>@drawable/arrive_dest_004</item>
-        <item>@drawable/arrive_dest_005</item>
-        <item>@drawable/arrive_dest_006</item>
-        <item>@drawable/arrive_dest_007</item>
-        <item>@drawable/arrive_dest_008</item>
-        <item>@drawable/arrive_dest_009</item>
-
-        <item>@drawable/arrive_dest_010</item>
-        <item>@drawable/arrive_dest_011</item>
-        <item>@drawable/arrive_dest_012</item>
-        <item>@drawable/arrive_dest_013</item>
-        <item>@drawable/arrive_dest_014</item>
-        <item>@drawable/arrive_dest_015</item>
-        <item>@drawable/arrive_dest_016</item>
-        <item>@drawable/arrive_dest_017</item>
-        <item>@drawable/arrive_dest_018</item>
-        <item>@drawable/arrive_dest_019</item>
-
-        <item>@drawable/arrive_dest_020</item>
-        <item>@drawable/arrive_dest_021</item>
-        <item>@drawable/arrive_dest_022</item>
-        <item>@drawable/arrive_dest_023</item>
-        <item>@drawable/arrive_dest_024</item>
-        <item>@drawable/arrive_dest_025</item>
-        <item>@drawable/arrive_dest_026</item>
-        <item>@drawable/arrive_dest_027</item>
-        <item>@drawable/arrive_dest_028</item>
-        <item>@drawable/arrive_dest_029</item>
-
-
-        <item>@drawable/arrive_dest_030</item>
-        <item>@drawable/arrive_dest_031</item>
-        <item>@drawable/arrive_dest_032</item>
-        <item>@drawable/arrive_dest_033</item>
-        <item>@drawable/arrive_dest_034</item>
-        <item>@drawable/arrive_dest_035</item>
-        <item>@drawable/arrive_dest_036</item>
-        <item>@drawable/arrive_dest_037</item>
-        <item>@drawable/arrive_dest_038</item>
-        <item>@drawable/arrive_dest_039</item>
-
-        <item>@drawable/arrive_dest_040</item>
-        <item>@drawable/arrive_dest_041</item>
-        <item>@drawable/arrive_dest_042</item>
-        <item>@drawable/arrive_dest_043</item>
-        <item>@drawable/arrive_dest_044</item>
-        <item>@drawable/arrive_dest_045</item>
-        <item>@drawable/arrive_dest_046</item>
-        <item>@drawable/arrive_dest_047</item>
-        <item>@drawable/arrive_dest_048</item>
-        <item>@drawable/arrive_dest_049</item>
-
-
-        <item>@drawable/arrive_dest_050</item>
-        <item>@drawable/arrive_dest_051</item>
-        <item>@drawable/arrive_dest_052</item>
-        <item>@drawable/arrive_dest_053</item>
-        <item>@drawable/arrive_dest_054</item>
-        <item>@drawable/arrive_dest_055</item>
-        <item>@drawable/arrive_dest_056</item>
-        <item>@drawable/arrive_dest_057</item>
-        <item>@drawable/arrive_dest_058</item>
-        <item>@drawable/arrive_dest_059</item>
-
-        <item>@drawable/arrive_dest_060</item>
-    </string-array>
-
-    <string-array name="check2startautopilt">
-        <item>@drawable/check2startautopilt_000</item>
-        <item>@drawable/check2startautopilt_001</item>
-        <item>@drawable/check2startautopilt_002</item>
-        <item>@drawable/check2startautopilt_003</item>
-        <item>@drawable/check2startautopilt_004</item>
-        <item>@drawable/check2startautopilt_005</item>
-        <item>@drawable/check2startautopilt_006</item>
-        <item>@drawable/check2startautopilt_007</item>
-        <item>@drawable/check2startautopilt_008</item>
-        <item>@drawable/check2startautopilt_009</item>
-
-        <item>@drawable/check2startautopilt_010</item>
-        <item>@drawable/check2startautopilt_011</item>
-        <item>@drawable/check2startautopilt_012</item>
-        <item>@drawable/check2startautopilt_013</item>
-        <item>@drawable/check2startautopilt_014</item>
-        <item>@drawable/check2startautopilt_015</item>
-        <item>@drawable/check2startautopilt_016</item>
-        <item>@drawable/check2startautopilt_017</item>
-        <item>@drawable/check2startautopilt_018</item>
-        <item>@drawable/check2startautopilt_019</item>
-
-        <item>@drawable/check2startautopilt_020</item>
-        <item>@drawable/check2startautopilt_021</item>
-        <item>@drawable/check2startautopilt_022</item>
-        <item>@drawable/check2startautopilt_023</item>
-        <item>@drawable/check2startautopilt_024</item>
-        <item>@drawable/check2startautopilt_025</item>
-        <item>@drawable/check2startautopilt_026</item>
-        <item>@drawable/check2startautopilt_027</item>
-        <item>@drawable/check2startautopilt_028</item>
-        <item>@drawable/check2startautopilt_029</item>
-
-
-        <item>@drawable/check2startautopilt_030</item>
-        <item>@drawable/check2startautopilt_031</item>
-        <item>@drawable/check2startautopilt_032</item>
-        <item>@drawable/check2startautopilt_033</item>
-        <item>@drawable/check2startautopilt_034</item>
-        <item>@drawable/check2startautopilt_035</item>
-        <item>@drawable/check2startautopilt_036</item>
-        <item>@drawable/check2startautopilt_037</item>
-        <item>@drawable/check2startautopilt_038</item>
-        <item>@drawable/check2startautopilt_039</item>
-
-        <item>@drawable/check2startautopilt_040</item>
-        <item>@drawable/check2startautopilt_041</item>
-        <item>@drawable/check2startautopilt_042</item>
-        <item>@drawable/check2startautopilt_043</item>
-        <item>@drawable/check2startautopilt_044</item>
-        <item>@drawable/check2startautopilt_045</item>
-        <item>@drawable/check2startautopilt_046</item>
-        <item>@drawable/check2startautopilt_047</item>
-        <item>@drawable/check2startautopilt_048</item>
-
-        <item>@drawable/check2startautopilt_050</item>
-        <item>@drawable/check2startautopilt_051</item>
-        <item>@drawable/check2startautopilt_052</item>
-        <item>@drawable/check2startautopilt_053</item>
-        <item>@drawable/check2startautopilt_054</item>
-        <item>@drawable/check2startautopilt_055</item>
-        <item>@drawable/check2startautopilt_056</item>
-        <item>@drawable/check2startautopilt_057</item>
-        <item>@drawable/check2startautopilt_058</item>
-
-        <item>@drawable/check2startautopilt_060</item>
-
-    </string-array>
 
 </resources>

OCH/taxi/pcommon/build.gradle

@@ -29,6 +29,15 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
+
+    sourceSets {
+        main {
+            res.srcDirs = [
+                    'src/main/res',
+                    'src/main/res/ani',
+            ]
+        }
+    }
 }
 
 dependencies {

OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/rightbar/RightBarView.kt

@@ -13,13 +13,10 @@ import com.bumptech.glide.Glide
 import com.bumptech.glide.request.RequestOptions
 import com.bumptech.glide.request.target.SimpleTarget
 import com.bumptech.glide.request.transition.Transition
-import com.mogo.commons.voice.AIAssist
 import com.mogo.eagle.core.utilcode.kotlin.onClick
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.och.common.module.manager.auditionmanager.AuditionManager
-import com.mogo.och.common.module.voice.VoiceNotice
 import com.mogo.och.taxi.passenger.common.R
-import kotlinx.android.synthetic.main.taxi_p_music_playing.view.iv_music_cover
 import kotlinx.android.synthetic.main.taxi_p_rightbar.view.ck_music
 import kotlinx.android.synthetic.main.taxi_p_rightbar.view.ck_setting
 import kotlinx.android.synthetic.main.taxi_p_rightbar.view.ck_setting_only