[Taxi-d 280, Taxi-p 130] taxi 乘客屏优化启动页UI

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

@@ -1,7 +1,5 @@
 package com.mogo.och.taxi.passenger.ui;
 
-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;
@@ -17,7 +15,6 @@ 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.UiThreadHandler;
 import com.mogo.map.MogoMapUIController;
@@ -303,7 +300,7 @@ public class TaxiPassengerBaseFragment extends MvpFragment<TaxiPassengerBaseFrag
         if (mStartAutopilotView == null || mStartAutopilotView.get() == null){
             return;
         }
-        mStartAutopilotView.get().updateStartAutopilotBtnStatus(isClickable);
+        mStartAutopilotView.get().handleStartAutopilotBtnStatus(isClickable);
     }
 
     public void onAutopilotStatusSuccessDone(){

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

@@ -5,7 +5,6 @@ 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;
@@ -13,7 +12,6 @@ import android.widget.TextView;
 import com.elegant.utils.UiThreadHandler;
 import com.mogo.eagle.core.utilcode.util.OverlayViewUtils;
 import com.mogo.eagle.core.utilcode.util.ToastUtils;
-import com.mogo.och.common.module.wigets.sfv.FrameFinishCallback;
 import com.mogo.och.common.module.wigets.sfv.FrameSurfaceView;
 import com.mogo.och.taxi.passenger.R;
 import com.mogo.och.taxi.passenger.callback.ITPClickStartAutopilotCallback;
@@ -73,6 +71,13 @@ public class TaxiPassengerStartAutopilotView extends RelativeLayout implements V
         svCarStartingFrame = view.findViewById(R.id.taxi_p_autopilot_starting);
         svCarStartingFrame.setBitmapIds(Arrays.asList(startingAnimIds));
         svCarStartingFrame.setDuration(1300);
+        svCarStartingFrame.setOnLongClickListener(new OnLongClickListener() {
+            @Override
+            public boolean onLongClick(View v) {
+                TaxiPassengerModel.getInstance().startServicePilotDone();
+                return false;
+            }
+        });
     }
 
     public void setOnClickStartAutopilotBtnCallback(ITPClickStartAutopilotCallback clickCallback){
@@ -97,21 +102,29 @@ public class TaxiPassengerStartAutopilotView extends RelativeLayout implements V
     }
 
     @SuppressLint("UseCompatLoadingForDrawables")
-    public void updateStartAutopilotBtnStatus(boolean isClickable){
+    public void handleStartAutopilotBtnStatus(boolean isClickable){
 
         if (svCarStartingFrame != null){
             svCarStartingFrame.setBackgroundResource(R.drawable.light_00000);
         }
-
         if (mStartAutopilotBtn == null) return;
-        if (isClickable){ //高亮可点击状态下UI
+
+        updateStartAutopilotBtnStatus(isClickable);
+
+        if (isClickable){ //高亮可点击状态下动画一直进行
+            startAutopilotBgAnimatorDrawable(true);
+        }else {// 置灰色可点击状态下动画停止
+            startAutopilotBgAnimatorDrawable(false);
+        }
+    }
+
+    public void updateStartAutopilotBtnStatus(boolean isClickable){
+        if (isClickable){
             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);
+        }else {
             mStartAutopilotBtn.setBackground(
                     mContext.getResources().getDrawable(R.drawable.taxi_p_start_autopilot_txt_btn_bg));
             mAutopilotBtnBg.setBackground(null);
@@ -121,7 +134,6 @@ public class TaxiPassengerStartAutopilotView extends RelativeLayout implements V
         mStartAutopilotBtn.setTag(isClickable);
         mStartAutopilotBtn.setText(
                 mContext.getResources().getString(R.string.taxi_p_start_autopilot_txt));
-
     }
 
     public void startAutopilotBgAnimatorDrawable(boolean isStart){
@@ -167,7 +179,7 @@ public class TaxiPassengerStartAutopilotView extends RelativeLayout implements V
         } else {
             clearBgAnimDrawable();
             isStarting = false;
-            updateStartAutopilotBtnStatus(true);
+            handleStartAutopilotBtnStatus(true);
         }
     }
 
@@ -203,10 +215,18 @@ public class TaxiPassengerStartAutopilotView extends RelativeLayout implements V
             public void run() { //未启动成功10s后做处理
                 if (isStarting){ //判断动画是否在进行
                     ToastUtils.showLong(R.string.taxi_p_start_autopilot_fail_10s_tip);
-                    startOrStopLoadingAnim(false);
+//                    startOrStopLoadingAnim(false);
+                    updateStatusCountDownOver();
                 }
 
             }
         },TIMER_START_AUTOPILOT_INTERVAL);
     }
