From 28c92d9222129d4fca0d0fc6bce8b0ff33da3837 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Fri, 17 Feb 2023 11:51:21 +0800
Subject: [PATCH] =?UTF-8?q?[m2]=20[1.0.1]=20[=E7=8A=B6=E6=80=81=E6=A0=8F?=
 =?UTF-8?q?=E9=80=82=E9=85=8D+=E6=95=B4=E4=BD=93=E9=80=82=E9=85=8D]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bus/passenger/ui/widget/M2StatusBarView.kt    |  2 +-
 .../src/m2/res/layout/p_m2_fragment.xml           | 15 +++++++++------
 .../com/mogo/commons/screen/ScreenHelper.java     |  8 ++++++--
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2StatusBarView.kt b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2StatusBarView.kt
index 3a19937dc3..ba3c2697ed 100644
--- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2StatusBarView.kt
+++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2StatusBarView.kt
@@ -40,7 +40,7 @@ class M2StatusBarView @JvmOverloads constructor(
         super.onAttachedToWindow()
         post {
             val params: ViewGroup.LayoutParams = getLayoutParams()
-            params.height = AutoSizeUtils.dp2px(context,47f)
+            params.height = AutoSizeUtils.dp2px(context,40f)
             layoutParams = params
         }
         //添加view控制
diff --git a/OCH/mogo-och-bus-passenger/src/m2/res/layout/p_m2_fragment.xml b/OCH/mogo-och-bus-passenger/src/m2/res/layout/p_m2_fragment.xml
index b474ea5160..0531cd6727 100644
--- a/OCH/mogo-och-bus-passenger/src/m2/res/layout/p_m2_fragment.xml
+++ b/OCH/mogo-och-bus-passenger/src/m2/res/layout/p_m2_fragment.xml
@@ -9,18 +9,20 @@
         android:id="@+id/driving_fragment"
         android:layout_width="match_parent"
         android:layout_height="0dp"
+        app:layout_constraintWidth_percent="0.29"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintHeight_percent="0.290"/>
+        app:layout_constraintBottom_toTopOf="@+id/hd_map_fragment"
+        app:layout_constraintLeft_toLeftOf="parent"/>
 
     <!-- 高精地图-->
     <FrameLayout
         android:id="@+id/hd_map_fragment"
         android:layout_width="match_parent"
         android:layout_height="0dp"
+        app:layout_constraintWidth_percent="0.416"
         app:layout_constraintTop_toBottomOf="@+id/driving_fragment"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintHeight_percent="0.418"/>
+        app:layout_constraintBottom_toTopOf="@+id/video_fragment"
+        app:layout_constraintLeft_toLeftOf="parent"/>
 
 
     <!-- 图片或视频广告-->
@@ -29,8 +31,9 @@
         android:id="@+id/video_fragment"
         android:layout_width="match_parent"
         android:layout_height="0dp"
+        app:layout_constraintWidth_percent="0.294"
         app:layout_constraintTop_toBottomOf="@+id/hd_map_fragment"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintHeight_percent="0.294"/>
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"/>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/screen/ScreenHelper.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/screen/ScreenHelper.java
index f70d4b06e2..d9d9338019 100644
--- a/foudations/mogo-commons/src/main/java/com/mogo/commons/screen/ScreenHelper.java
+++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/screen/ScreenHelper.java
@@ -19,14 +19,18 @@ public class ScreenHelper {
 
         int baseWidth = 2560;
         int baseHeight = 1600;
+        boolean baseOnWidth = true;
 
-        if (AppIdentityModeUtils.isM1(FunctionBuildConfig.appIdentityMode) || AppIdentityModeUtils.isM1(FunctionBuildConfig.appIdentityMode)) {
+        if (AppIdentityModeUtils.isM1(FunctionBuildConfig.appIdentityMode)) {
             baseWidth = 1920;
             baseHeight = 1080;
+        } else if (AppIdentityModeUtils.isM2(FunctionBuildConfig.appIdentityMode)) {
+            baseWidth = 1080;
+            baseHeight = 1920;
         }
 
         AutoSizeConfig.getInstance()
-                .setBaseOnWidth(false)
+                .setBaseOnWidth(baseOnWidth)
                 .setCustomFragment(true)
                 .setDesignWidthInDp(baseWidth)
                 .setDesignHeightInDp(baseHeight)