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

[2.10.0] taxi司机端美化模式优化：美化模式下，

Browse Source 
自动驾驶按钮状态和引导线消失是在订单取消或者订单完成；
自动起自驾是在到达目的地时候取消
This commit is contained in:
wangmingjun
2022-10-08 19:08:34 +08:00
parent f0ccd9be35
commit cc23efd9ef
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -787,13 +787,17 @@ public class TaxiModel {
TaxiTrajectoryManager.getInstance().syncTrajectoryInfo(); TaxiTrajectoryManager.getInstance().syncTrajectoryInfo();
SharedPrefsMgr.getInstance(mContext).putString(TaxiConst.SP_KEY_OCH_TAXI_ORDER, SharedPrefsMgr.getInstance(mContext).putString(TaxiConst.SP_KEY_OCH_TAXI_ORDER,
GsonUtil.jsonFromObject(data)); GsonUtil.jsonFromObject(data));
if (FunctionBuildConfig.isDemoMode if (FunctionBuildConfig.isDemoMode) {
&& mCurrentOCHOrder.orderStatus == TaxiOrderStatusEnum.OnTheWayToEnd.getCode()) { if (mCurrentOCHOrder.orderStatus == TaxiOrderStatusEnum.OnTheWayToEnd.getCode()){
// 当美化模式（演示模式）开启时: 订单对应自动驾驶开启后，置true // 当美化模式（演示模式）开启时: 订单对应自动驾驶开启后，置true
FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = true; FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = true;
CallerAutoPilotManager.INSTANCE.setIgnoreConditionDraw(true); CallerAutoPilotManager.INSTANCE.setIgnoreConditionDraw(true);
CallerAutoPilotManager.INSTANCE.setIPCDemoMode(true); CallerAutoPilotManager.INSTANCE.setIPCDemoMode(true);
CallerLogger.INSTANCE.d(M_TAXI + TAG, "美化模式-ignore：置为true（更新本地order信息）"); CallerLogger.INSTANCE.d(M_TAXI + TAG, "美化模式-ignore：置为true（更新本地order信息）");
}
if (mCurrentOCHOrder.orderStatus == TaxiOrderStatusEnum.ArriveAtEnd.getCode()){
CallerAutoPilotManager.INSTANCE.setIPCDemoMode(false);
}
} }
} }
@@ -1165,8 +1169,9 @@ public class TaxiModel {
if (FunctionBuildConfig.isDemoMode) { if (FunctionBuildConfig.isDemoMode) {
// 当美化模式（演示模式）开启时: 到达目的地，置false // 当美化模式（演示模式）开启时: 到达目的地，置false
FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = false; // 2022.10.08 到达目的地时候取消自动起自驾， 服务完成取消引导线和自动驾驶按钮状态
CallerAutoPilotManager.INSTANCE.setIgnoreConditionDraw(false); // FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = false;
// CallerAutoPilotManager.INSTANCE.setIgnoreConditionDraw(false);
CallerAutoPilotManager.INSTANCE.setIPCDemoMode(false); CallerAutoPilotManager.INSTANCE.setIPCDemoMode(false);
CallerLogger.INSTANCE.d(M_TAXI + TAG, "美化模式-ignore：置为false（到达目的地）"); CallerLogger.INSTANCE.d(M_TAXI + TAG, "美化模式-ignore：置为false（到达目的地）");
} }

2
OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/network/TaxiServiceManager.java
View File

@@ -425,7 +425,7 @@ public class TaxiServiceManager {
,orderNo,loc)) ,orderNo,loc))
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe(getSubscribeImpl(context, callback, "arriveTerminal")); .subscribe(getSubscribeImpl(context, callback, "orderCompleted"));
} }