From 772c4fd920559a8eac6e229619fe0e52ea1d4870 Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Tue, 18 Oct 2022 15:22:26 +0800 Subject: [PATCH] [2.11.0] opt --- .../ITaxiAutopilotPlanningCallback.java | 14 ---------- .../callback/ITaxiNaviChangedCallback.java | 1 + .../com/mogo/och/taxi/model/TaxiModel.java | 20 +++++++++++--- .../och/taxi/presenter/TaxiPresenter.java | 26 +++++++++++++++++-- .../mogo/och/taxi/ui/BaseTaxiTabFragment.java | 2 ++ .../ui/TaxiBeingServerdOrdersFragment.java | 9 ++++++- .../com/mogo/och/taxi/ui/TaxiFragment.java | 14 ++++++---- 7 files changed, 61 insertions(+), 25 deletions(-) delete mode 100644 OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/ITaxiAutopilotPlanningCallback.java diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/ITaxiAutopilotPlanningCallback.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/ITaxiAutopilotPlanningCallback.java deleted file mode 100644 index 32226d2dd4..0000000000 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/ITaxiAutopilotPlanningCallback.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.mogo.och.taxi.callback; - - -import java.util.List; - -import mogo.telematics.pad.MessagePad; - -/** - * @author: wangmingjun - * @date: 2021/11/1 - */ -public interface ITaxiAutopilotPlanningCallback { - void routeResult(List models); -} \ No newline at end of file diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/ITaxiNaviChangedCallback.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/ITaxiNaviChangedCallback.java index 138de6b9b1..36d861f682 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/ITaxiNaviChangedCallback.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/ITaxiNaviChangedCallback.java @@ -8,4 +8,5 @@ public interface ITaxiNaviChangedCallback { // 当前位置距离上车点的距离（米）、预估时间（秒） void onCurrentNaviDistAndTimeChanged(int meters, long timeInSecond); void reInitNaviAmap(boolean isPlay,boolean isRestart); + void onNaviToEndAmap(); } 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 9c1fc34c0c..f5e63ffd5c 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 @@ -57,6 +57,7 @@ import com.mogo.och.taxi.bean.TaxiOrPassengerReadyReqBean; import com.mogo.och.taxi.callback.ITaxiADASStatusCallback; import com.mogo.och.taxi.callback.ITaxiCarStatusCallback; import com.mogo.och.taxi.callback.ITaxiControllerStatusCallback; +import com.mogo.och.taxi.callback.ITaxiNaviChangedCallback; import com.mogo.och.taxi.callback.ITaxiOrderStatusCallback; import com.mogo.och.taxi.constant.TaxiConst; import com.mogo.och.taxi.constant.TaxiOrderStatusEnum; @@ -117,6 +118,7 @@ public class TaxiModel { private ITaxiCarStatusCallback mCarStatusCallback; //Model->Presenter：接单状态、登录状态和司机今日接单状态 private ITaxiControllerStatusCallback mControllerStatusCallback; //Model->Presenter：VR mode等 private ITaxiOrderStatusCallback mOrderStatusCallback; //Model->Presenter：订单变更 + private ITaxiNaviChangedCallback mNaviChangedCallback;//导航相关回调 private volatile boolean isRestartAutopilot = false; @@ -145,6 +147,10 @@ public class TaxiModel { this.mOrderStatusCallback = callback; } + public void setOCHTaciNaviChangedCallback(ITaxiNaviChangedCallback callback){ + this.mNaviChangedCallback = callback; + } + public void init(Context context) { mContext = context.getApplicationContext(); initListeners(); @@ -1530,9 +1536,6 @@ public class TaxiModel { , new TaxiServiceCallback() { @Override public void onSuccess(TaxiDataBaseRespBean data) { -// if (null != data && 0 == data.code){ -// updateOrderStatus(TaxiOrderStatusEnum.JourneyCompleted); -// } } @Override @@ -1546,4 +1549,15 @@ public class TaxiModel { public void logout() { loginService.loginOut(mLatitude,mLongitude); } + + //导航去订单终点目的地 + public void startNaviToEndStation(){ + if (mRoutePoints.size() > 0 ){ //使用自驾轨迹 + + }else {//使用高的导航 + if (mNaviChangedCallback != null){ + mNaviChangedCallback.onNaviToEndAmap(); + } + } + } } 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 b6cdb73c6b..dfce847d95 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 @@ -19,6 +19,7 @@ import com.mogo.och.common.module.biz.bean.DriverStatusQueryRespBean; import com.mogo.och.common.module.biz.callback.ILoginCallback; import com.mogo.och.common.module.biz.constant.LoginStatusManager; import com.mogo.och.common.module.manager.OCHAdasAbilityManager; +import com.mogo.och.taxi.callback.ITaxiNaviChangedCallback; import com.mogo.och.taxi.constant.TaxiConst; import com.mogo.och.taxi.constant.TaxiDriverRoleEnum; import com.mogo.och.taxi.constant.TaxiOrderStatusEnum; @@ -43,7 +44,7 @@ import java.util.List; * 描述 */ public class TaxiPresenter extends Presenter implements ITaxiADASStatusCallback, - ITaxiCarStatusCallback, ITaxiOrderStatusCallback, ITaxiControllerStatusCallback, ILoginCallback { + ITaxiCarStatusCallback, ITaxiOrderStatusCallback, ITaxiControllerStatusCallback, ILoginCallback, ITaxiNaviChangedCallback { private static final String TAG = TaxiPresenter.class.getSimpleName(); @@ -75,6 +76,7 @@ public class TaxiPresenter extends Presenter implements ITaxiADASS TaxiModel.getInstance().setCarStatusCallback(this); TaxiModel.getInstance().setControllerStatusCallback(this); TaxiModel.getInstance().setOrderStatusCallback(this); + TaxiModel.getInstance().setOCHTaciNaviChangedCallback(this); OCHAdasAbilityManager.getInstance().release(); } @@ -83,6 +85,7 @@ public class TaxiPresenter extends Presenter implements ITaxiADASS TaxiModel.getInstance().setCarStatusCallback(null); TaxiModel.getInstance().setControllerStatusCallback(null); TaxiModel.getInstance().setOrderStatusCallback(null); + TaxiModel.getInstance().setOCHTaciNaviChangedCallback(null); } private void runOnUIThread( Runnable executor ) { @@ -180,6 +183,11 @@ public class TaxiPresenter extends Presenter implements ITaxiADASS TaxiModel.getInstance().logout(); } + //导航去订单目的地 + public void startNaviToEndStation(){ + TaxiModel.getInstance().startNaviToEndStation(); + } + @Override public void onAutopilotArriveEnd() { @@ -268,7 +276,6 @@ public class TaxiPresenter extends Presenter implements ITaxiADASS @Override public void onCurrentOrderDistToStartChanged(long meters, long timeInSecond) { - runOnUIThread(() -> mView.onCurrentOrderDistToStartChanged(meters,timeInSecond)); } @Override @@ -352,4 +359,19 @@ public class TaxiPresenter extends Presenter implements ITaxiADASS public void loginFail(boolean isLogin) { } + + @Override + public void onCurrentNaviDistAndTimeChanged(int meters, long timeInSecond) { + + } + + @Override + public void reInitNaviAmap(boolean isPlay, boolean isRestart) { + + } + + @Override + public void onNaviToEndAmap() { + mView.onNaviToEndAmap(); + } } 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 8204ca99ad..f4396901be 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 @@ -597,4 +597,6 @@ public abstract class BaseTaxiTabFragment waitServiceList) { if (null == waitServiceList) return; if (null == serverOrdersFragment) return; @@ -341,11 +350,6 @@ public class TaxiFragment extends BaseTaxiTabFragment