From caa5dc7df6064aeee26cfdb0bcc06a7d7c353d4b Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Fri, 24 Jun 2022 18:41:41 +0800
Subject: [PATCH] =?UTF-8?q?[Taxi-d=20280,=20Taxi-p=20130]=20Taxi=E4=B9=98?=
 =?UTF-8?q?=E5=AE=A2=E5=B1=8F=E5=92=8C=E5=8F=B8=E6=9C=BA=E5=B1=8F=E8=81=94?=
 =?UTF-8?q?=E8=B0=83=E6=B5=8B=E8=AF=95=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/wigets/sfv/FrameSurfaceView.java   |  2 +-
 .../presenter/BaseTaxiPassengerPresenter.java |  2 +-
 .../ui/TaxiPassengerBaseFragment.java         |  2 +-
 .../ui/TaxiPassengerStartAutopilotView.java   | 36 ++++++++++++++++---
 .../taxi_p_start_autopilot_txt_btn_bg.xml     |  1 -
 .../layout/taxi_p_start_autopilot_view.xml    | 22 ++++++------
 .../src/main/res/values-sw320dp/dimens.xml    |  4 +--
 .../res/values-xhdpi-2560x1440/dimens.xml     |  4 +--
 .../src/main/res/values/dimens.xml            |  4 +--
 .../com/mogo/och/taxi/model/TaxiModel.java    |  1 -
 .../och/taxi/presenter/TaxiPresenter.java     |  5 +++
 11 files changed, 56 insertions(+), 27 deletions(-)

diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/sfv/FrameSurfaceView.java b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/sfv/FrameSurfaceView.java
index 1503e13f07..08b77de55c 100644
--- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/sfv/FrameSurfaceView.java
+++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/sfv/FrameSurfaceView.java
@@ -394,7 +394,7 @@ public class FrameSurfaceView extends BaseSurfaceView {
         public void run() {
             decodedBitmapByReuse(bitmapIds.get(index), options);
             index++;
-            if (index < bitmapIds.size()) {
+            if (index < bitmapIds.size() && null != handler) {
                 handler.post(this);
             } else {
                 index = 0;
diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.java
index ced41770c1..7522010791 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.java
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.java
@@ -188,8 +188,8 @@ public class BaseTaxiPassengerPresenter extends Presenter<TaxiPassengerBaseFragm
         }
         if (TaxiPassengerOrderStatusEnum.OnTheWayToEnd.getCode() == order.orderStatus){
             runOnUIThread(() ->{
-                mView.showOrHideServingOrderFragment(true);
                 mView.showOrHideStartAutopilotView(false,false);
+                mView.showOrHideServingOrderFragment(true);
             });
             TaxiPassengerModel.getInstance().startOrStopReadyToAutopilotoop(false);
         }
diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java
index 247ccc70de..82b623e706 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java
@@ -298,7 +298,7 @@ public class TaxiPassengerBaseFragment extends MvpFragment<TaxiPassengerBaseFrag
                 return;
             }
             mStartAutopilotView.get().setOnClickStartAutopilotBtnCallback(null);
-            OverlayViewUtils.dismissOverlayView(mStartAutopilotView.get());
+            mStartAutopilotView.get().closeAllAnimsAndView();
         }
     }
 
diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerStartAutopilotView.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerStartAutopilotView.java
index 1763420323..352a094d8b 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerStartAutopilotView.java
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerStartAutopilotView.java
@@ -11,6 +11,7 @@ import android.widget.RelativeLayout;
 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;
@@ -28,6 +29,7 @@ public class TaxiPassengerStartAutopilotView extends RelativeLayout implements V
 
     private TextView mStartAutopilotBtn;
     private ImageView mAutopilotBtnBg;
+    private ImageView mCloseIV;
     private ITPClickStartAutopilotCallback mClickCallback;
     public boolean isStarting = false;
     private AnimationDrawable mAnimationBtnDrawable;
@@ -63,6 +65,9 @@ public class TaxiPassengerStartAutopilotView extends RelativeLayout implements V
         mStartAutopilotBtn = view.findViewById(R.id.taxi_p_start_autopilot);
         mStartAutopilotBtn.setOnClickListener(this);
 
