From 29d9a7905b972a8be2fc2b87dffc3fec96ab955f Mon Sep 17 00:00:00 2001 From: pangfan Date: Sat, 2 Apr 2022 14:53:42 +0800 Subject: [PATCH] =?UTF-8?q?[Bus/Taxi=20d=202.6.5]1.=E4=BC=98=E5=8C=96taxi?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81enum=EF=BC=9B2.=E5=9C=B0?= =?UTF-8?q?=E5=9B=BE->2.0.9.11=EF=BC=88=E8=A7=A3=E5=86=B3=E8=87=AA?= =?UTF-8?q?=E8=BD=A6=E6=A8=A1=E5=9E=8B=E5=88=87=E6=8D=A2=E9=97=AE=E9=A2=98?= =?UTF-8?q?=EF=BC=89=EF=BC=9B3.version->2.6.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../constant/TaxiPassengerOrderStatusEnum.kt | 10 +++--- .../passenger/model/TaxiPassengerModel.java | 8 ++--- .../presenter/BaseTaxiPassengerPresenter.java | 10 ++---- .../TaxiPassengerServingOrderPresenter.java | 10 ++---- .../ui/TaxiPassengerServingOrderFragment.java | 8 ++--- .../mogo/och/taxi/constant/OrderStatusEnum.kt | 10 +++--- .../och/taxi/model/MogoOCHTaxiModelNew.java | 33 +++++++++---------- .../och/taxi/presenter/OCHTaxiPresenter.java | 4 +-- .../ui/OCHTaxiBeingServerdOrdersFragment.java | 18 +++++----- .../com/mogo/och/taxi/ui/OCHTaxiFragment.java | 7 ++-- .../och/taxi/ui/OCHTaxiOrderCancelDialog.java | 8 ++--- gradle.properties | 6 ++-- 12 files changed, 58 insertions(+), 74 deletions(-) diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/constant/TaxiPassengerOrderStatusEnum.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/constant/TaxiPassengerOrderStatusEnum.kt index eac42d045d..1e3ec5ccd0 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/constant/TaxiPassengerOrderStatusEnum.kt +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/constant/TaxiPassengerOrderStatusEnum.kt @@ -25,11 +25,11 @@ package com.mogo.och.taxi.passenger.constant */ enum class TaxiPassengerOrderStatusEnum(val code: Int) { None( 0 ), - OnTheWayToStartStation( 10), - ArriveAtStartStation( 20), - UserArriveAtStartStation( 30), - OnTheWayToEndStation( 40), - ArriveAtEndStation( 50), + OnTheWayToStart( 10), + ArriveAtStart( 20), + UserArriveAtStart( 30), + OnTheWayToEnd( 40), + ArriveAtEnd( 50), JourneyCompleted(60),//行程完成 Cancel( 70); diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java index 2579d0b312..4b10e44624 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java @@ -46,7 +46,6 @@ import com.mogo.och.taxi.passenger.network.TaxiPassengerServiceCallback; import com.mogo.och.taxi.passenger.network.TaxiPassengerServiceManager; import com.mogo.aicloud.services.socket.IMogoLifecycleListener; import com.mogo.och.taxi.passenger.utils.TPCoordinateCalculateRouteUtil; -import com.mogo.service.IMogoServiceApis; import com.mogo.service.intent.IMogoIntentListener; import com.mogo.service.statusmanager.IMogoStatusChangedListener; import com.mogo.service.statusmanager.StatusDescriptor; @@ -242,6 +241,7 @@ public class TaxiPassengerModel implements IOCHTaxiPassengerNaviChangedCallback CallerAutoPilotStatusListenerManager.INSTANCE.removeListener(mGoAutopilotStatusListener); CallerAutopilotPlanningListenerManager.INSTANCE.removeListener(moGoAutopilotPlanningListener); + CallLimitingVelocityListenerManager.INSTANCE.removeListener(limitingVelocityListener); } private void startOrStopOrderLoop(boolean start) { @@ -465,7 +465,7 @@ public class TaxiPassengerModel implements IOCHTaxiPassengerNaviChangedCallback public void onCarLocationChanged2( Location location ) { //位置变化时，通过围栏判断是否到达x点 if (location != null && checkCurrentOCHOrder()) { - if (getCurOrderStatus() == TaxiPassengerOrderStatusEnum.OnTheWayToEndStation) { + if (getCurOrderStatus() == TaxiPassengerOrderStatusEnum.OnTheWayToEnd) { calculateTravelDistance(location); } } @@ -494,7 +494,7 @@ public class TaxiPassengerModel implements IOCHTaxiPassengerNaviChangedCallback if (state == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING) { if (mADASStatusCallback != null) mADASStatusCallback.onAutopilotRunning(); if (mCurrentOCHOrder != null - && getCurOrderStatus() == TaxiPassengerOrderStatusEnum.ArriveAtStartStation + && getCurOrderStatus() == TaxiPassengerOrderStatusEnum.ArriveAtStart && state != mPrevAPStatus) { // 当高频返回autopilot 2时，不重复调用订单状态变更 mPrevAPStatus = state; // 每个状态单独赋值，解决无订单时已经是2的状态导致的新订单来时无法进入此逻辑更新状态 @@ -544,7 +544,7 @@ public class TaxiPassengerModel implements IOCHTaxiPassengerNaviChangedCallback } if (arrivalNotification == null || !checkCurrentOCHOrder() - || (getCurOrderStatus() == TaxiPassengerOrderStatusEnum.ArriveAtEndStation)) { + || (getCurOrderStatus() == TaxiPassengerOrderStatusEnum.ArriveAtEnd)) { return; } if (DebugConfig.isDebug()) { 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 7cadee404a..3b670315d9 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 @@ -10,18 +10,14 @@ import androidx.lifecycle.LifecycleOwner; import com.mogo.commons.AbsMogoApplication; import com.mogo.commons.mvp.Presenter; -import com.mogo.commons.voice.AIAssist; import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener; import com.mogo.eagle.core.network.utils.GsonUtil; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; -import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr; import com.mogo.eagle.core.utilcode.util.UiThreadHandler; -import com.mogo.och.taxi.passenger.R; import com.mogo.och.taxi.passenger.bean.TaxiPassengerOrderQueryRespBean; import com.mogo.och.taxi.passenger.callback.IOCHTaxiPassengerADASStatusCallback; import com.mogo.och.taxi.passenger.callback.IOCHTaxiPassengerControllerStatusCallback; import com.mogo.och.taxi.passenger.callback.IOCHTaxiPassengerOrderStatusCallback; -import com.mogo.och.taxi.passenger.constant.TaxiPassengerConst; import com.mogo.och.taxi.passenger.constant.TaxiPassengerOrderStatusEnum; import com.mogo.och.taxi.passenger.model.TaxiPassengerModel; import com.mogo.och.taxi.passenger.model.TaxiPassengerNaviToDestinationModel; @@ -149,12 +145,12 @@ public class BaseTaxiPassengerPresenter extends Presenter implements IOCH @Override public void onCurrentOrderStatusChanged(OrderQueryRespBean.Result order) { CallerLogger.INSTANCE.d(M_TAXI + TAG,"order = "+order.toString()); - if (OrderStatusEnum.OnTheWayToEndStation.getCode() == order.orderStatus){ + if (OrderStatusEnum.OnTheWayToEnd.getCode() == order.orderStatus){ MogoOCHTaxiModelNew.getInstance().startDynamicCalculateRouteInfo(); } - if (OrderStatusEnum.ArriveAtEndStation.getCode() == order.orderStatus || + if (OrderStatusEnum.ArriveAtEnd.getCode() == order.orderStatus || OrderStatusEnum.Cancel.getCode() == order.orderStatus || OrderStatusEnum.JourneyCompleted.getCode() == order.orderStatus){ MogoOCHTaxiModelNew.getInstance().startOrStopCalculateRouteInfo(false); diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiBeingServerdOrdersFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiBeingServerdOrdersFragment.java index 5eee71e8eb..173329228d 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiBeingServerdOrdersFragment.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiBeingServerdOrdersFragment.java @@ -159,7 +159,7 @@ public class OCHTaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implem } mOrderNo = order.orderNo; onOrderStatusChanged(order); - if (OrderStatusEnum.ArriveAtEndStation.getCode() == order.orderStatus) { + if (OrderStatusEnum.ArriveAtEnd.getCode() == order.orderStatus) { mTaxiFragment.queryCurOrderRouteInfo(); mContentModule3.setVisibility(View.GONE); mContentModule2.setVisibility(View.VISIBLE); @@ -177,7 +177,7 @@ public class OCHTaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implem // String strHtml2 = "距离 " + "- -" + " 公里，" // + "用时 " + "- -" + " 分钟"; // mDistanceAndTime.setText(Html.fromHtml(strHtml2)); - } else if (OrderStatusEnum.OnTheWayToEndStation.getCode() == order.orderStatus) { + } else if (OrderStatusEnum.OnTheWayToEnd.getCode() == order.orderStatus) { CallerLogger.INSTANCE.d(M_TAXI + TAG, "已经去往终点"); mContentModule3.setVisibility(View.GONE); mContentModule2.setVisibility(View.VISIBLE); @@ -190,7 +190,7 @@ public class OCHTaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implem mTitleTV2.setText("送乘客至"); mStationTv2.setText(order.endSiteAddr); - } else if (OrderStatusEnum.ArriveAtStartStation.getCode() == order.orderStatus) { + } else if (OrderStatusEnum.ArriveAtStart.getCode() == order.orderStatus) { CallerLogger.INSTANCE.d(M_TAXI + TAG, "已经达到起点"); mContentModule2.setVisibility(View.GONE); mContentModule3.setVisibility(View.VISIBLE); @@ -378,7 +378,7 @@ public class OCHTaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implem if (status != saveOrderState) { OrderStatusEnum ochStatus = OrderStatusEnum.valueOf(status); switch (ochStatus) { - case OnTheWayToStartStation: + case OnTheWayToStart: mOrderCancel.setVisibility(View.VISIBLE); showNotice(mActivity.getString(R.string.module_och_taxi_new_order)); mTtsLessThan200Tip = 0; @@ -396,7 +396,7 @@ public class OCHTaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implem setOrRemoveMapMaker(false, OCHTaxiConst.TAXI_START_MAP_MAKER,order.startSitePoint); setOrRemoveMapMaker(false,OCHTaxiConst.TAXI_END_MAP_MAKER,order.endSitePoint); break; - case ArriveAtStartStation: + case ArriveAtStart: mTtsLessThan200Tip = 0; mOrderCancel.setVisibility(View.VISIBLE); showNotice(mActivity.getString(R.string.module_och_taxi_order_status_ph_text)); @@ -404,14 +404,14 @@ public class OCHTaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implem setOrRemoveMapMaker(true, OCHTaxiConst.TAXI_START_MAP_MAKER,order.startSitePoint); setOrRemoveMapMaker(true,OCHTaxiConst.TAXI_END_MAP_MAKER,order.endSitePoint); break; - case OnTheWayToEndStation: + case OnTheWayToEnd: // showNotice("欢迎使用蘑菇智行"); mOrderCancel.setVisibility(View.VISIBLE); showOrHideNavi(false); setOrRemoveMapMaker(false, OCHTaxiConst.TAXI_START_MAP_MAKER,order.startSitePoint); setOrRemoveMapMaker(true,OCHTaxiConst.TAXI_END_MAP_MAKER,order.endSitePoint); break; - case ArriveAtEndStation: + case ArriveAtEnd: mCurrentOrder = null; mTtsLessThan200Tip = 0; mOrderCancel.setVisibility(View.GONE); @@ -528,7 +528,7 @@ public class OCHTaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implem UiThreadHandler.postDelayed(new Runnable() { @Override public void run() { - if (saveOrderState == OrderStatusEnum.OnTheWayToStartStation.getCode()) { + if (saveOrderState == OrderStatusEnum.OnTheWayToStart.getCode()) { startNaviToStartStation(false, mOrderStartStationLat, mOrderStartStationLng); } } @@ -536,7 +536,7 @@ public class OCHTaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implem UiThreadHandler.postDelayed(new Runnable() { @Override public void run() { - if (saveOrderState == OrderStatusEnum.OnTheWayToStartStation.getCode()) { + if (saveOrderState == OrderStatusEnum.OnTheWayToStart.getCode()) { if (mNaviIcon.getVisibility() == View.GONE) { mNaviIcon.setVisibility(View.VISIBLE); } diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java index a26ad569f5..efda226b61 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java @@ -2,7 +2,6 @@ package com.mogo.och.taxi.ui; import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_TAXI; -import android.content.Context; import android.os.Build; import android.os.Bundle; import android.text.TextUtils; @@ -13,8 +12,6 @@ import androidx.annotation.NonNull; import androidx.annotation.RequiresApi; import androidx.fragment.app.FragmentTransaction; -import com.amap.api.maps.CoordinateConverter; -import com.amap.api.maps.model.LatLng; import com.mogo.commons.debug.DebugConfig; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.module.common.MogoApisHandler; @@ -69,7 +66,7 @@ public class OCHTaxiFragment extends BaseOchTaxiTabFragment