+
+    private void updateStatusCountDownOver() {
+        isStarting = false;
+        startingCarBgAnimatorDrawable(false);
+        mStartAutopilotBtn.setText(
+                mContext.getResources().getString(R.string.taxi_p_start_autopilot_txt));
+    }
 }

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

@@ -4,227 +4,302 @@
     android:oneshot="false">
     <item
         android:drawable="@drawable/image_00000"
-        android:duration="100"></item>
+        android:duration="30"></item>
     <item
         android:drawable="@drawable/image_00001"
-        android:duration="100"></item>
+        android:duration="30"></item>
     <item
         android:drawable="@drawable/image_00002"
-        android:duration="100"></item>
+        android:duration="30"></item>
     <item
         android:drawable="@drawable/image_00003"
-        android:duration="100"></item>
+        android:duration="30"></item>
     <item
         android:drawable="@drawable/image_00004"
-        android:duration="100"></item>
+        android:duration="30"></item>
     <item
         android:drawable="@drawable/image_00005"
-        android:duration="100"></item>
+        android:duration="30"></item>
     <item
         android:drawable="@drawable/image_00006"
-        android:duration="100"></item>
+        android:duration="30"></item>
     <item
         android:drawable="@drawable/image_00007"
-        android:duration="100"></item>
+        android:duration="30"></item>
     <item
         android:drawable="@drawable/image_00008"
-        android:duration="100"></item>
+        android:duration="30"></item>
     <item
         android:drawable="@drawable/image_00009"
-        android:duration="100"></item>
+        android:duration="30"></item>
     <item
         android:drawable="@drawable/image_00010"
-        android:duration="100"></item>
+        android:duration="30"></item>
     <item
         android:drawable="@drawable/image_00011"
-        android:duration="100"></item>
+        android:duration="30"></item>
     <item
         android:drawable="@drawable/image_00012"
-        android:duration="100"></item>
+        android:duration="30"></item>
     <item
         android:drawable="@drawable/image_00013"
-        android:duration="100"></item>
+        android:duration="30"></item>
     <item
         android:drawable="@drawable/image_00014"
-        android:duration="100"></item>
+        android:duration="30"></item>
     <item
         android:drawable="@drawable/image_00015"
-        android:duration="100"></item>
+        android:duration="30"></item>
     <item
         android:drawable="@drawable/image_00016"
-        android:duration="100"></item>
+        android:duration="30"></item>
     <item
         android:drawable="@drawable/image_00017"
-        android:duration="100"></item>
+        android:duration="30"></item>
     <item
         android:drawable="@drawable/image_00018"
-        android:duration="100"></item>
+        android:duration="30"></item>
     <item
         android:drawable="@drawable/image_00019"
-        android:duration="100"></item>
+        android:duration="30"></item>
     <item
         android:drawable="@drawable/image_00020"
-        android:duration="100"></item>
+        android:duration="30"></item>
     <item
         android:drawable="@drawable/image_00021"
-        android:duration="100"></item>
+        android:duration="30"></item>
     <item
         android:drawable="@drawable/image_00022"
-        android:duration="100"></item>
+        android:duration="30"></item>
     <item
         android:drawable="@drawable/image_00023"
-        android:duration="100"></item>
+        android:duration="30"></item>
     <item
         android:drawable="@drawable/image_00024"
-        android:duration="100"></item>
+        android:duration="30"></item>
     <item
         android:drawable="@drawable/image_00025"
-        android:duration="100"></item>
+        android:duration="30"></item>
     <item
         android:drawable="@drawable/image_00026"