+        mCloseIV = view.findViewById(R.id.starting_autopilot_view_close);
+        mCloseIV.setOnClickListener(this);
+
         mAutopilotBtnBg = view.findViewById(R.id.taxi_p_autopilot_btn_bg);
 
         svCarStartingFrame = view.findViewById(R.id.taxi_p_autopilot_starting);
@@ -93,13 +98,17 @@ public class TaxiPassengerStartAutopilotView extends RelativeLayout implements V
                 startOrStopLoadingAnim(true);
                 if (mClickCallback != null) mClickCallback.onClickCallback();
             }
+        }else if (v.getId() == R.id.starting_autopilot_view_close){
+            OverlayViewUtils.dismissOverlayView(this);
         }
     }
 
     @SuppressLint("UseCompatLoadingForDrawables")
     public void updateStartAutopilotBtnStatus(boolean isClickable){
 
-        svCarStartingFrame.setBackgroundResource(R.drawable.light_00000);
+        if (svCarStartingFrame != null){
+            svCarStartingFrame.setBackgroundResource(R.drawable.light_00000);
+        }
 
         if (mStartAutopilotBtn == null) return;
         if (isClickable){ //高亮可点击状态下UI
@@ -139,13 +148,15 @@ public class TaxiPassengerStartAutopilotView extends RelativeLayout implements V
     }
 
     private void startingCarBgAnimatorDrawable(boolean isStart){
-        if (isStart){
+        if (isStart && svCarStartingFrame != null){
             svCarStartingFrame.setRepeatTimes(-1);
             svCarStartingFrame.setBackground(null);
             svCarStartingFrame.start();
         }else {
-            svCarStartingFrame.reset();
-            svCarStartingFrame.setBackgroundResource(R.drawable.light_00000);
+            if (svCarStartingFrame != null){
+                svCarStartingFrame.reset();
+                svCarStartingFrame.setBackgroundResource(R.drawable.light_00000);
+            }
         }
 
     }
@@ -167,13 +178,28 @@ public class TaxiPassengerStartAutopilotView extends RelativeLayout implements V
         }
     }
 
