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

[2.13.0] taxi增加送驾途中结束订单功能

Browse Source
This commit is contained in:
wangmingjun
2022-11-17 17:03:32 +08:00
parent 82571c797b
commit 2934df3b45
4 changed files with 45 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -191,6 +191,11 @@ public class TaxiPresenter extends Presenter<TaxiFragment> implements ITaxiADASS
public void reportToEndDisAndTime(long lastSumLength, long duration){//米/秒
TaxiModel.getInstance().reportOrderRemain(lastSumLength,duration);
}
public void closeOrderByMan(){
TaxiModel.getInstance().arriveTerminal();
}
@Override
public void onAutopilotArriveEnd() {

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

@@ -34,6 +34,7 @@ import com.mogo.och.common.module.utils.DateTimeUtil;
import com.mogo.och.common.module.utils.NumberFormatUtil;
import com.mogo.och.common.module.utils.OCHThreadPoolManager;
import com.mogo.och.common.module.voice.VoiceNotice;
import com.mogo.och.common.module.wigets.OCHCommitDialog;
import com.mogo.och.taxi.constant.TaxiConst;
import com.mogo.och.taxi.constant.TaxiOrderStatusEnum;
import com.mogo.och.taxi.R;
@@ -218,11 +219,10 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment
mContentModule2.setVisibility(View.VISIBLE);
mOrderStatus.setText(R.string.module_och_taxi_on_the_way_2_end_station);
updateOrderBottomBtn(getString(R.string.module_och_taxi_order_server_end),
Color.parseColor("#4DFFFFFF"),
Color.parseColor("#4D1D5EF3"),
false);
updateOrderBottomBtn(getString(R.string.module_och_taxi_order_close),
Color.parseColor("#FFFFFF"),
Color.parseColor("#FF1D5EF3"),
true);
mTitleTV2.setText("送乘客至");
mStationTv2.setText(order.endSiteAddr);
} else if (TaxiOrderStatusEnum.UserArriveAtStart.getCode() == order.orderStatus
@@ -450,9 +450,33 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment
}else if (TaxiOrderStatusEnum.ArriveAtEnd.getCode() == mCurrentOrder.orderStatus) {//点击了完成服务，结束订单并更新订单信息
mTaxiFragment.completeOrderService();
//VoiceNotice.showNotice(getResources().getString(R.string.module_och_taxi_order_server_completed_tip));
}else if (TaxiOrderStatusEnum.OnTheWayToEnd.getCode() == mCurrentOrder.orderStatus){//前往目的地过程中可提前结束行程
closeOrderDialog();
}
}
private void closeOrderDialog() {
OCHCommitDialog.Builder builder = new OCHCommitDialog.Builder();
OCHCommitDialog closeOrderDialog = builder
.title(getString(R.string.dialog_order_close_title))
.tips(getString(R.string.dialog_order_close_content))
.confirmStr(getString(R.string.dialog_order_close_confirm))
.cancelStr(getString(R.string.dialog_order_close_cancel))
.build(getContext());
closeOrderDialog.setClickListener(new OCHCommitDialog.ClickListener() {
@Override
public void confirm() {
if (mTaxiFragment != null) mTaxiFragment.closeOrderByMan();
}
@Override
public void cancel() {
closeOrderDialog.dismiss();
}
});
closeOrderDialog.show();
}
public void onOrderStatusChanged(OrderQueryRespBean.Result order) {
int status = order.orderStatus;
CallerLogger.INSTANCE.d(M_TAXI + TAG, "status==" + status);

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

@@ -322,6 +322,10 @@ public class TaxiFragment extends BaseTaxiTabFragment<TaxiFragment, TaxiPresente
}
}
public void closeOrderByMan(){
mPresenter.closeOrderByMan();
}
/**
* 高德计算出来的到达目的地的剩余里程和时间
* @param meters

7
OCH/mogo-och-taxi/src/main/res/values/strings.xml
View File

@@ -21,6 +21,13 @@
<string name="module_och_taxi_order_server_wait_passenger_start">等待乘客开始行程</string>
<string name="module_och_taxi_order_choose_start_autopilot_tip">请等待乘客启动自动驾驶，或您自行启动</string>
<string name="module_och_taxi_order_server_end">服务完成</string>
<string name="module_och_taxi_order_close">结束行程</string>
<string name="dialog_order_close_title">提示</string>
<string name="dialog_order_close_content">您确认要结束行程吗</string>
<string name="dialog_order_close_confirm">确认</string>
<string name="dialog_order_close_cancel">取消</string>
<string name="module_och_taxi_auto_disable_tip">自动驾驶状态为0不可用</string>
<string name="module_och_taxi_auto_disable_tip1">司机端未确认可以开启自动驾驶</string>