From 61ee4d714a22a25cac95572d3f565b2c0c9f69b5 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Fri, 7 Apr 2023 18:24:59 +0800
Subject: [PATCH] =?UTF-8?q?[m2]=20[3.0.0]=20[=E6=96=87=E6=A1=88=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E3=80=81=E9=A1=B5=E9=9D=A2=E5=BE=AE=E8=B0=83]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/jinlvvan/res/values/strings.xml                  | 2 +-
 .../src/m2/res/layout/p_m2_fragment.xml                  | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/values/strings.xml b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/values/strings.xml
index e98feed5f5..f921f5e2f3 100644
--- a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/values/strings.xml
+++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/values/strings.xml
@@ -9,5 +9,5 @@
     <string name="bus_p_cur_next_station_title">下一站：</string>
     <string name="bus_p_cur_station_title_init">始发站：</string>
     <string name="bus_p_cur_station_arrived_tip">请携带好随身物品下车。</string>
-    <string name="bus_p_cur_station_arrived_tip_init">欢迎乘坐蘑菇车联自动驾驶车。</string>
+    <string name="bus_p_cur_station_arrived_tip_init">欢迎乘坐\'蘑菇车联\'自动驾驶车。</string>
 </resources>
\ No newline at end of file
diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_fragment.xml b/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_fragment.xml
index fa1b31c186..e144609f35 100644
--- a/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_fragment.xml
+++ b/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_fragment.xml
@@ -88,11 +88,10 @@
     <FrameLayout
         android:id="@+id/video_fragment"
         android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_marginBottom="@dimen/dp_40"
-        android:layout_marginEnd="@dimen/dp_40"
-        android:layout_marginStart="@dimen/dp_40"
-        app:layout_constraintHeight_percent="0.290"
+        android:layout_height="@dimen/dp_560"
+        android:layout_marginBottom="@dimen/dp_44"
+        android:layout_marginEnd="@dimen/dp_42"
+        android:layout_marginStart="@dimen/dp_42"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"/>