[Taxi-d 280, Taxi-p 130] Taxi乘客屏动画效果优化

OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceManager.java

@@ -186,7 +186,7 @@ public class TaxiPassengerServiceManager {
             ,TaxiPassengerServiceCallback<TaxiPassengerBaseRespBean> callback){
         mOCHTaxiServiceApi.startServicePilotDone(MoGoAiCloudClientConfig.getInstance().getServiceAppId()
                 ,MoGoAiCloudClientConfig.getInstance().getToken()
-                ,new TaxiPassengerStartReqBean(MoGoAiCloudClientConfig.getInstance().getSn()
+                ,new TaxiPassengerStartReqBean(getDriverAppSn()
                         ,orderNo,loc))
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())

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

@@ -1,13 +1,12 @@
 package com.mogo.och.taxi.passenger.ui;
 
-import android.animation.ObjectAnimator;
+import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_TAXI_P;
+
 import android.os.Handler;
 import android.os.Looper;
 import android.view.View;
-import android.view.animation.LinearInterpolator;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
-import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.fragment.app.FragmentTransaction;
@@ -18,15 +17,14 @@ 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.mogo.logger.CallerLogger;
 import com.mogo.eagle.core.utilcode.util.OverlayViewUtils;
-import com.mogo.eagle.core.utilcode.util.ToastUtils;
 import com.mogo.map.MogoMapUIController;
 import com.mogo.map.MogoMarkerManager;
 import com.mogo.map.listener.IMogoMapListener;
 import com.mogo.map.uicontroller.VisualAngleMode;
 import com.mogo.module.common.MogoApisHandler;
 import com.mogo.module.common.constants.DataTypes;
-import com.mogo.och.common.module.wigets.OCHBorderShadowLayout;
 import com.mogo.och.taxi.passenger.R;
 import com.mogo.och.taxi.passenger.callback.ITPClickStartAutopilotCallback;
 import com.mogo.och.taxi.passenger.presenter.BaseTaxiPassengerPresenter;
@@ -182,9 +180,7 @@ public class TaxiPassengerBaseFragment extends MvpFragment<TaxiPassengerBaseFrag
             if (IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING == status
                     && mPrevAPStatus != status) {
                 // 2. 主动开启自动驾驶中，为2则停止loading，并isStarting = false
-                if ( mStartAutopilotView != null && mStartAutopilotView.get() != null){
-                    mStartAutopilotView.get().startOrStopLoadingAnim(false);
-                }
+                onAutopilotStatusSuccessDone();
             }
             // 3. 其他过程直接更新
             if (mPrevAPStatus != status){
@@ -287,6 +283,10 @@ public class TaxiPassengerBaseFragment extends MvpFragment<TaxiPassengerBaseFrag
             OverlayViewUtils.showOverlayView(getActivity(),mStartAutopilotView.get());
             updateStartAutopilotBtnStatus(isClickable);
         }else {
+            CallerLogger.INSTANCE.d(M_TAXI_P+" showOrHideStartAutopilotView","mStartAutopilotView = " + mStartAutopilotView);
+            if (mStartAutopilotView != null){
+                CallerLogger.INSTANCE.d(M_TAXI_P+" showOrHideStartAutopilotView","mStartAutopilotView.get() = " + mStartAutopilotView.get());
+            }
             if (mStartAutopilotView == null || mStartAutopilotView.get() == null){
                 return;
             }
@@ -302,6 +302,13 @@ public class TaxiPassengerBaseFragment extends MvpFragment<TaxiPassengerBaseFrag
         mStartAutopilotView.get().updateStartAutopilotBtnStatus(isClickable);
     }
 
+    public void onAutopilotStatusSuccessDone(){
+        if (mStartAutopilotView == null || mStartAutopilotView.get() == null){
+            return;
+        }
+        mStartAutopilotView.get().onAutopilotStatusSuccess();
+    }
+
     /**
      * 显示或者隐藏到达乘客站点的洁面
      * ① 取消订单   可有可无

OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerStartAutopilotView.java

@@ -1,9 +1,12 @@
 package com.mogo.och.taxi.passenger.ui;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.graphics.drawable.AnimationDrawable;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.widget.Button;
+import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
@@ -24,93 +27,14 @@ import java.util.Arrays;
 public class TaxiPassengerStartAutopilotView extends RelativeLayout implements View.OnClickListener {
 
     private TextView mStartAutopilotBtn;
-//    private ImageView mAutopilotStartingImage;
+    private ImageView mAutopilotBtnBg;
     private ITPClickStartAutopilotCallback mClickCallback;
     public boolean isStarting = false;
     private AnimationDrawable mAnimationBtnDrawable;
-    private AnimationDrawable mAnimationStartingDrawable;
     private static final long TIMER_START_AUTOPILOT_INTERVAL = 10 * 1000L;
     private Context mContext;
     private View view;
     private FrameSurfaceView svCarStartingFrame;
-    private FrameSurfaceView svBtnBgFrame;
-    private Integer[] btnBgAnimIds = new Integer[]{
-            R.drawable.image_00000,
-            R.drawable.image_00001,
-            R.drawable.image_00002,
-            R.drawable.image_00003,
-            R.drawable.image_00004,
-            R.drawable.image_00005,
-            R.drawable.image_00006,
-            R.drawable.image_00007,
-            R.drawable.image_00008,
-            R.drawable.image_00009,
-            R.drawable.image_00010,
-            R.drawable.image_00011,
-            R.drawable.image_00012,
-            R.drawable.image_00013,
-            R.drawable.image_00014,
-            R.drawable.image_00015,
-            R.drawable.image_00016,
-            R.drawable.image_00017,
-            R.drawable.image_00018,
-            R.drawable.image_00019,
-            R.drawable.image_00020,
-            R.drawable.image_00021,
-            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
-    };
     private Integer[] startingAnimIds = new Integer[]{
             R.drawable.light_00000,
             R.drawable.light_00001,
@@ -138,15 +62,12 @@ public class TaxiPassengerStartAutopilotView extends RelativeLayout implements V
         view = LayoutInflater.from(context).inflate(R.layout.taxi_p_start_autopilot_view, this,true);
         mStartAutopilotBtn = view.findViewById(R.id.taxi_p_start_autopilot);
         mStartAutopilotBtn.setOnClickListener(this);
-//        mAutopilotStartingImage = view.findViewById(R.id.taxi_p_autopilot_starting);
+
+        mAutopilotBtnBg = view.findViewById(R.id.taxi_p_autopilot_btn_bg);
+
         svCarStartingFrame = view.findViewById(R.id.taxi_p_autopilot_starting);
         svCarStartingFrame.setBitmapIds(Arrays.asList(startingAnimIds));
         svCarStartingFrame.setDuration(1680);
-
-        svBtnBgFrame = view.findViewById(R.id.taxi_p_start_autopilot_btn_sfv);
-        svBtnBgFrame.setBitmapIds(Arrays.asList(btnBgAnimIds));
-        svBtnBgFrame.setDuration(7500);
-
         svCarStartingFrame.setOnLongClickListener(new OnLongClickListener() {
             @Override
             public boolean onLongClick(View v) {
@@ -175,69 +96,51 @@ public class TaxiPassengerStartAutopilotView extends RelativeLayout implements V
         }
     }
 
+    @SuppressLint("UseCompatLoadingForDrawables")
     public void updateStartAutopilotBtnStatus(boolean isClickable){
 
         svCarStartingFrame.setBackgroundResource(R.drawable.light_00000);
 
         if (mStartAutopilotBtn == null) return;
-
-        mStartAutopilotBtn.setTag(isClickable);
-        mStartAutopilotBtn.setText(
-                mContext.getResources().getString(R.string.taxi_p_start_autopilot_txt));
-
         if (isClickable){ //高亮可点击状态下UI
             mStartAutopilotBtn.setTextColor(
                     mContext.getResources().getColor(R.color.taxi_p_start_autopilot_txt_color));
             mStartAutopilotBtn.setBackground(null);
+            mAutopilotBtnBg.setBackground(mContext.getResources().getDrawable(R.drawable.anmi_flow));
             startAutopilotBgAnimatorDrawable(true);
         }else {// 置灰色可点击状态下 UI
+            startAutopilotBgAnimatorDrawable(false);
             mStartAutopilotBtn.setBackground(
                     mContext.getResources().getDrawable(R.drawable.taxi_p_start_autopilot_txt_btn_bg));
+            mAutopilotBtnBg.setBackground(null);
             mStartAutopilotBtn.setTextColor(
                     mContext.getResources().getColor(R.color.taxi_p_start_autopilot_txt_un_color));
-            startAutopilotBgAnimatorDrawable(false);
         }
+        mStartAutopilotBtn.setTag(isClickable);
+        mStartAutopilotBtn.setText(
+                mContext.getResources().getString(R.string.taxi_p_start_autopilot_txt));
+
     }
 
     public void startAutopilotBgAnimatorDrawable(boolean isStart){
+
         if (isStart){
-            svBtnBgFrame.setRepeatTimes(-1);
-            svBtnBgFrame.setFrameFinishCallback(new FrameFinishCallback() {
-                @Override
-                public void onFinishCallback() {
-//                    svBtnBgFrame.setBackgroundResource(R.drawable.image_00000);
-                }
-            });
-            svBtnBgFrame.start();
+            if (mAnimationBtnDrawable == null) {
+                mAnimationBtnDrawable = (AnimationDrawable) mAutopilotBtnBg.getBackground();
+            }
+            if (mAnimationBtnDrawable.isRunning()) {
+                return;
+            }
+            mAnimationBtnDrawable.selectDrawable(0);
+            mAnimationBtnDrawable.start();
         }else {
-            svBtnBgFrame.reset();
-            svBtnBgFrame.setBackground(null);
+            clearBgAnimDrawable();
         }
-        //        if (isStart){
-//            if (mAnimationBtnDrawable == null) {
-//                mAnimationBtnDrawable = (AnimationDrawable) mStartAutopilotBtn.getBackground();
-//            }
-//            if (mAnimationBtnDrawable.isRunning()) {
-//                return;
-//            }
-//            mAnimationBtnDrawable.selectDrawable(0);
-//            mAnimationBtnDrawable.start();
-//        }else {
-//            if (mAnimationBtnDrawable != null) {
-//                mAnimationBtnDrawable.stop();
-//            }
-//            mAnimationBtnDrawable = null;
-//        }
     }
 
     private void startingCarBgAnimatorDrawable(boolean isStart){
         if (isStart){
             svCarStartingFrame.setRepeatTimes(-1);
-            svCarStartingFrame.setFrameFinishCallback(new FrameFinishCallback() {
-                @Override
-                public void onFinishCallback() {
-                }
-            });
             svCarStartingFrame.setBackground(null);
             svCarStartingFrame.start();
         }else {
@@ -245,44 +148,33 @@ public class TaxiPassengerStartAutopilotView extends RelativeLayout implements V
             svCarStartingFrame.setBackgroundResource(R.drawable.light_00000);
         }
 
-//        if (isStart){
-//            if (mAnimationStartingDrawable == null) {
-//                mAnimationStartingDrawable = (AnimationDrawable) mAutopilotStartingImage.getBackground();
-//            }
-//            if (mAnimationStartingDrawable.isRunning()) {
-//                return;
-//            }
-//            mAnimationStartingDrawable.selectDrawable(0);
-//            mAnimationStartingDrawable.start();
-//        }else {
-//            if (mAnimationStartingDrawable != null) {
-//                mAnimationStartingDrawable.selectDrawable(0);
-//                mAnimationStartingDrawable.stop();
-//            }
-//            mAnimationStartingDrawable = null;
-//        }
     }
 
     public void startOrStopLoadingAnim(boolean start) {
+
         startingCarBgAnimatorDrawable(start);
+
         if (start) {
             isStarting = true;
-
             mStartAutopilotBtn.setText(getResources().getString(R.string.taxi_p_start_autopilot_loading));
             mStartAutopilotBtn.setTextColor(getResources().getColor(R.color.taxi_p_start_autopilot_txt_color));
 
             startingAutopilotCountDown();
         } else {
+            clearBgAnimDrawable();
             isStarting = false;
             updateStartAutopilotBtnStatus(true);
         }
     }
 
-    public void onAutopilotStatusSuccess(){
-        startOrStopLoadingAnim(false);
+    private void clearBgAnimDrawable() {
+        if (mAnimationBtnDrawable != null) {
+            mAnimationBtnDrawable.stop();
+        }
+        mAnimationBtnDrawable = null;
     }
 
-    public void onAutopilotStatusFailure(){
+    public void onAutopilotStatusSuccess(){
         startOrStopLoadingAnim(false);
     }
 

OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_start_autopilot_view.xml

@@ -4,38 +4,49 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:ignore="MissingDefaultResource"
-    android:background="@drawable/taxi_p_passenger_start_panel_bg">
+    android:background="@drawable/taxi_p_passenger_start_panel_bg"
+    tools:ignore="MissingDefaultResource">
 
     <com.mogo.och.common.module.wigets.sfv.FrameSurfaceView
-            android:id="@+id/taxi_p_autopilot_starting"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintTop_toTopOf="parent"/>
+        android:id="@+id/taxi_p_autopilot_starting"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
-    <com.mogo.och.common.module.wigets.sfv.FrameSurfaceView
-        android:id="@+id/taxi_p_start_autopilot_btn_sfv"
+<!--        <com.mogo.och.common.module.wigets.sfv.FrameSurfaceView-->
+<!--            android:id="@+id/taxi_p_start_autopilot_btn_sfv"-->
+<!--            android:layout_width="1000px"-->
+<!--            android:layout_height="500px"-->
+<!--            android:clickable="false"-->
+<!--            app:layout_constraintBottom_toBottomOf="parent"-->
+<!--            app:layout_constraintLeft_toLeftOf="parent"-->
+<!--            app:layout_constraintRight_toRightOf="parent" />-->
+
+    <ImageView
+        android:id="@+id/taxi_p_autopilot_btn_bg"
         android:layout_width="1000px"
         android:layout_height="500px"
         android:clickable="false"
-        android:elevation="1dp"
+        android:background="@drawable/anmi_flow"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"/>
-        <TextView
-            android:id="@+id/taxi_p_start_autopilot"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/taxi_p_start_autopilot_txt"
-            android:textSize="@dimen/taxi_p_start_autopilot_txt_size"
-            android:textStyle="bold"
-            android:textColor="@color/taxi_p_start_autopilot_txt_un_color"
-            android:elevation="5dp"
-            app:layout_constraintLeft_toLeftOf="@+id/taxi_p_start_autopilot_btn_sfv"
-            app:layout_constraintRight_toRightOf="@+id/taxi_p_start_autopilot_btn_sfv"
-            app:layout_constraintTop_toTopOf="@+id/taxi_p_start_autopilot_btn_sfv"
-            app:layout_constraintBottom_toBottomOf="@+id/taxi_p_start_autopilot_btn_sfv"/>
+        app:layout_constraintRight_toRightOf="parent" />
+
+    <TextView
+        android:id="@+id/taxi_p_start_autopilot"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:text="@string/taxi_p_start_autopilot_txt"
+        android:textColor="@color/taxi_p_start_autopilot_txt_color"
+        android:textSize="@dimen/taxi_p_start_autopilot_txt_size"
+        android:textStyle="bold"
+        android:background="@drawable/taxi_p_start_autopilot_txt_btn_bg"
+        app:layout_constraintBottom_toBottomOf="@+id/taxi_p_autopilot_btn_bg"
+        app:layout_constraintLeft_toLeftOf="@+id/taxi_p_autopilot_btn_bg"
+        app:layout_constraintRight_toRightOf="@+id/taxi_p_autopilot_btn_bg"
+        app:layout_constraintTop_toTopOf="@+id/taxi_p_autopilot_btn_bg"/>
+
 </androidx.constraintlayout.widget.ConstraintLayout>