-        android:duration="100"></item>
+        android:duration="30"></item>
     <item
         android:drawable="@drawable/image_00027"
-        android:duration="100"></item>
+        android:duration="30"></item>
     <item
         android:drawable="@drawable/image_00028"
-        android:duration="100"></item>
+        android:duration="30"></item>
     <item
         android:drawable="@drawable/image_00029"
-        android:duration="100"></item>
+        android:duration="30"></item>
     <item
         android:drawable="@drawable/image_00030"
-        android:duration="100"></item>
+        android:duration="30"></item>
     <item
         android:drawable="@drawable/image_00031"
-        android:duration="100"></item>
+        android:duration="30"></item>
     <item
         android:drawable="@drawable/image_00032"
-        android:duration="100"></item>
+        android:duration="30"></item>
     <item
         android:drawable="@drawable/image_00033"
-        android:duration="100"></item>
+        android:duration="30"></item>
     <item
         android:drawable="@drawable/image_00034"
-        android:duration="100"></item>
+        android:duration="30"></item>
     <item
         android:drawable="@drawable/image_00035"
-        android:duration="100"></item>
+        android:duration="30"></item>
     <item
         android:drawable="@drawable/image_00036"
-        android:duration="100"></item>
+        android:duration="30"></item>
     <item
         android:drawable="@drawable/image_00037"
-        android:duration="100"></item>
+        android:duration="30"></item>
     <item
         android:drawable="@drawable/image_00038"
-        android:duration="100"></item>
+        android:duration="30"></item>
     <item
         android:drawable="@drawable/image_00039"
-        android:duration="100"></item>
+        android:duration="30"></item>
     <item
         android:drawable="@drawable/image_00040"
-        android:duration="100"></item>
+        android:duration="30"></item>
     <item
         android:drawable="@drawable/image_00041"
-        android:duration="100"></item>
+        android:duration="30"></item>
     <item
         android:drawable="@drawable/image_00042"
-        android:duration="100"></item>
+        android:duration="30"></item>
     <item
         android:drawable="@drawable/image_00043"
-        android:duration="100"></item>
+        android:duration="30"></item>
     <item
         android:drawable="@drawable/image_00044"
-        android:duration="100"></item>
+        android:duration="30"></item>
     <item
         android:drawable="@drawable/image_00045"
-        android:duration="100"></item>
+        android:duration="30"></item>
     <item
         android:drawable="@drawable/image_00046"
-        android:duration="100"></item>
+        android:duration="30"></item>
     <item
         android:drawable="@drawable/image_00047"
-        android:duration="100"></item>
+        android:duration="30"></item>
     <item
         android:drawable="@drawable/image_00048"
-        android:duration="100"></item>
+        android:duration="30"></item>
     <item
         android:drawable="@drawable/image_00049"
-        android:duration="100"></item>
+        android:duration="30"></item>
     <item
         android:drawable="@drawable/image_00050"
-        android:duration="100"></item>
+        android:duration="30"></item>
     <item
         android:drawable="@drawable/image_00051"
-        android:duration="100"></item>
+        android:duration="30"></item>
     <item
         android:drawable="@drawable/image_00052"
-        android:duration="100"></item>
+        android:duration="30"></item>
     <item
         android:drawable="@drawable/image_00053"
-        android:duration="100"></item>
+        android:duration="30"></item>
     <item
         android:drawable="@drawable/image_00054"
-        android:duration="100"></item>
+        android:duration="30"></item>
     <item
         android:drawable="@drawable/image_00055"
-        android:duration="100"></item>
+        android:duration="30"></item>
     <item
         android:drawable="@drawable/image_00056"
-        android:duration="100"></item>
+        android:duration="30"></item>
     <item
         android:drawable="@drawable/image_00057"
-        android:duration="100"></item>
+        android:duration="30"></item>
     <item
         android:drawable="@drawable/image_00058"
-        android:duration="100"></item>
+        android:duration="30"></item>
     <item
         android:drawable="@drawable/image_00059"
-        android:duration="100"></item>
+        android:duration="30"></item>
     <item
         android:drawable="@drawable/image_00060"