-    private void clearBgAnimDrawable() {
+    public void clearBgAnimDrawable() {
         if (mAnimationBtnDrawable != null) {
             mAnimationBtnDrawable.stop();
         }
         mAnimationBtnDrawable = null;
     }
 
+    public void closeAllAnimsAndView(){
+        clearStartingAnimFrame();
+        if (mAnimationBtnDrawable != null) {
+            mAnimationBtnDrawable.stop();
+        }
+        isStarting = false;
+        OverlayViewUtils.dismissOverlayView(this);
+    }
+
+    public void clearStartingAnimFrame(){
+        if (svCarStartingFrame != null){
+            svCarStartingFrame.destroy();
+        }
+        svCarStartingFrame = null;
+    }
     public void onAutopilotStatusSuccess(){
         startOrStopLoadingAnim(false);
     }
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_start_autopilot_txt_btn_bg.xml b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_start_autopilot_txt_btn_bg.xml
index 6e6e5b6729..dc7ba06b43 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_start_autopilot_txt_btn_bg.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_start_autopilot_txt_btn_bg.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <size android:width="520px" android:height="150px"/>
             <corners android:radius="76px"/>
             <gradient
                 android:angle="180"
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_start_autopilot_view.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_start_autopilot_view.xml
index c95877304a..cb23e927ce 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_start_autopilot_view.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_start_autopilot_view.xml
@@ -15,29 +15,29 @@
         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"-->
-<!--            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/starting_autopilot_view_close"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:src="@drawable/taxi_p_passenger_arrived_close"
+        android:layout_marginEnd="@dimen/dp_70"
+        android:layout_marginTop="@dimen/dp_140"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
 
     <ImageView
         android:id="@+id/taxi_p_autopilot_btn_bg"
         android:layout_width="1000px"
         android:layout_height="500px"
         android:clickable="false"
-        android:background="@drawable/anmi_flow"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent" />
 
     <TextView
         android:id="@+id/taxi_p_start_autopilot"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="@dimen/taxi_p_start_autopilot_btn_width"
+        android:layout_height="@dimen/taxi_p_start_autopilot_btn_height"
         android:gravity="center"
         android:text="@string/taxi_p_start_autopilot_txt"
         android:textColor="@color/taxi_p_start_autopilot_txt_color"
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/values-sw320dp/dimens.xml b/OCH/mogo-och-taxi-passenger/src/main/res/values-sw320dp/dimens.xml
index 5b26b8687b..e7c921b084 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/res/values-sw320dp/dimens.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/values-sw320dp/dimens.xml
@@ -63,6 +63,6 @@
     <dimen name="taxi_p_route_txt_unit_size">28px</dimen>
 
     <dimen name="taxi_p_start_autopilot_txt_size">52px</dimen>
-    <dimen name="taxi_p_start_autopilot_btn_width">1000px</dimen>
-    <dimen name="taxi_p_start_autopilot_btn_height">500px</dimen>
+    <dimen name="taxi_p_start_autopilot_btn_width">520px</dimen>
+    <dimen name="taxi_p_start_autopilot_btn_height">150px</dimen>
 </resources>
\ No newline at end of file
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/values-xhdpi-2560x1440/dimens.xml b/OCH/mogo-och-taxi-passenger/src/main/res/values-xhdpi-2560x1440/dimens.xml
index b1e2c1dd14..5b3282e466 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/res/values-xhdpi-2560x1440/dimens.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/values-xhdpi-2560x1440/dimens.xml
@@ -126,7 +126,7 @@
     <dimen name="taxi_p_route_txt_unit_size">28px</dimen>
 
     <dimen name="taxi_p_start_autopilot_txt_size">52px</dimen>
-    <dimen name="taxi_p_start_autopilot_btn_width">1000px</dimen>
-    <dimen name="taxi_p_start_autopilot_btn_height">500px</dimen>
+    <dimen name="taxi_p_start_autopilot_btn_width">520px</dimen>
+    <dimen name="taxi_p_start_autopilot_btn_height">150px</dimen>
 
 </resources>
\ No newline at end of file
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/values/dimens.xml b/OCH/mogo-och-taxi-passenger/src/main/res/values/dimens.xml
index a453e6d3b3..8218eb8018 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/res/values/dimens.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/values/dimens.xml
@@ -121,6 +121,6 @@
     <dimen name="taxi_p_route_txt_unit_size">28px</dimen>
 
     <dimen name="taxi_p_start_autopilot_txt_size">52px</dimen>
-    <dimen name="taxi_p_start_autopilot_btn_width">1000px</dimen>
-    <dimen name="taxi_p_start_autopilot_btn_height">500px</dimen>
+    <dimen name="taxi_p_start_autopilot_btn_width">520px</dimen>
+    <dimen name="taxi_p_start_autopilot_btn_height">150px</dimen>
 </resources>
\ No newline at end of file
diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java
index ef85f1b00f..9bbe129e2c 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java
@@ -262,7 +262,6 @@ public class TaxiModel {
                             //更新view
                             CallerLogger.INSTANCE.d(M_TAXI + TAG, "changeCarStatus:" + mOCHCarStatus);
                             startOrStopOrderLoop(mOCHCarStatus == 1);
-                            queryAutopilotStatus(mOCHCarStatus == 1);
                             String role = "";
                             if (TaxiDriverRoleEnum.DEMO.getCode() == data.data.purpose) {
                                 role = TaxiConst.DEMO_USER;
diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java
index 58b2927aef..58d80c572c 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java
@@ -205,9 +205,14 @@ public class TaxiPresenter extends Presenter<TaxiFragment> implements ITaxiADASS
     @Override
     public void onCurrentOrderStatusChanged(OrderQueryRespBean.Result order) {
         CallerLogger.INSTANCE.d(M_TAXI + TAG,"order = "+order.toString());
+        if (TaxiOrderStatusEnum.UserArriveAtStart.getCode() == order.orderStatus){
+            TaxiModel.getInstance().queryAutopilotStatus(true);
+        }
+
         if (TaxiOrderStatusEnum.OnTheWayToEnd.getCode() == order.orderStatus){
             TaxiModel.getInstance().startDynamicCalculateRouteInfo();
         }
+
         if (TaxiOrderStatusEnum.ArriveAtEnd.getCode() == order.orderStatus ||
             TaxiOrderStatusEnum.Cancel.getCode() == order.orderStatus ||
             TaxiOrderStatusEnum.JourneyCompleted.getCode() == order.orderStatus){