From 7eb1520e2534022c1c2d8208c5ccc9db4a857948 Mon Sep 17 00:00:00 2001
From: xinfengkun <xinfengkun@zhidaoauto.com>
Date: Wed, 17 Dec 2025 13:27:29 +0800
Subject: [PATCH] =?UTF-8?q?[8.3.0]=20=E5=90=88=E5=B9=B6=E5=8F=B8=E4=B9=98?=
 =?UTF-8?q?=E5=B1=8F=E5=9B=BD=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/res/layout/shuttle_weak_running_station_list_item.xml  | 2 +-
 .../src/main/res/b2/layout/m2_station_normal_end_view.xml       | 2 +-
 .../src/main/res/b2/layout/m2_station_normal_future_view.xml    | 2 +-
 .../src/main/res/b2/layout/m2_station_normal_pass_view.xml      | 2 +-
 .../src/main/res/b2/layout/m2_station_normal_start_view.xml     | 2 +-
 core/mogo-core-res/src/main/res/values-en/string.xml            | 1 +
 core/mogo-core-res/src/main/res/values/string.xml               | 1 +
 7 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_running_station_list_item.xml b/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_running_station_list_item.xml
index fddf5af9f9..2c5b85e2de 100644
--- a/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_running_station_list_item.xml
+++ b/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_running_station_list_item.xml
@@ -97,7 +97,7 @@
         android:paddingTop="@dimen/dp_4"
         android:paddingEnd="@dimen/dp_12"
         android:paddingBottom="@dimen/dp_4"
-        android:text="临时不停"
+        android:text="@string/module_och_temporary_no_stopping"
         android:textColor="@color/white"
         android:textSize="@dimen/dp_36"
         android:visibility="gone"
diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_station_normal_end_view.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_station_normal_end_view.xml
index 1a8661fe34..07ac57d59e 100644
--- a/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_station_normal_end_view.xml
+++ b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_station_normal_end_view.xml
@@ -57,7 +57,7 @@
         android:paddingTop="@dimen/dp_4"
         android:paddingEnd="@dimen/dp_12"
         android:paddingBottom="@dimen/dp_4"
-        android:text="临时不停"
+        android:text="@string/module_och_temporary_no_stopping"
         android:textColor="@color/common_203555"
         android:textSize="@dimen/dp_34"
         android:visibility="gone"
diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_station_normal_future_view.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_station_normal_future_view.xml
index b1e0d52d3d..f877192f11 100644
--- a/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_station_normal_future_view.xml
+++ b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_station_normal_future_view.xml
@@ -67,7 +67,7 @@
         android:paddingTop="@dimen/dp_4"
         android:paddingEnd="@dimen/dp_12"
         android:paddingBottom="@dimen/dp_4"
-        android:text="临时不停"
+        android:text="@string/module_och_temporary_no_stopping"
         android:textColor="@color/common_203555"
         android:textSize="@dimen/dp_34"
         android:visibility="gone"
diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_station_normal_pass_view.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_station_normal_pass_view.xml
index 2bd607c00d..c986b1b632 100644
--- a/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_station_normal_pass_view.xml
+++ b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_station_normal_pass_view.xml
@@ -66,7 +66,7 @@
         android:paddingTop="@dimen/dp_4"
         android:paddingEnd="@dimen/dp_12"
         android:paddingBottom="@dimen/dp_4"
-        android:text="临时不停"
+        android:text="@string/module_och_temporary_no_stopping"
         android:textColor="@color/common_203555"
         android:textSize="@dimen/dp_34"
         android:visibility="gone"
diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_station_normal_start_view.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_station_normal_start_view.xml
index adaaaea283..22db940440 100644
--- a/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_station_normal_start_view.xml
+++ b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_station_normal_start_view.xml
@@ -56,7 +56,7 @@
         android:paddingTop="@dimen/dp_4"
         android:paddingEnd="@dimen/dp_12"
         android:paddingBottom="@dimen/dp_4"
-        android:text="临时不停"
+        android:text="@string/module_och_temporary_no_stopping"
         android:textColor="@color/common_203555"
         android:textSize="@dimen/dp_34"
         android:visibility="gone"
diff --git a/core/mogo-core-res/src/main/res/values-en/string.xml b/core/mogo-core-res/src/main/res/values-en/string.xml
index 8f0541c23b..6c1690b402 100644
--- a/core/mogo-core-res/src/main/res/values-en/string.xml
+++ b/core/mogo-core-res/src/main/res/values-en/string.xml
@@ -454,6 +454,7 @@
     <string name="module_och_please_try_again_later">, please try again later</string>
     <string name="module_och_please_set_correct_route_or_order">Please set correct route or order</string>
     <string name="module_och_not_can_open_or_close_door">Cannot open/close doors while driving~</string>
+    <string name="module_och_temporary_no_stopping">Temporarily non-stop</string>
 
 
 
diff --git a/core/mogo-core-res/src/main/res/values/string.xml b/core/mogo-core-res/src/main/res/values/string.xml
index a5b66868c5..264be2de27 100644
--- a/core/mogo-core-res/src/main/res/values/string.xml
+++ b/core/mogo-core-res/src/main/res/values/string.xml
@@ -454,6 +454,7 @@
     <string name="module_och_please_try_again_later">，请稍候重试</string>
     <string name="module_och_please_set_correct_route_or_order">请设置正确线路或订单</string>
     <string name="module_och_not_can_open_or_close_door">车辆行驶中不可以开关门哦～</string>
+    <string name="module_och_temporary_no_stopping">临时不停</string>