From 4c9d86d94e40144680c7ef37a56e8a4a65a23b7f Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Sat, 25 Jun 2022 15:10:45 +0800
Subject: [PATCH] =?UTF-8?q?[Taxi-d=20280,=20Taxi-p=20130]=20Taxi=E5=8F=B8?=
 =?UTF-8?q?=E6=9C=BA=E5=B1=8F=E6=92=AD=E6=8A=A5=E5=B0=8F=E4=BA=8E1?=
 =?UTF-8?q?=E5=85=AC=E9=87=8C=E7=9A=84=E9=87=8C=E7=A8=8B=E6=97=B6=E6=92=AD?=
 =?UTF-8?q?=E6=8A=A5=E5=8D=95=E4=BD=8D"=E7=B1=B3"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java    | 2 +-
 OCH/mogo-och-taxi/src/main/res/values/strings.xml               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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 be5977fdd9..3069a2ce1e 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
@@ -348,7 +348,7 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implement
             if (isFirstStartAutopilotDone){
                 showNotice(String.format(getResources()
                                 .getString(R.string.module_och_taxi_order_server_start_auto_tip),
-                        dis,min));
+                        dis,disUnit,min));
                 isFirstStartAutopilotDone = false;
             }
         }
diff --git a/OCH/mogo-och-taxi/src/main/res/values/strings.xml b/OCH/mogo-och-taxi/src/main/res/values/strings.xml
index 02a5905a61..1c2e79dfea 100644
--- a/OCH/mogo-och-taxi/src/main/res/values/strings.xml
+++ b/OCH/mogo-och-taxi/src/main/res/values/strings.xml
@@ -24,7 +24,7 @@
     <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_server_completed_tip">车辆已停稳，请携带好随身物品，下车请注意安全</string>
-    <string name="module_och_taxi_order_server_start_auto_tip">您好，本次自动驾驶体验里程共%1$s公里，预计需要%2$d分钟，我们即将出发。出于安全考虑，建议您尽量不要与安全员交谈，后排落座，并系好安全带</string>
+    <string name="module_och_taxi_order_server_start_auto_tip">您好，本次自动驾驶体验里程共%1$s%2$s，预计需要%3$d分钟，我们即将出发。出于安全考虑，建议您尽量不要与安全员交谈，后排落座，并系好安全带</string>
     <string name="module_och_taxi_order_arrive_end_200m_tip">即将到达目的地，请拿好随身物品，准备下车</string>
     <string name="module_och_taxi_order_auto_arrive_end_tip">您好，我们已到达目的地，本次体验结束。车辆停稳，请带好随身物品，谨防遗漏。感谢您的乘坐</string>
     <string name="module_och_taxi_auto_disable_tip">自动驾驶状态为0不可用</string>