-        android:duration="100"></item>
+        android:duration="30"></item>
     <item
         android:drawable="@drawable/image_00061"
-        android:duration="100"></item>
+        android:duration="30"></item>
     <item
         android:drawable="@drawable/image_00062"
-        android:duration="100"></item>
+        android:duration="30"></item>
     <item
         android:drawable="@drawable/image_00063"
-        android:duration="100"></item>
+        android:duration="30"></item>
     <item
         android:drawable="@drawable/image_00064"
-        android:duration="100"></item>
+        android:duration="30"></item>
     <item
         android:drawable="@drawable/image_00065"
-        android:duration="100"></item>
+        android:duration="30"></item>
     <item
         android:drawable="@drawable/image_00066"
-        android:duration="100"></item>
+        android:duration="30"></item>
     <item
         android:drawable="@drawable/image_00067"
-        android:duration="100"></item>
+        android:duration="30"></item>
     <item
         android:drawable="@drawable/image_00068"
-        android:duration="100"></item>
+        android:duration="30"></item>
     <item
         android:drawable="@drawable/image_00069"
-        android:duration="100"></item>
+        android:duration="30"></item>
     <item
         android:drawable="@drawable/image_00070"
-        android:duration="100"></item>
+        android:duration="30"></item>
     <item
         android:drawable="@drawable/image_00071"
-        android:duration="100"></item>
+        android:duration="30"></item>
     <item
         android:drawable="@drawable/image_00072"
-        android:duration="100"></item>
+        android:duration="30"></item>
     <item
         android:drawable="@drawable/image_00073"
-        android:duration="100"></item>
+        android:duration="30"></item>
     <item
         android:drawable="@drawable/image_00074"
-        android:duration="100"></item>
+        android:duration="30"></item>
+    <item
+        android:drawable="@drawable/image_00075"
+        android:duration="30"></item>
+    <item
+        android:drawable="@drawable/image_00076"
+        android:duration="30"></item>
+    <item
+        android:drawable="@drawable/image_00077"
+        android:duration="30"></item>
+    <item
+        android:drawable="@drawable/image_00078"
+        android:duration="30"></item>
+    <item
+        android:drawable="@drawable/image_00079"
+        android:duration="30"></item>
+    <item
+        android:drawable="@drawable/image_00080"
+        android:duration="30"></item>
+    <item
+        android:drawable="@drawable/image_00081"
+        android:duration="30"></item>
+    <item
+        android:drawable="@drawable/image_00082"
+        android:duration="30"></item>
+    <item
+        android:drawable="@drawable/image_00083"
+        android:duration="30"></item>
+    <item
+        android:drawable="@drawable/image_00084"
+        android:duration="30"></item>
+    <item
+        android:drawable="@drawable/image_00085"
+        android:duration="30"></item>
+    <item
+        android:drawable="@drawable/image_00086"
+        android:duration="30"></item>
+    <item
+        android:drawable="@drawable/image_00087"
+        android:duration="30"></item>
+    <item
+        android:drawable="@drawable/image_00088"
+        android:duration="30"></item>
+    <item
+        android:drawable="@drawable/image_00089"
+        android:duration="30"></item>
+    <item
+        android:drawable="@drawable/image_00090"
+        android:duration="30"></item>
+    <item
+        android:drawable="@drawable/image_00091"
+        android:duration="30"></item>
+    <item
+        android:drawable="@drawable/image_00092"
+        android:duration="30"></item>
+    <item
+        android:drawable="@drawable/image_00093"
+        android:duration="30"></item>
+    <item
+        android:drawable="@drawable/image_00094"
+        android:duration="30"></item>
+    <item
+        android:drawable="@drawable/image_00095"
+        android:duration="30"></item>
+    <item
+        android:drawable="@drawable/image_00096"
+        android:duration="30"></item>
+    <item
+        android:drawable="@drawable/image_00097"
+        android:duration="30"></item>
+    <item
+        android:drawable="@drawable/image_00098"
+        android:duration="30"></item>
+    <item
+        android:drawable="@drawable/image_00099"
+        android:duration="30"></item>
 </animation-list>