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

[Taxi passenger V1.1.0] Taxi Passenger 优化小地图逻辑

Browse Source
This commit is contained in:
wangmingjun
2022-03-24 16:13:06 +08:00
parent e8732c3767
commit 23e3678e7a
3 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java
View File

@@ -275,6 +275,7 @@ public class TaxiPassengerModel implements IOCHTaxiPassengerNaviChangedCallback
if (mCurrentOCHOrder != null) {
queryCurOrderStatus();
}
recoverNaviInfo();
}
}
@@ -600,6 +601,14 @@ public class TaxiPassengerModel implements IOCHTaxiPassengerNaviChangedCallback
naviOrderStartToEnd();
}
/**
* 订单结束或者取消的时候， 刷新导航标识位以及缓存的数据
*/
public void recoverNaviInfo(){
SharedPrefsMgr.getInstance(mContext).remove(TaxiPassengerConst.SP_KEY_ORDER_SUM_DIS);
TaxiPassengerNaviToDestinationModel.getInstance(mContext).setFirstcalculateDriveRoute(0);
}
private void runOnUIThread(Runnable executor) {
if (executor == null) {
return;

11
OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.java
View File

@@ -140,7 +140,7 @@ public class BaseTaxiPassengerPresenter extends Presenter<TaxiPassengerBaseFragm
CallerLogger.INSTANCE.d(M_TAXI_P+TAG,"updateOrderView = "+order.orderStatus);
if (TaxiPassengerOrderStatusEnum.Cancel.getCode() == order.orderStatus){
mView.showOrHideServingOrderFragment(false);
recoverNaviInfo();
TaxiPassengerModel.getInstance().recoverNaviInfo();
return;
}
if (TaxiPassengerOrderStatusEnum.ArriveAtStartStation.getCode() == order.orderStatus
@@ -149,7 +149,7 @@ public class BaseTaxiPassengerPresenter extends Presenter<TaxiPassengerBaseFragm
return;
}
if (TaxiPassengerOrderStatusEnum.ArriveAtEndStation.getCode() == order.orderStatus){
recoverNaviInfo();
TaxiPassengerModel.getInstance().recoverNaviInfo();
runOnUIThread(() ->{
AIAssist.getInstance(getContext()).speakTTSVoice(getContext().getString(R.string.taxi_p_arrive_end_tts));
});
@@ -165,11 +165,4 @@ public class BaseTaxiPassengerPresenter extends Presenter<TaxiPassengerBaseFragm
}
}
/**
* 订单结束或者取消的时候， 刷新导航标识位以及缓存的数据
*/
public void recoverNaviInfo(){
SharedPrefsMgr.getInstance(getContext()).remove(TaxiPassengerConst.SP_KEY_ORDER_SUM_DIS);
TaxiPassengerNaviToDestinationModel.getInstance(getContext()).setFirstcalculateDriveRoute(0);
}
}

12
OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerServingOrderFragment.java
View File

@@ -366,6 +366,18 @@ public class TaxiPassengerServingOrderFragment extends
TaxiPassengerModel.getInstance().naviOrderStartToEnd();
}
@Override
public void onHiddenChanged(boolean hidden) {
super.onHiddenChanged(hidden);
if (hidden){//fragment 隐藏， 导航取消
clearPolyline();
TaxiPassengerNaviToDestinationModel.getInstance(getContext()).destroyAmaNavi();
}else { //fragment 显示， 导航开始
TaxiPassengerModel.getInstance().naviOrderStartToEnd();
}
}
@Override
public void onPause() {
super.onPause();