From c8c938788d734989391571260ddf9d211e01cf7e Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Mon, 28 Nov 2022 10:50:30 +0800
Subject: [PATCH] =?UTF-8?q?[2.13.0]=20taxi=20=E7=BB=93=E6=9D=9F=E8=A1=8C?=
 =?UTF-8?q?=E7=A8=8B=EF=BC=8C=E9=9D=9E=E8=87=AA=E9=A9=BE=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E4=B8=8B=E6=89=8D=E5=8F=AF=E7=BB=93=E6=9D=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/mogo/och/taxi/ui/BaseTaxiTabFragment.java     |  1 -
 .../och/taxi/ui/TaxiBeingServerdOrdersFragment.java   | 11 ++++++++++-
 .../main/java/com/mogo/och/taxi/ui/TaxiFragment.java  |  8 --------
 OCH/mogo-och-taxi/src/main/res/values/strings.xml     |  3 +++
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java
index 21e62525d1..ac21cdf9f1 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java
@@ -157,7 +157,6 @@ public abstract class BaseTaxiTabFragment<V extends IView, P extends Presenter<V
         // mTrafficLightView = findViewById(R.id.taxi_traffic_light_view);
         // CallerHmiManager.INSTANCE.setProxyTrafficLightView(mTrafficLightView);
 
-//        mPersonalBtn = findViewById(R.id.module_och_taxi_personal_layout);
         mSpeedView = findViewById(R.id.module_mogo_och_speed_tv);
         mCloseNaviIcon = findViewById(R.id.taxi_close_navi_icon);
         flNaviPanelContainer = findViewById(R.id.module_mogo_och_navi_panel_container);
diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java
index 15db97c799..bedc400eeb 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java
@@ -19,6 +19,8 @@ import androidx.constraintlayout.widget.ConstraintLayout;
 import com.amap.api.navi.model.NaviLatLng;
 import com.mogo.commons.AbsMogoApplication;
 import com.mogo.eagle.core.data.map.CenterLine;
+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.map.CallerHDMapManager;
 import com.mogo.eagle.core.function.call.map.CallerSmpManager;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
@@ -33,6 +35,7 @@ import com.mogo.och.common.module.map.ICommonNaviChangedCallback;
 import com.mogo.och.common.module.utils.DateTimeUtil;
 import com.mogo.och.common.module.utils.NumberFormatUtil;
 import com.mogo.och.common.module.utils.OCHThreadPoolManager;
+import com.mogo.och.common.module.utils.ToastUtilsOch;
 import com.mogo.och.common.module.voice.VoiceNotice;
 import com.mogo.och.common.module.wigets.OCHCommitDialog;
 import com.mogo.och.taxi.R;
@@ -451,7 +454,13 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment
             mTaxiFragment.completeOrderService();
             //VoiceNotice.showNotice(getResources().getString(R.string.module_och_taxi_order_server_completed_tip));
         }else if (TaxiOrderStatusEnum.OnTheWayToEnd.getCode() == mCurrentOrder.orderStatus){//前往目的地过程中可提前结束行程
-            closeOrderDialog();
+            //自驾中提示，接管后才能结束
+            if (CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo().getState()
+                 == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING){
+                ToastUtils.showLong(R.string.taxi_switch_line_btn_warning1);
+            }else {
+                closeOrderDialog();
+            }
         }
     }
 
diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java
index 8d0e62e260..2fb5dbf217 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java
@@ -2,8 +2,6 @@ package com.mogo.och.taxi.ui;
 
 import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_TAXI;
 
-import android.graphics.drawable.Drawable;
-import android.graphics.drawable.ScaleDrawable;
 import android.os.Build;
 import android.os.Bundle;
 import android.text.TextUtils;
@@ -38,8 +36,6 @@ import org.greenrobot.eventbus.ThreadMode;
 import java.lang.ref.WeakReference;
 import java.util.List;
 
-import me.jessyan.autosize.utils.AutoSizeUtils;
-
 /**
  * @author congtaowang
  * @since 2021/1/18
@@ -112,7 +108,6 @@ public class TaxiFragment extends BaseTaxiTabFragment<TaxiFragment, TaxiPresente
     @Override
     protected void initViews() {
         super.initViews();
-//        mPersonalBtn.setVisibility(View.GONE);
         initFragment();
         hidPanel();
         switchVRFlatMode(MogoStatusManager.getInstance().isVrMode());
@@ -192,15 +187,12 @@ public class TaxiFragment extends BaseTaxiTabFragment<TaxiFragment, TaxiPresente
                 mDriverRole.setVisibility(View.GONE);
             }
             tvOperationStatus.setText("暂停接单");
-//            mPersonalBtn.setVisibility(View.VISIBLE);
             tvOperationStatus.setCompoundDrawablesWithIntrinsicBounds(getResources().getDrawable(R.drawable.shape_size_operation_back), null, null, null);
             showPanel();
         } else {
             mDriverRole.setVisibility(View.GONE);
-//            AIAssist.getInstance(getContext()).speakTTSVoice("已接单");
             tvOperationStatus.setText("接单");
             tvOperationStatus.setCompoundDrawablesWithIntrinsicBounds(getResources().getDrawable(R.drawable.shape_size_operation_out), null, null, null);
-//            mPersonalBtn.setVisibility(View.GONE);
             hidPanel();
         }
     }
diff --git a/OCH/mogo-och-taxi/src/main/res/values/strings.xml b/OCH/mogo-och-taxi/src/main/res/values/strings.xml
index 4b74a8f5da..d6c8d2edd2 100644
--- a/OCH/mogo-och-taxi/src/main/res/values/strings.xml
+++ b/OCH/mogo-och-taxi/src/main/res/values/strings.xml
@@ -45,5 +45,8 @@
     <string name="module_och_taxi_order_server_start_auto_tip">您好，本次行程共%1$s%2$s，预计需要%3$d分钟，我们即将出发。出于安全考虑，建议您尽量不要与安全员交谈，后排落座，并系好安全带</string>
     <string name="module_och_taxi_order_arrive_end_200m_tip">即将到达目的地，请拿好随身物品，准备下车</string>
     <string name="module_och_taxi_order_auto_arrive_end_tip">您好，我们已到达目的地，本次体验结束。车辆停稳，请带好随身物品，谨防遗漏。感谢您的乘坐</string>
+
+    <string name="taxi_switch_line_btn_warning1">自动驾驶状态中，不可结束路线</string>
+
     <!-- endregion   -->
 </resources>
\ No newline at end of file