diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java
index bedc400eeb..752bb88cc6 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java
@@ -385,31 +385,32 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment
int min = (int)Math.ceil((double)timeInSecond/ 60f);
String strHtml2 = "里程 " + "" + dis + "" + " "+disUnit+""
+ ",剩余 " + "" + min + "" + " 分钟";
+ try {
+ if (mCurrentOrder != null && mCurrentOrder.orderStatus == TaxiOrderStatusEnum.OnTheWayToStart.getCode()) { //前往上车点
+ mDistanceAndTime3.setText(Html.fromHtml(strHtml2));
+ if (mNaviStartIcon.getVisibility() == View.GONE){
+ mNaviStartIcon.setVisibility(View.VISIBLE);
+ }
- if (mCurrentOrder != null && mCurrentOrder.orderStatus == TaxiOrderStatusEnum.OnTheWayToStart.getCode()) { //前往上车点
+ } else if (mCurrentOrder != null && mCurrentOrder.orderStatus == TaxiOrderStatusEnum.OnTheWayToEnd.getCode()) { //前往终点 时间单位是分钟
+ if (mNaviToEndIcon.getVisibility() == View.GONE){
+ mNaviToEndIcon.setVisibility(View.VISIBLE);
+ }
- mDistanceAndTime3.setText(Html.fromHtml(strHtml2));
- if (mNaviStartIcon.getVisibility() == View.GONE){
- mNaviStartIcon.setVisibility(View.VISIBLE);
+ if (mTtsLessThan200Tip < 1 && meters <= 250 && meters > 150){
+ speekVoice200mTipsOnce();
+ }
+ mDistanceAndTime2.setText(Html.fromHtml(strHtml2));
+ if (isFirstStartAutopilotDone){
+ VoiceNotice.showNotice(String.format(getResources()
+ .getString(R.string.module_och_taxi_order_server_start_auto_tip),
+ dis,disUnit,min));
+ isFirstStartAutopilotDone = false;
+ }
}
+ }catch (NullPointerException e){
- } else if (mCurrentOrder != null && mCurrentOrder.orderStatus == TaxiOrderStatusEnum.OnTheWayToEnd.getCode()) { //前往终点 时间单位是分钟
- if (mNaviToEndIcon.getVisibility() == View.GONE){
- mNaviToEndIcon.setVisibility(View.VISIBLE);
- }
-
- if (mTtsLessThan200Tip < 1 && meters <= 250 && meters > 150){
- speekVoice200mTipsOnce();
- }
- mDistanceAndTime2.setText(Html.fromHtml(strHtml2));
- if (isFirstStartAutopilotDone){
- VoiceNotice.showNotice(String.format(getResources()
- .getString(R.string.module_och_taxi_order_server_start_auto_tip),
- dis,disUnit,min));
- isFirstStartAutopilotDone = false;
- }
}
-
}
private void speekVoice200mTipsOnce() {