yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[2.11.0] opt

Browse Source
This commit is contained in:
wangmingjun
2022-10-18 15:22:26 +08:00
parent 95906ace1f
commit 772c4fd920
7 changed files with 61 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/ITaxiAutopilotPlanningCallback.java
View File

@@ -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<MessagePad.Location> models);
}

1
OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/ITaxiNaviChangedCallback.java
View File

@@ -8,4 +8,5 @@ public interface ITaxiNaviChangedCallback {
// 当前位置距离上车点的距离（米）、预估时间（秒）
void onCurrentNaviDistAndTimeChanged(int meters, long timeInSecond);
void reInitNaviAmap(boolean isPlay,boolean isRestart);
void onNaviToEndAmap();
}

20
OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java
View File

@@ -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<TaxiDataBaseRespBean>() {
@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();
}
}
}
}

26
OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java
View File

@@ -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<TaxiFragment> 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<TaxiFragment> 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<TaxiFragment> 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<TaxiFragment> implements ITaxiADASS
TaxiModel.getInstance().logout();
}
//导航去订单目的地
public void startNaviToEndStation(){
TaxiModel.getInstance().startNaviToEndStation();
}
@Override
public void onAutopilotArriveEnd() {
@@ -268,7 +276,6 @@ public class TaxiPresenter extends Presenter<TaxiFragment> 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<TaxiFragment> 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();
}
}

2
OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java
View File

@@ -597,4 +597,6 @@ public abstract class BaseTaxiTabFragment<V extends IView, P extends Presenter<V
CallerSmpManager.showPanel();//显示小地图
}
}
public abstract void startNaviToEndStation();
}

9
OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java
View File

@@ -607,8 +607,10 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implement
* @param isShow
*/
private void showNaviToEndStationFragment(boolean isShow) {
mTaxiFragment.showNaviToStationFragment(isShow);
startNaviToEndStation(isShow, mOrderStartStationLat, mOrderStartStationLng);
mTaxiFragment.startNaviToEndStation();
// startNaviToEndStation(isShow, mOrderStartStationLat, mOrderStartStationLng);
}
@@ -680,6 +682,11 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implement
}, 3000);
}
@Override
public void onNaviToEndAmap() {
}
/**
* 绘制地图起点终点
* @param isAdd

14
OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java
View File

@@ -94,6 +94,11 @@ public class TaxiFragment extends BaseTaxiTabFragment<TaxiFragment, TaxiPresente
}
}
@Override
public void startNaviToEndStation() {
mPresenter.startNaviToEndStation();
}
@Override
public String getTagName() {
return "TaxiFragment";
@@ -306,6 +311,10 @@ public class TaxiFragment extends BaseTaxiTabFragment<TaxiFragment, TaxiPresente
grabOrderFragment.onGrabOrderFailed();
}
public void onNaviToEndAmap(){
}
public void onOrdersWaitServiceChanged(List<OrderQueryRespBean.Result> waitServiceList) {
if (null == waitServiceList) return;
if (null == serverOrdersFragment) return;
@@ -341,11 +350,6 @@ public class TaxiFragment extends BaseTaxiTabFragment<TaxiFragment, TaxiPresente
serverOrdersFragment.onCurrentOrderRouteInfoGot(routeInfo);
}
public void onCurrentOrderDistToStartChanged(long meters, long timeInSecond) {
// if (null == serverOrdersFragment) return;
// serverOrdersFragment.onCurrentOrderDistToStartChanged(meters,timeInSecond);
}
public void onCurrentOrderDistToEndChanged(long meters, long timeInSecond) {
if (null == serverOrdersFragment) return;
serverOrdersFragment.onCurrentOrderDistToEndChanged(meters, timeInSecond);